commit 5acb60f60a2c4374cf04b8c26c331ceb9877fa35
author Greg Hackmann <ghackmann@google.com> Thu Jul 23 10:40:57 2015 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Fri Jan 27 13:55:45 2017 -0800
tree 27d24784e0f2d47b3fa7d196c2c281e269477496
parent a50f1dbcef02adc7a8e0fbb18c9ac475f82102e3

ANDROID: arch: x86: disable pic for Android toolchain

Android toolchains enable PIC, so explicitly disable it with
-fno-pic (this is the upstream gcc default)

Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit 892606ece2bebfa5a1ed62e9552cc973707ae9d3)

Change-Id: I1e600363e5d18e459479fe4eb23d76855e16868d

arch/x86/Makefile

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 2d44933..75725dc 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -97,6 +97,8 @@
         KBUILD_CFLAGS += $(call cc-option,-mno-80387)
         KBUILD_CFLAGS += $(call cc-option,-mno-fp-ret-in-387)
 
+        KBUILD_CFLAGS += -fno-pic
+
 	# Use -mpreferred-stack-boundary=3 if supported.
 	KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)