diff options
-rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.dsc | 12 | ||||
-rw-r--r-- | ArmVirtPkg/ArmVirtXen.dsc | 12 | ||||
-rw-r--r-- | ArmVirtPkg/Include/Platform/Hidden.h | 28 | ||||
-rwxr-xr-x | ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 2 |
4 files changed, 49 insertions, 5 deletions
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 9928919bf5..c4324a9e26 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -68,11 +68,19 @@ [LibraryClasses.common.UEFI_DRIVER]
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-[BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]
+[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_*_CC_FLAGS = -mno-movt
+ *_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
+ # we override visibility to 'hidden' in all modules that make up the PrePi
+ # build.
+ #
+ GCC:*_CLANG38_*_CC_FLAGS = -include $(WORKSPACE)/ArmVirtPkg/Include/Platform/Hidden.h
################################################################################
#
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 20fae9e675..e083666f54 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -57,11 +57,19 @@ [LibraryClasses.common.UEFI_DRIVER]
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-[BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]
+[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_*_CC_FLAGS = -mno-movt
+ *_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
+ # we override visibility to 'hidden' in all modules that make up the PrePi
+ # build.
+ #
+ GCC:*_CLANG38_*_CC_FLAGS = -include $(WORKSPACE)/ArmVirtPkg/Include/Platform/Hidden.h
################################################################################
#
diff --git a/ArmVirtPkg/Include/Platform/Hidden.h b/ArmVirtPkg/Include/Platform/Hidden.h new file mode 100644 index 0000000000..fbd3467471 --- /dev/null +++ b/ArmVirtPkg/Include/Platform/Hidden.h @@ -0,0 +1,28 @@ +/** @file + + Copyright (c) 2018, Linaro Limited. All rights reserved. + + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __PLATFORM_HIDDEN_H +#define __PLATFORM_HIDDEN_H + +// +// Setting the GCC -fvisibility=hidden command line option is not quite the same +// as setting the pragma below: the former only affects definitions, whereas the +// pragma affects extern declarations as well. So if we want to ensure that no +// GOT indirected symbol references are emitted, we need to use the pragma, or +// GOT based cross object references could be emitted, e.g., in libraries, and +// these cannot be relaxed to ordinary symbol references at link time. +// +#pragma GCC visibility push (hidden) + +#endif diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf index 034ddb41cb..5fe6cd8eb4 100755 --- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf +++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf @@ -105,4 +105,4 @@ gArmTokenSpaceGuid.PcdFvBaseAddress
[BuildOptions]
- GCC:*_*_*_DLINK_FLAGS = -pie -Wl,-T,$(MODULE_DIR)/Scripts/PrePi-PIE.lds
+ GCC:*_*_*_DLINK_FLAGS = -shared -Wl,-Bsymbolic -Wl,-T,$(MODULE_DIR)/Scripts/PrePi-PIE.lds
|