[edk2] [PATCH 3/3] ArmVirtPkg/PrePi ARM CLANG35: drop incompatible command line option

Ard Biesheuvel ard.biesheuvel at linaro.org
Wed Dec 12 02:33:08 PST 2018


Drop the -mno-movt command line option override, which is no longer
needed, and actually incompatible with versions of Clang before 3.6.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org>
---
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 5 -----
 ArmVirtPkg/ArmVirtXen.dsc        | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index c4324a9e264b..df125cfef646 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -69,11 +69,6 @@ [LibraryClasses.common.UEFI_DRIVER]
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
 
 [BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]
-  # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE
-  # executable we build for the relocatable PrePi. They are not runtime
-  # relocatable in ELF.
-  *_CLANG35_ARM_CC_FLAGS = -mno-movt
-
   #
   # CLANG38 with LTO support enabled uses the GNU GOLD linker, which insists
   # on emitting GOT based symbol references when running in shared mode, unless
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index e083666f54ea..a29d8a4ae717 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -58,11 +58,6 @@ [LibraryClasses.common.UEFI_DRIVER]
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
 
 [BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]
-  # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE
-  # executable we build for the relocatable PrePi. They are not runtime
-  # relocatable in ELF.
-  *_CLANG35_ARM_CC_FLAGS = -mno-movt
-
   #
   # CLANG38 with LTO support enabled uses the GNU GOLD linker, which insists
   # on emitting GOT based symbol references when running in shared mode, unless
-- 
2.19.2



More information about the edk2-devel mailing list