aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-07-10 17:27:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-07-10 00:35:03 +0000
commit6ff849568c94c53c8a722f71f33c1e688ebbed74 (patch)
tree5debeedfb764c953a3997f045d6a2eaffa6b7a5d
parentec5563b55146372fe33ebd4fc13661d811b77323 (diff)
parent3a8d2bf39213c5b88c3d4889e33e0ed6d3ce99e3 (diff)
downloadbuild-6ff849568c94c53c8a722f71f33c1e688ebbed74.tar.gz
Merge "Fix PIC default to be -fPIC"
-rw-r--r--core/combo/TARGET_linux-x86.mk2
-rw-r--r--core/combo/TARGET_linux-x86_64.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 4370db8f3d..2ca99ef548 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -112,7 +112,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
-Werror=format-security \
-D_FORTIFY_SOURCE=2 \
-Wstrict-aliasing=2 \
- -fPIC -fPIE \
+ -fPIC \
-ffunction-sections \
-finline-functions \
-finline-limit=300 \
diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index f6a9fc86e9..9dbcc19e9e 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -110,7 +110,7 @@ TARGET_GLOBAL_CFLAGS += \
-Werror=format-security \
-D_FORTIFY_SOURCE=2 \
-Wstrict-aliasing=2 \
- -fPIC -fPIE \
+ -fPIC \
-ffunction-sections \
-finline-functions \
-finline-limit=300 \