diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2021-08-07 14:40:33 +0100 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2021-08-18 19:46:32 +0100 |
| commit | d39367fa82d95b646f0587a442156069100ee245 (patch) | |
| tree | 274ba48f97736f574e06a1bddb288ce68d4fd51e | |
| parent | d2aa4e0b3b5053df8f5853d9ed29022ff0d3ecf6 (diff) | |
| download | gcc-d39367fa82d95b646f0587a442156069100ee245.zip gcc-d39367fa82d95b646f0587a442156069100ee245.tar.gz gcc-d39367fa82d95b646f0587a442156069100ee245.tar.bz2 | |
configure: Allow host fragments to react to --enable-host-shared.
This makes the host_shared value available to host makefile
fragments.
It uses this to adjust Darwin's mdynamic-no-pic in the case that
shared host resources are required.
Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
ChangeLog:
* Makefile.in: Regenerate.
* Makefile.tpl: Make the state of the configured host
shared flag available to makefile fragements.
config/ChangeLog:
* mh-darwin: Require a non-shared host configuration to
enable mdynamic-no-pic where that is supported.
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | Makefile.tpl | 3 | ||||
| -rw-r--r-- | config/mh-darwin | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 3809d17..5c85fcc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -109,6 +109,9 @@ RPATH_ENVVAR = @RPATH_ENVVAR@ # executables in PATH. GCC_SHLIB_SUBDIR = @GCC_SHLIB_SUBDIR@ +# If the build should make suitable code for shared host resources. +host_shared = @host_shared@ + # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring diff --git a/Makefile.tpl b/Makefile.tpl index bffd85b..9adf4f9 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -112,6 +112,9 @@ RPATH_ENVVAR = @RPATH_ENVVAR@ # executables in PATH. GCC_SHLIB_SUBDIR = @GCC_SHLIB_SUBDIR@ +# If the build should make suitable code for shared host resources. +host_shared = @host_shared@ + # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring diff --git a/config/mh-darwin b/config/mh-darwin index fb2bb5a..b72835a 100644 --- a/config/mh-darwin +++ b/config/mh-darwin @@ -11,9 +11,15 @@ # non-bootstrapped compiler), later stages will be built by GCC which supports # the required flags. +# We cannot use mdynamic-no-pic when building shared host resources. + +ifeq (${host_shared},no) BOOTSTRAP_TOOL_CAN_USE_MDYNAMIC_NO_PIC := $(shell \ $(CC) -S -xc /dev/null -o /dev/null -Werror -mno-dynamic-no-pic 2>/dev/null \ && echo true) +else +BOOTSTRAP_TOOL_CAN_USE_MDYNAMIC_NO_PIC := false +endif @if gcc-bootstrap ifeq (${BOOTSTRAP_TOOL_CAN_USE_MDYNAMIC_NO_PIC},true) @@ -21,8 +27,10 @@ STAGE1_CFLAGS += -mdynamic-no-pic else STAGE1_CFLAGS += -fPIC endif +ifeq (${host_shared},no) # Add -mdynamic-no-pic to later stages when we know it is built with GCC. BOOT_CFLAGS += -mdynamic-no-pic +endif @endif gcc-bootstrap @unless gcc-bootstrap |