diff options
| author | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-04-29 05:42:48 +0000 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-04-29 05:42:48 +0000 |
| commit | ca0ddb398fb6173eb97c5d70265e79b9ea2bdc9d (patch) | |
| tree | b74922652edb3757230c8158fc835b10c7113bc7 /libphobos/src | |
| parent | be79ec008e8ef292fa1e770d2e87bcb40861f3ea (diff) | |
| download | gcc-ca0ddb398fb6173eb97c5d70265e79b9ea2bdc9d.zip gcc-ca0ddb398fb6173eb97c5d70265e79b9ea2bdc9d.tar.gz gcc-ca0ddb398fb6173eb97c5d70265e79b9ea2bdc9d.tar.bz2 | |
libphobos: Fix multilib builds for s390x-linux-gnu
Merges upstream druntime aab44549, phobos 3dc363783.
Reviewed-on: https://github.com/dlang/druntime/pull/2590
https://github.com/dlang/phobos/pull/6983
libphobos/ChangeLog:
2019-04-28 Iain Buclaw <ibuclaw@gdcproject.org>
* libdruntime/gcc/sections/elf_shared.d (IBMZ_Any): Define when
version S390 or SystemZ. Use condition instead of SystemZ.
(getTLSRange): Return null on GNU_EMUTLS targets.
From-SVN: r270639
Diffstat (limited to 'libphobos/src')
| -rw-r--r-- | libphobos/src/MERGE | 2 | ||||
| -rw-r--r-- | libphobos/src/std/math.d | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE index 685b4e6..cfac5c6 100644 --- a/libphobos/src/MERGE +++ b/libphobos/src/MERGE @@ -1,4 +1,4 @@ -b5e9661a089b6514e01fa5195c0f2bc9cc06eddd +3dc363783ea7b1e82336983486a14f3f44bbeadd The first line of this file holds the git revision number of the last merge done from the dlang/phobos repository. diff --git a/libphobos/src/std/math.d b/libphobos/src/std/math.d index 062b570..7e6a97f 100644 --- a/libphobos/src/std/math.d +++ b/libphobos/src/std/math.d @@ -160,8 +160,10 @@ version (MIPS32) version = MIPS_Any; version (MIPS64) version = MIPS_Any; version (AArch64) version = ARM_Any; version (ARM) version = ARM_Any; +version (S390) version = IBMZ_Any; version (SPARC) version = SPARC_Any; version (SPARC64) version = SPARC_Any; +version (SystemZ) version = IBMZ_Any; version (RISCV32) version = RISCV_Any; version (RISCV64) version = RISCV_Any; @@ -5241,7 +5243,7 @@ struct FloatingPointControl | inexactException, } } - else version (SystemZ) + else version (IBMZ_Any) { enum : ExceptionMask { @@ -5379,7 +5381,7 @@ private: { alias ControlState = ulong; } - else version (SystemZ) + else version (IBMZ_Any) { alias ControlState = uint; } |