Skip to content

Commit 8ba70e0

Browse files
greghackmannpundiramit
authored andcommitted
Revert "Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub""
In isolation, the original change will break building efistub for ARM64 with gcc. This wasn't an issue upstream due to the earlier change 60f38de7a8d4 ("efi/libstub: Unify command line param parsing"). That's now been backported to AOSP too. This reverts commit 8980526. Change-Id: I44eff2d17809b18181e2084abaf129ca4e2eb8d6 Signed-off-by: Greg Hackmann <ghackmann@google.com>
1 parent 04ca02c commit 8ba70e0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/firmware/efi/libstub/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 \
1010
-fPIC -fno-strict-aliasing -mno-red-zone \
1111
-mno-mmx -mno-sse
1212

13-
cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS))
13+
cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS)) -fpie
1414
cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) \
1515
-fno-builtin -fpic -mno-single-pic-base
1616

0 commit comments

Comments
 (0)