diff options
| author | Robin Dapp <rdapp@linux.ibm.com> | 2020-04-07 21:05:38 +0200 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.ibm.com> | 2020-04-07 21:08:06 +0200 |
| commit | 88e508f9f112acd07d0c49c53589160db8c85fcd (patch) | |
| tree | a86b2b2c6d8467dc434f994aff6f52aa8ba4aedc /libphobos/m4 | |
| parent | 50c7853216e8511971c55b51d7fe29173db4749b (diff) | |
| download | gcc-88e508f9f112acd07d0c49c53589160db8c85fcd.tar.gz | |
S/390: Fix PR91628
With this patch we get rid of the usage of the glibc-internal symbol
__tls_get_addr_internal.
If build with multilib, the file
gcc/libphobos/libdruntime/config/systemz/get_tls_offset.S is used
for both configurations: systemz and s390.
Therefore both implementations are now in the systemz file which
uses an "#ifdef __s390x__" in order to distinguish both cases.
The s390 file is just including the systemz one.
libphobos/ChangeLog:
2020-04-07 Robin Dapp <rdapp@linux.ibm.com>
Stefan Liebler <stli@linux.ibm.com>
* configure: Regenerate.
* libdruntime/Makefile.am: Add s390x and s390.
* libdruntime/Makefile.in: Regenerate.
* libdruntime/config/s390/get_tls_offset.S: New file.
* libdruntime/config/systemz/get_tls_offset.S: New file.
* libdruntime/gcc/sections/elf_shared.d: Use ibmz_get_tls_offset.
* m4/druntime/cpu.m4: Add s390x and s390.
Diffstat (limited to 'libphobos/m4')
| -rw-r--r-- | libphobos/m4/druntime/cpu.m4 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libphobos/m4/druntime/cpu.m4 b/libphobos/m4/druntime/cpu.m4 index aa5b5ea08fc..4887248fd09 100644 --- a/libphobos/m4/druntime/cpu.m4 +++ b/libphobos/m4/druntime/cpu.m4 @@ -25,6 +25,12 @@ AC_DEFUN([DRUNTIME_CPU_SOURCES], i[[34567]]86|x86_64) druntime_target_cpu_parsed="x86" ;; + s390x) + druntime_target_cpu_parsed="s390x" + ;; + s390) + druntime_target_cpu_parsed="s390" + ;; esac AM_CONDITIONAL([DRUNTIME_CPU_AARCH64], [test "$druntime_target_cpu_parsed" = "aarch64"]) @@ -38,6 +44,10 @@ AC_DEFUN([DRUNTIME_CPU_SOURCES], [test "$druntime_target_cpu_parsed" = "powerpc64"]) AM_CONDITIONAL([DRUNTIME_CPU_X86], [test "$druntime_target_cpu_parsed" = "x86"]) + AM_CONDITIONAL([DRUNTIME_CPU_SYSTEMZ], + [test "$druntime_target_cpu_parsed" = "s390x"]) + AM_CONDITIONAL([DRUNTIME_CPU_S390], + [test "$druntime_target_cpu_parsed" = "s390"]) ]) |