kbuild: add -fno-PIE flag unconditionally

This flag is documented in the GCC 4.6 manual, and recognized by
Clang as well. Let's rip off the cc-option switch.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 6f3df2d786dd..2d15726fb546 100644
--- a/Makefile
+++ b/Makefile
@@ -426,9 +426,9 @@ LINUXINCLUDE    := \
                 -I$(objtree)/include \
                 $(USERINCLUDE)
 
-KBUILD_AFLAGS   := -D__ASSEMBLY__
+KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
 KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-                   -fno-strict-aliasing -fno-common -fshort-wchar \
+                   -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \
                    -Werror-implicit-function-declaration \
                    -Wno-format-security \
                    -std=gnu89
@@ -514,9 +514,6 @@ RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc
 export RETPOLINE_CFLAGS
 export RETPOLINE_VDSO_CFLAGS
 
-KBUILD_CFLAGS   += $(call cc-option,-fno-PIE)
-KBUILD_AFLAGS   += $(call cc-option,-fno-PIE)
-
 # check for 'asm goto'
 ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
   CC_HAVE_ASM_GOTO := 1