diff mbox series

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

Message ID 20181212103308.8099-4-ard.biesheuvel@linaro.org
State Accepted
Commit 36deafb838d01fd3a82d33d4f038246647f1f0ab
Headers show
Series fixes for CLANG35 on ARM | expand

Commit Message

Ard Biesheuvel Dec. 12, 2018, 10:33 a.m. UTC
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@linaro.org>

---
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 5 -----
 ArmVirtPkg/ArmVirtXen.dsc        | 5 -----
 2 files changed, 10 deletions(-)

-- 
2.19.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Laszlo Ersek Dec. 12, 2018, 11:51 a.m. UTC | #1
On 12/12/18 11:33, Ard Biesheuvel wrote:
> 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@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

> 


Acked-by: Laszlo Ersek <lersek@redhat.com>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox series

Patch

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