From: Jordan Justen <jordan.l.justen@intel.com>
Date: Wed, 16 Mar 2016 23:01:55 +0000 (-0700)
Subject: BaseTools ConvertMasmToNasm: Support ASM_PFX in .asm files
X-Git-Tag: edk2-stable201903~6428
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=c8102434ba8703ff3bd18d8f53675c2de3830f97

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>
---

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 )?