From dc31191ec3e5cefc8eceb5b1525d14e8e81c59ed Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Fri, 19 Mar 2021 15:09:45 -0600 Subject: [PATCH] build: make sure asm gets built with -DPIC Fixes issue openwrt/packages#14921, whereby inline ASM wasn't getting built as PIC; look at gmp-6.2.1/mpn/x86/pentium/popcount.asm for example: ifdef(`PIC',` ... for a routine that exists in both PIC and non-PIC versions. Make sure that wherever $(FPIC) gets passed as a variable expansion that it gets quoted where necessary (such as setting environment variables in shell commands). Signed-off-by: Philip Prindeville (cherry picked from commit af22991e03cae55f96b06996df2ff16752cec5d5) --- rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules.mk b/rules.mk index 8f41ff5861..f31d9bb113 100644 --- a/rules.mk +++ b/rules.mk @@ -75,12 +75,12 @@ IS_PACKAGE_BUILD := $(if $(filter package/%,$(BUILD_SUBDIR)),1) OPTIMIZE_FOR_CPU=$(subst i386,i486,$(ARCH)) ifneq (,$(findstring $(ARCH) , aarch64 aarch64_be powerpc )) - FPIC:=-fPIC + FPIC:=-DPIC -fPIC else - FPIC:=-fpic + FPIC:=-DPIC -fpic endif -HOST_FPIC:=-fPIC +HOST_FPIC:=-DPIC -fPIC ARCH_SUFFIX:=$(call qstrip,$(CONFIG_CPU_TYPE)) GCC_ARCH:= -- 2.30.2