summaryrefslogtreecommitdiff
path: root/BaseTools
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2016-03-16 16:01:55 -0700
committerHao Wu <hao.a.wu@intel.com>2016-07-13 09:33:55 +0800
commit58e89e1f35d8d523e14097c1cb16c6759264beec (patch)
treea6bd0471645647d81a05f660630131e2851ade6f /BaseTools
parenta39da0bf2ec4b99398cc4b5504638e4e701311b9 (diff)
downloadedk2-platforms-58e89e1f35d8d523e14097c1cb16c6759264beec.tar.xz
BaseTools ConvertMasmToNasm: Support ASM_PFX in .asm files
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> (cherry picked from commit c8102434ba8703ff3bd18d8f53675c2de3830f97)
Diffstat (limited to 'BaseTools')
-rwxr-xr-xBaseTools/Scripts/ConvertMasmToNasm.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/BaseTools/Scripts/ConvertMasmToNasm.py b/BaseTools/Scripts/ConvertMasmToNasm.py
index 6a0d27dadb..8b08a88557 100755
--- a/BaseTools/Scripts/ConvertMasmToNasm.py
+++ b/BaseTools/Scripts/ConvertMasmToNasm.py
@@ -285,7 +285,9 @@ class ConvertAsmFile(CommonUtils):
self.oldAsmEmptyLineCount = 0
procDeclRe = re.compile(r'''
- ([\w@][\w@0-9]*) \s+
+ (?: ASM_PFX \s* [(] \s* )?
+ ([\w@][\w@0-9]*) \s*
+ [)]? \s+
PROC
(?: \s+ NEAR | FAR )?
(?: \s+ C )?