diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-28 21:42:41 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-28 21:45:00 +0200 |
| commit | 8b53086ab6a6d0e89d407398c3a126535989f0c1 (patch) | |
| tree | ae126d1846c0d0375a079b9ef84ad5f5ff1be025 /libphobos/configure | |
| parent | bce54ed494fd0e61f41986e2bdbcfb2d2a3a1cf1 (diff) | |
| download | gcc-8b53086ab6a6d0e89d407398c3a126535989f0c1.tar.gz | |
libphobos: Fix multilib powerpc64 builds
Multilibs should not have been split up as two logically different CPU,
so at configure time, powerpc64 was being detected, but none of the
32-bit support files were being compiled in.
libphobos/ChangeLog:
PR d/94825
* configure: Regenerate.
* libdruntime/Makefile.am (DRUNTIME_SOURCES_CONFIGURED): Add both
switchcontext.S and callwithstack.S if DRUNTIME_CPU_POWERPC.
* libdruntime/Makefile.in: Regenerate.
* libdruntime/config/powerpc/switchcontext.S: Add !__PPC64__ guards.
* libdruntime/config/powerpc64/callwithstack.S: Add __PPC64__ guards.
* m4/druntime/cpu.m4 (DRUNTIME_CPU_SOURCES): Define DRUNTIME_CPU_POWER
for all powerpc biarchs. Remove DRUNTIME_CPU_POWER64 conditional.
Diffstat (limited to 'libphobos/configure')
| -rwxr-xr-x | libphobos/configure | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/libphobos/configure b/libphobos/configure index 98d8dc255c1..e461c7442b2 100755 --- a/libphobos/configure +++ b/libphobos/configure @@ -692,8 +692,6 @@ DRUNTIME_CPU_SYSTEMZ_FALSE DRUNTIME_CPU_SYSTEMZ_TRUE DRUNTIME_CPU_X86_FALSE DRUNTIME_CPU_X86_TRUE -DRUNTIME_CPU_POWERPC64_FALSE -DRUNTIME_CPU_POWERPC64_TRUE DRUNTIME_CPU_POWERPC_FALSE DRUNTIME_CPU_POWERPC_TRUE DRUNTIME_CPU_MIPS_FALSE @@ -11649,7 +11647,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11652 "configure" +#line 11650 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11755,7 +11753,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11758 "configure" +#line 11756 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13991,12 +13989,9 @@ fi ;; mips*) druntime_target_cpu_parsed="mips" ;; - powerpc|powerpcle) + powerpc*) druntime_target_cpu_parsed="powerpc" ;; - powerpc64|powerpc64le) - druntime_target_cpu_parsed="powerpc64" - ;; i[34567]86|x86_64) druntime_target_cpu_parsed="x86" ;; @@ -14039,14 +14034,6 @@ else DRUNTIME_CPU_POWERPC_FALSE= fi - if test "$druntime_target_cpu_parsed" = "powerpc64"; then - DRUNTIME_CPU_POWERPC64_TRUE= - DRUNTIME_CPU_POWERPC64_FALSE='#' -else - DRUNTIME_CPU_POWERPC64_TRUE='#' - DRUNTIME_CPU_POWERPC64_FALSE= -fi - if test "$druntime_target_cpu_parsed" = "x86"; then DRUNTIME_CPU_X86_TRUE= DRUNTIME_CPU_X86_FALSE='#' @@ -15605,10 +15592,6 @@ if test -z "${DRUNTIME_CPU_POWERPC_TRUE}" && test -z "${DRUNTIME_CPU_POWERPC_FAL as_fn_error $? "conditional \"DRUNTIME_CPU_POWERPC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${DRUNTIME_CPU_POWERPC64_TRUE}" && test -z "${DRUNTIME_CPU_POWERPC64_FALSE}"; then - as_fn_error $? "conditional \"DRUNTIME_CPU_POWERPC64\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${DRUNTIME_CPU_X86_TRUE}" && test -z "${DRUNTIME_CPU_X86_FALSE}"; then as_fn_error $? "conditional \"DRUNTIME_CPU_X86\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |