BaseTools/Conf: Don't support upper case nasm extensions

For *.asm and *.s, there have been cases of *.Asm and *.S files, but
since the nasm extensions are new, we don't need to support the upper
case extensions.

In other words, remove .Nasm and .NASM.

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>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17544 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a2f4adac9fd2672259b5fc9c84e1481550..e5467cc4557fec10ef25c8666bb4a63d92bbb372 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@
 \r
 [Nasm-Assembly-Code-File.COMMON.COMMON]\r
     <InputFile>\r
-        ?.nasm, ?.Nasm, ?.NASM\r
+        ?.nasm\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
@@ -479,7 +479,7 @@
 \r
 [Nasm-to-Binary-Code-File]\r
     <InputFile>\r
-        ?.nasmb, ?.NASMB\r
+        ?.nasmb\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ad34a3d6eec1f95bb0b8a4606237785d26a95c28..fd7b4b55e8ba948cc3b445993402b09c00cd7249 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -6276,7 +6276,7 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #   XCODE32         - Xcode 3.2 Tools (Snow Leopard)\r
 *_XCODE32_*_*_FAMILY            = GCC\r
 *_XCODE32_*_*_BUILDRULEFAMILY   = XCODE\r
-*_XCODE32_*_*_BUILDRULEORDER    = S s nasm Nasm NASM\r
+*_XCODE32_*_*_BUILDRULEORDER    = S s nasm\r
 \r
 \r
 *_XCODE32_*_ASL_PATH          = /usr/bin/iasl\r
@@ -6386,7 +6386,7 @@ RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-inter
 #   CLANG         - clang that produce Mach-O with EFI x86_64 ABI\r
 *_XCLANG_*_*_FAMILY            = GCC\r
 *_XCLANG_*_*_BUILDRULEFAMILY   = XCODE\r
-*_XCLANG_*_*_BUILDRULEORDER    = S s nasm Nasm NASM\r
+*_XCLANG_*_*_BUILDRULEORDER    = S s nasm\r
 \r
 *_XCLANG_*_ASL_PATH          = /usr/bin/iasl\r
 \r
@@ -6450,7 +6450,7 @@ RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os
 \r
 *_XCODE5_*_*_FAMILY            = GCC\r
 *_XCODE5_*_*_BUILDRULEFAMILY   = XCODE\r
-*_XCODE5_*_*_BUILDRULEORDER    = S s nasm Nasm NASM\r
+*_XCODE5_*_*_BUILDRULEORDER    = S s nasm\r
 \r
 *_XCODE5_*_ASL_PATH          = /usr/bin/iasl\r
 \r
@@ -6947,4 +6947,4 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC
 #################\r
 # Build rule order\r
 #################\r
-*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s\r
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s\r