Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 484d90ee authored by Andrew Boie's avatar Andrew Boie Committed by H. Peter Anvin
Browse files

x86, build: Globally set -fno-pic 



GCC built with nonstandard options can enable -fpic by default.
We never want this for 32-bit kernels and it will break the build.

[ hpa: Notably the Android toolchain apparently does this. ]

Change-Id: Iaab7d66e598b1c65ac4a4f0229eca2cd3d0d2898
Signed-off-by: default avatarAndrew Boie <andrew.p.boie@intel.com>
Link: http://lkml.kernel.org/r/1344624546-29691-1-git-send-email-andrew.p.boie@intel.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent c6fd893d

arch/x86/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ 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)

arch/x86/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ 
		   -Wall -Wstrict-prototypes \

		   -march=i386 -mregparm=3 \

		   -include $(srctree)/$(src)/code16gcc.h \

		   -fno-strict-aliasing -fomit-frame-pointer \

		   -fno-strict-aliasing -fomit-frame-pointer -fno-pic \

		   $(call cc-option, -ffreestanding) \

		   $(call cc-option, -fno-toplevel-reorder,\

			$(call cc-option, -fno-unit-at-a-time)) \

arch/x86/realmode/rm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \ 
		   -Wall -Wstrict-prototypes \

		   -march=i386 -mregparm=3 \

		   -include $(srctree)/$(src)/../../boot/code16gcc.h \

		   -fno-strict-aliasing -fomit-frame-pointer \

		   -fno-strict-aliasing -fomit-frame-pointer -fno-pic \

		   $(call cc-option, -ffreestanding) \

		   $(call cc-option, -fno-toplevel-reorder,\

			$(call cc-option, -fno-unit-at-a-time)) \