commit 6ff849568c94c53c8a722f71f33c1e688ebbed74
author Nick Kralevich <nnk@google.com> Thu Jul 10 17:27:20 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 10 00:35:03 2014 +0000
tree 5debeedfb764c953a3997f045d6a2eaffa6b7a5d
parent ec5563b55146372fe33ebd4fc13661d811b77323
parent 3a8d2bf39213c5b88c3d4889e33e0ed6d3ce99e3

Merge "Fix PIC default to be -fPIC"

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 4370db8..2ca99ef 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -112,7 +112,7 @@
 			-Werror=format-security \
 			-D_FORTIFY_SOURCE=2 \
 			-Wstrict-aliasing=2 \
-			-fPIC -fPIE \
+			-fPIC \
 			-ffunction-sections \
 			-finline-functions \
 			-finline-limit=300 \

core/combo/TARGET_linux-x86_64.mk

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index f6a9fc8..9dbcc19 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -110,7 +110,7 @@
 			-Werror=format-security \
 			-D_FORTIFY_SOURCE=2 \
 			-Wstrict-aliasing=2 \
-			-fPIC -fPIE \
+			-fPIC \
 			-ffunction-sections \
 			-finline-functions \
 			-finline-limit=300 \