diff mbox

[v2] x86, build: Set -fno-pic for 32/64-bit kernels

Message ID 1471650110-27239-1-git-send-email-carlos.santa@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Santa, Carlos Aug. 19, 2016, 11:41 p.m. UTC 
Now that 64-bit build configurations are common in both kernel and user space,
let's make the -fno-pic compiler flag common for both 32 and 64 bit kernels.
Avoid build breakages on build systems enabling -fpic by default (i.e., Android).

Signed-off-by: Carlos Santa <carlos.santa@intel.com>
---
 arch/x86/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 830ed39..17af5e1 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -49,6 +49,10 @@  endif
 KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
 KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
 
+# Never want PIC in both 32/64-bit kernel, prevent breakage with GCC built
+# with nonstandard options
+KBUILD_CFLAGS += -fno-pic
+
 ifeq ($(CONFIG_X86_32),y)
         BITS := 32
         UTS_MACHINE := i386
@@ -60,10 +64,6 @@  ifeq ($(CONFIG_X86_32),y)
 
         KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return
 
-        # Never want PIC in a 32-bit kernel, prevent breakage with GCC built
-        # with nonstandard options
-        KBUILD_CFLAGS += -fno-pic
-
         # prevent gcc from keeping the stack 16 byte aligned
         KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)