From 23b740dbc743a7af498c0b55542fcecfff72dd86 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sun, 29 Sep 2013 19:16:45 +0000 Subject: [PATCH] mh-darwin (BOOT_CFLAGS): Only add -mdynamic-no-pic for m32 hosts. 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. From-SVN: r203017 --- config/ChangeLog | 6 ++++++ config/mh-darwin | 17 ++++++++++++++--- 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 + + * 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 * 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;`