Discussion:
[edk2] [PATCH] BaseTools/Conf/build_rule: Don't support upper case nasm extensions
Jordan Justen
2015-05-28 06:46:21 UTC
Permalink
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.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <***@intel.com>
Cc: Liming Gao <***@intel.com>
---
Liming, What do thing about putting this in the middle of the
BUILDRULEORDER series?

BaseTools/Conf/build_rule.template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a..e5467cc 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@

[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm

<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@

[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb

<ExtraDependency>
$(MAKE_FILE)
--
2.1.4


------------------------------------------------------------------------------
Gao, Liming
2015-05-28 07:46:17 UTC
Permalink
Jordan:
BUILDRULEORDER patch has been in EDKII trunk. I suggest this patch also includes the change in tools_def.txt file.

Thanks
Liming
-----Original Message-----
From: Justen, Jordan L
Sent: Thursday, May 28, 2015 2:46 PM
To: edk2-***@lists.sourceforge.net
Cc: Justen, Jordan L; Gao, Liming
Subject: [PATCH] BaseTools/Conf/build_rule: 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.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <***@intel.com>
Cc: Liming Gao <***@intel.com>
---
Liming, What do thing about putting this in the middle of the BUILDRULEORDER series?

BaseTools/Conf/build_rule.template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a..e5467cc 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@

[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm

<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@

[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb

<ExtraDependency>
$(MAKE_FILE)
--
2.1.4


------------------------------------------------------------------------------
Jordan Justen
2015-05-28 15:14:00 UTC
Permalink
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 <***@intel.com>
Cc: Liming Gao <***@intel.com>
---
BaseTools/Conf/build_rule.template | 4 ++--
BaseTools/Conf/tools_def.template | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a..e5467cc 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@

[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm

<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@

[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb

<ExtraDependency>
$(MAKE_FILE)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ad34a3d..fd7b4b5 100644
--- 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)
*_XCODE32_*_*_FAMILY = GCC
*_XCODE32_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE32_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE32_*_*_BUILDRULEORDER = S s nasm


*_XCODE32_*_ASL_PATH = /usr/bin/iasl
@@ -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
*_XCLANG_*_*_FAMILY = GCC
*_XCLANG_*_*_BUILDRULEFAMILY = XCODE
-*_XCLANG_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCLANG_*_*_BUILDRULEORDER = S s nasm

*_XCLANG_*_ASL_PATH = /usr/bin/iasl

@@ -6450,7 +6450,7 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os

*_XCODE5_*_*_FAMILY = GCC
*_XCODE5_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE5_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE5_*_*_BUILDRULEORDER = S s nasm

*_XCODE5_*_ASL_PATH = /usr/bin/iasl

@@ -6947,4 +6947,4 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC
#################
# Build rule order
#################
-*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
--
2.1.4


------------------------------------------------------------------------------
Hauch, Larry
2015-05-28 15:35:40 UTC
Permalink
Hi Jordan,
So if we remove .Nasm and .NASM and someone accidentally uses these in an INF file, should the build break?
Cheers,
Larry

-----Original Message-----
From: Jordan Justen [mailto:***@intel.com]
Sent: Thursday, May 28, 2015 8:14 AM
To: edk2-***@lists.sourceforge.net
Subject: [edk2] [PATCH v2] 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 <***@intel.com>
Cc: Liming Gao <***@intel.com>
---
BaseTools/Conf/build_rule.template | 4 ++-- BaseTools/Conf/tools_def.template | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a..e5467cc 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@

[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm

<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@

[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb

<ExtraDependency>
$(MAKE_FILE)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ad34a3d..fd7b4b5 100644
--- 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)
*_XCODE32_*_*_FAMILY = GCC
*_XCODE32_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE32_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE32_*_*_BUILDRULEORDER = S s nasm


*_XCODE32_*_ASL_PATH = /usr/bin/iasl
@@ -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
*_XCLANG_*_*_FAMILY = GCC
*_XCLANG_*_*_BUILDRULEFAMILY = XCODE
-*_XCLANG_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCLANG_*_*_BUILDRULEORDER = S s nasm

*_XCLANG_*_ASL_PATH = /usr/bin/iasl

@@ -6450,7 +6450,7 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os

*_XCODE5_*_*_FAMILY = GCC
*_XCODE5_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE5_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE5_*_*_BUILDRULEORDER = S s nasm

*_XCODE5_*_ASL_PATH = /usr/bin/iasl

@@ -6947,4 +6947,4 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC ################# # Build rule order ################# -*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
--
2.1.4
Andrew Fish
2015-05-28 15:38:25 UTC
Permalink
Post by Hauch, Larry
Hi Jordan,
So if we remove .Nasm and .NASM and someone accidentally uses these in an INF file, should the build break?
I vote yes. All our build servers run with a case sensitive file system.

Thanks,

Andrew Fish
Post by Hauch, Larry
Cheers,
Larry
-----Original Message-----
Sent: Thursday, May 28, 2015 8:14 AM
Subject: [edk2] [PATCH v2] 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
---
BaseTools/Conf/build_rule.template | 4 ++-- BaseTools/Conf/tools_def.template | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a..e5467cc 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@
[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm
<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@
[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb
<ExtraDependency>
$(MAKE_FILE)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ad34a3d..fd7b4b5 100644
--- 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)
*_XCODE32_*_*_FAMILY = GCC
*_XCODE32_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE32_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE32_*_*_BUILDRULEORDER = S s nasm
*_XCODE32_*_ASL_PATH = /usr/bin/iasl
@@ -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
*_XCLANG_*_*_FAMILY = GCC
*_XCLANG_*_*_BUILDRULEFAMILY = XCODE
-*_XCLANG_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCLANG_*_*_BUILDRULEORDER = S s nasm
*_XCLANG_*_ASL_PATH = /usr/bin/iasl
@@ -6450,7 +6450,7 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os
*_XCODE5_*_*_FAMILY = GCC
*_XCODE5_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE5_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE5_*_*_BUILDRULEORDER = S s nasm
*_XCODE5_*_ASL_PATH = /usr/bin/iasl
@@ -6947,4 +6947,4 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC ################# # Build rule order ################# -*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
--
2.1.4
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------
Brian J. Johnson
2015-05-28 16:54:16 UTC
Permalink
Post by Andrew Fish
Post by Hauch, Larry
Hi Jordan,
So if we remove .Nasm and .NASM and someone accidentally uses these in an INF file, should the build break?
I vote yes. All our build servers run with a case sensitive file system.
Seconded.
Post by Andrew Fish
Thanks,
Andrew Fish
Post by Hauch, Larry
Cheers,
Larry
-----Original Message-----
Sent: Thursday, May 28, 2015 8:14 AM
Subject: [edk2] [PATCH v2] 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
---
BaseTools/Conf/build_rule.template | 4 ++-- BaseTools/Conf/tools_def.template | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a..e5467cc 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@
[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm
<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@
[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb
<ExtraDependency>
$(MAKE_FILE)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ad34a3d..fd7b4b5 100644
--- 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)
*_XCODE32_*_*_FAMILY = GCC
*_XCODE32_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE32_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE32_*_*_BUILDRULEORDER = S s nasm
*_XCODE32_*_ASL_PATH = /usr/bin/iasl
@@ -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
*_XCLANG_*_*_FAMILY = GCC
*_XCLANG_*_*_BUILDRULEFAMILY = XCODE
-*_XCLANG_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCLANG_*_*_BUILDRULEORDER = S s nasm
*_XCLANG_*_ASL_PATH = /usr/bin/iasl
@@ -6450,7 +6450,7 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os
*_XCODE5_*_*_FAMILY = GCC
*_XCODE5_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE5_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE5_*_*_BUILDRULEORDER = S s nasm
*_XCODE5_*_ASL_PATH = /usr/bin/iasl
@@ -6947,4 +6947,4 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC ################# # Build rule order ################# -*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
--
2.1.4
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
https://lists.sourceforge.net/lists/listinfo/edk2-devel
--
Brian J. Johnson

--------------------------------------------------------------------

My statements are my own, are not authorized by SGI, and do not
necessarily represent SGI’s positions.

------------------------------------------------------------------------------
Jordan Justen
2015-05-28 16:03:52 UTC
Permalink
Post by Hauch, Larry
Hi Jordan,
So if we remove .Nasm and .NASM and someone accidentally uses these
in an INF file, should the build break?
I think so, but, I can't think of a scenario where the extra
extensions are helpful.

I guess on Windows someone might be able to put 1.nasm in the .inf,
and check in 1.Nasm without noticing a build error. Then if someone
tried to build on Linux, they will see an error.

Yet, the same thing would happen if the .Nasm extension was in the
Conf files, since they still would have put 1.nasm in the .inf.

So, the only thing this adds is that they can add 1.Nasm to the .inf
so long as they also check in 1.Nasm. I don't think this is too
useful.

-Jordan
Post by Hauch, Larry
-----Original Message-----
Sent: Thursday, May 28, 2015 8:14 AM
Subject: [edk2] [PATCH v2] 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
---
BaseTools/Conf/build_rule.template | 4 ++-- BaseTools/Conf/tools_def.template | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a..e5467cc 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@
[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm
<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@
[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb
<ExtraDependency>
$(MAKE_FILE)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ad34a3d..fd7b4b5 100644
--- 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)
*_XCODE32_*_*_FAMILY = GCC
*_XCODE32_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE32_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE32_*_*_BUILDRULEORDER = S s nasm
*_XCODE32_*_ASL_PATH = /usr/bin/iasl
@@ -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
*_XCLANG_*_*_FAMILY = GCC
*_XCLANG_*_*_BUILDRULEFAMILY = XCODE
-*_XCLANG_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCLANG_*_*_BUILDRULEORDER = S s nasm
*_XCLANG_*_ASL_PATH = /usr/bin/iasl
@@ -6450,7 +6450,7 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os
*_XCODE5_*_*_FAMILY = GCC
*_XCODE5_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE5_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE5_*_*_BUILDRULEORDER = S s nasm
*_XCODE5_*_ASL_PATH = /usr/bin/iasl
@@ -6947,4 +6947,4 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC ################# # Build rule order ################# -*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
--
2.1.4
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------
Gao, Liming
2015-06-01 03:38:45 UTC
Permalink
Reviewed-by: Liming Gao <***@intel.com>

-----Original Message-----
From: Justen, Jordan L
Sent: Thursday, May 28, 2015 11:14 PM
To: edk2-***@lists.sourceforge.net
Cc: Justen, Jordan L; Gao, Liming
Subject: [PATCH v2] 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 <***@intel.com>
Cc: Liming Gao <***@intel.com>
---
BaseTools/Conf/build_rule.template | 4 ++-- BaseTools/Conf/tools_def.template | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f1edf3a..e5467cc 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -194,7 +194,7 @@

[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm

<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@

[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb

<ExtraDependency>
$(MAKE_FILE)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ad34a3d..fd7b4b5 100644
--- 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)
*_XCODE32_*_*_FAMILY = GCC
*_XCODE32_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE32_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE32_*_*_BUILDRULEORDER = S s nasm


*_XCODE32_*_ASL_PATH = /usr/bin/iasl
@@ -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
*_XCLANG_*_*_FAMILY = GCC
*_XCLANG_*_*_BUILDRULEFAMILY = XCODE
-*_XCLANG_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCLANG_*_*_BUILDRULEORDER = S s nasm

*_XCLANG_*_ASL_PATH = /usr/bin/iasl

@@ -6450,7 +6450,7 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os

*_XCODE5_*_*_FAMILY = GCC
*_XCODE5_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE5_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE5_*_*_BUILDRULEORDER = S s nasm

*_XCODE5_*_ASL_PATH = /usr/bin/iasl

@@ -6947,4 +6947,4 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC ################# # Build rule order ################# -*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
--
2.1.4


------------------------------------------------------------------------------
Loading...