[LibraryClasses.common.UEFI_DRIVER]\r
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
\r
-[BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]\r
+[BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]\r
# Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE\r
# executable we build for the relocatable PrePi. They are not runtime\r
# relocatable in ELF.\r
- *_CLANG35_*_CC_FLAGS = -mno-movt\r
+ *_CLANG35_ARM_CC_FLAGS = -mno-movt\r
+\r
+ #\r
+ # CLANG38 with LTO support enabled uses the GNU GOLD linker, which insists\r
+ # on emitting GOT based symbol references when running in shared mode, unless\r
+ # we override visibility to 'hidden' in all modules that make up the PrePi\r
+ # build.\r
+ #\r
+ GCC:*_CLANG38_*_CC_FLAGS = -include $(WORKSPACE)/ArmVirtPkg/Include/Platform/Hidden.h\r
\r
################################################################################\r
#\r
[LibraryClasses.common.UEFI_DRIVER]\r
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
\r
-[BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]\r
+[BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]\r
# Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE\r
# executable we build for the relocatable PrePi. They are not runtime\r
# relocatable in ELF.\r
- *_CLANG35_*_CC_FLAGS = -mno-movt\r
+ *_CLANG35_ARM_CC_FLAGS = -mno-movt\r
+\r
+ #\r
+ # CLANG38 with LTO support enabled uses the GNU GOLD linker, which insists\r
+ # on emitting GOT based symbol references when running in shared mode, unless\r
+ # we override visibility to 'hidden' in all modules that make up the PrePi\r
+ # build.\r
+ #\r
+ GCC:*_CLANG38_*_CC_FLAGS = -include $(WORKSPACE)/ArmVirtPkg/Include/Platform/Hidden.h\r
\r
################################################################################\r
#\r
--- /dev/null
+/** @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
gArmTokenSpaceGuid.PcdFvBaseAddress\r
\r
[BuildOptions]\r
- GCC:*_*_*_DLINK_FLAGS = -pie -Wl,-T,$(MODULE_DIR)/Scripts/PrePi-PIE.lds\r
+ GCC:*_*_*_DLINK_FLAGS = -shared -Wl,-Bsymbolic -Wl,-T,$(MODULE_DIR)/Scripts/PrePi-PIE.lds\r