Sync basetools' source and binary files with r1707 of the basetools project.

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / StrGather.py

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index e82ad3a10be3aa5653b2f3ce3e904ab4d09bae20..0f644445dcb8abd7f0df151c0a52386b707295e9 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -171,9 +171,15 @@ def CreateHFileContent(BaseName, UniObjectClass):
         if Name != None:\r
             Line = ''\r
             if Referenced == True:\r
-                Line = DEFINE_STR + ' ' + Name + ' ' * (ValueStartPtr - len(DEFINE_STR + Name)) + DecToHexStr(Token, 4)\r
+                if (ValueStartPtr - len(DEFINE_STR + Name)) <= 0:\r
+                    Line = DEFINE_STR + ' ' + Name + ' ' + DecToHexStr(Token, 4)\r
+                else:\r
+                    Line = DEFINE_STR + ' ' + Name + ' ' * (ValueStartPtr - len(DEFINE_STR + Name)) + DecToHexStr(Token, 4)\r
             else:\r
-                Line = COMMENT_DEFINE_STR + ' ' + Name + ' ' * (ValueStartPtr - len(DEFINE_STR + Name)) + DecToHexStr(Token, 4) + COMMENT_NOT_REFERENCED\r
+                if (ValueStartPtr - len(DEFINE_STR + Name)) <= 0:\r
+                    Line = COMMENT_DEFINE_STR + ' ' + Name + ' ' + DecToHexStr(Token, 4) + COMMENT_NOT_REFERENCED\r
+                else:\r
+                    Line = COMMENT_DEFINE_STR + ' ' + Name + ' ' * (ValueStartPtr - len(DEFINE_STR + Name)) + DecToHexStr(Token, 4) + COMMENT_NOT_REFERENCED\r
             Str = WriteLine(Str, Line)\r
 \r
     Str =  WriteLine(Str, '')\r