aboutsummaryrefslogtreecommitdiff
path: root/libphobos/src
diff options
context:
space:
mode:
Diffstat (limited to 'libphobos/src')
-rw-r--r--libphobos/src/MERGE2
-rw-r--r--libphobos/src/std/math.d6
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;
}