summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authoriains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>2013-09-29 19:16:45 +0000
committeriains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>2013-09-29 19:16:45 +0000
commit3129d07b8e63cd0c8bbff306d7d38a34e18401eb (patch)
treefed774ad966219a41e25acfe81f62f58cb1cc4b5 /config
parent3a61904c4060d767037c8be41bb6be469afe6717 (diff)
downloadgcc-3129d07b8e63cd0c8bbff306d7d38a34e18401eb.tar.gz
config:
* mh-darwin (BOOT_CFLAGS): Only add -mdynamic-no-pic for m32 hosts. (STAGE1_CFLAGS, STAGE1_LDFLAGS): New. Fix over-length lines and amend comments. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203017 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog6
-rw-r--r--config/mh-darwin17
2 files changed, 20 insertions, 3 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index ab34cbcc224..e3f6f456695 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-29 Iain Sandoe <iain@codesourcery.com>
+
+ * mh-darwin (BOOT_CFLAGS): Only add -mdynamic-no-pic for m32 hosts.
+ (STAGE1_CFLAGS, STAGE1_LDFLAGS): New.
+ Fix over-length lines and amend comments.
+
2013-08-30 Marek Polacek <polacek@redhat.com>
* bootstrap-ubsan.mk: New.
diff --git a/config/mh-darwin b/config/mh-darwin
index 19bf26568b5..a039f201410 100644
--- a/config/mh-darwin
+++ b/config/mh-darwin
@@ -1,7 +1,18 @@
# The -mdynamic-no-pic ensures that the compiler executable is built without
# position-independent-code -- the usual default on Darwin. This fix speeds
# compiles by 3-5%.
-BOOT_CFLAGS += -mdynamic-no-pic
+BOOT_CFLAGS += \
+`case ${host} in i?86-*-darwin* | powerpc-*-darwin*) \
+ echo -mdynamic-no-pic ;; esac;`
-# Ensure we don't try and use -pie, as it is incompatible with pch.
-BOOT_LDFLAGS += `case ${host} in *-*-darwin[1][1-9]*) echo -Wl,-no_pie ;; esac;`
+# ld on Darwin versions >= 10.7 defaults to PIE executables. Disable this for
+# gcc components, since it is incompatible with our pch implementation.
+BOOT_LDFLAGS += \
+`case ${host} in *-*-darwin[1][1-9]*) echo -Wl,-no_pie ;; esac;`
+
+# Similarly, for cross-compilation.
+STAGE1_CFLAGS += \
+`case ${host} in i?86-*-darwin* | powerpc-*-darwin*)\
+ echo -mdynamic-no-pic ;; esac;`
+STAGE1_LDFLAGS += \
+`case ${host} in *-*-darwin[1][1-9]*) echo -Wl,-no_pie ;; esac;`