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/m4 | |
| parent | bce54ed494fd0e61f41986e2bdbcfb2d2a3a1cf1 (diff) | |
| download | gcc-8b53086ab6a6d0e89d407398c3a126535989f0c1.zip gcc-8b53086ab6a6d0e89d407398c3a126535989f0c1.tar.gz gcc-8b53086ab6a6d0e89d407398c3a126535989f0c1.tar.bz2 | |
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/m4')
| -rw-r--r-- | libphobos/m4/druntime/cpu.m4 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libphobos/m4/druntime/cpu.m4 b/libphobos/m4/druntime/cpu.m4 index 6e88896..db3a92c 100644 --- a/libphobos/m4/druntime/cpu.m4 +++ b/libphobos/m4/druntime/cpu.m4 @@ -17,12 +17,9 @@ AC_DEFUN([DRUNTIME_CPU_SOURCES], ;; 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" ;; @@ -41,8 +38,6 @@ AC_DEFUN([DRUNTIME_CPU_SOURCES], [test "$druntime_target_cpu_parsed" = "mips"]) AM_CONDITIONAL([DRUNTIME_CPU_POWERPC], [test "$druntime_target_cpu_parsed" = "powerpc"]) - AM_CONDITIONAL([DRUNTIME_CPU_POWERPC64], - [test "$druntime_target_cpu_parsed" = "powerpc64"]) AM_CONDITIONAL([DRUNTIME_CPU_X86], [test "$druntime_target_cpu_parsed" = "x86"]) AM_CONDITIONAL([DRUNTIME_CPU_SYSTEMZ], |