diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-03-15 13:59:14 +0100 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-03-16 10:38:31 +0100 |
| commit | f2d3807f580a86ca0bdc2b66aa9b4d2367c77a2e (patch) | |
| tree | d72c486851501110f304f3d56960ca8a18f02771 /libphobos/src | |
| parent | 6d44c881286762628afce5169d921a388ae6a1ff (diff) | |
| download | gcc-f2d3807f580a86ca0bdc2b66aa9b4d2367c77a2e.zip gcc-f2d3807f580a86ca0bdc2b66aa9b4d2367c77a2e.tar.gz gcc-f2d3807f580a86ca0bdc2b66aa9b4d2367c77a2e.tar.bz2 | |
libphobos: Merge upstream druntime 6c45dd3a, phobos 68cc18adb.
Surrounds the gcc-style asm operands with parentheses, as the old style
is now deprecated.
Reviewed-on: https://github.com/dlang/druntime/pull/2986
Diffstat (limited to 'libphobos/src')
| -rw-r--r-- | libphobos/src/MERGE | 2 | ||||
| -rw-r--r-- | libphobos/src/std/algorithm/iteration.d | 2 | ||||
| -rw-r--r-- | libphobos/src/std/math.d | 20 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE index 6a1e008..c7e4878 100644 --- a/libphobos/src/MERGE +++ b/libphobos/src/MERGE @@ -1,4 +1,4 @@ -66ae77ac3f97a007a12738e4bc02b3bbfef99bba +68cc18adbcdbf2a62cb85a5cb2a34236af2ab05a 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/algorithm/iteration.d b/libphobos/src/std/algorithm/iteration.d index 93cf1e7..c77792d 100644 --- a/libphobos/src/std/algorithm/iteration.d +++ b/libphobos/src/std/algorithm/iteration.d @@ -3620,7 +3620,7 @@ The number of seeds must be correspondingly increased. static assert(!__traits(compiles, cumulativeFold!(min, max)("hello", tuple(c)))); //"Seed (dchar, dchar, dchar) does not have the correct amount of fields (should be 2)" static assert(!__traits(compiles, cumulativeFold!(min, max)("hello", tuple(c, c, c)))); - //"Incompatable function/seed/element: all(alias pred = "a")/int/dchar" + //"Incompatible function/seed/element: all(alias pred = "a")/int/dchar" static assert(!__traits(compiles, cumulativeFold!all("hello", 1))); static assert(!__traits(compiles, cumulativeFold!(all, all)("hello", tuple(1, 1)))); } diff --git a/libphobos/src/std/math.d b/libphobos/src/std/math.d index ff1633a..dedfa20 100644 --- a/libphobos/src/std/math.d +++ b/libphobos/src/std/math.d @@ -4760,7 +4760,7 @@ private: uint result = void; asm pure nothrow @nogc { - "vmrs %0, FPSCR; and %0, %0, #0x1F;" : "=r" result; + "vmrs %0, FPSCR; and %0, %0, #0x1F;" : "=r" (result); } return result; } @@ -4774,7 +4774,7 @@ private: uint result = void; asm pure nothrow @nogc { - "frflags %0" : "=r" result; + "frflags %0" : "=r" (result); } return result; } @@ -4862,7 +4862,7 @@ private: uint newValues = 0x0; asm pure nothrow @nogc { - "fsflags %0" : : "r" newValues; + "fsflags %0" : : "r" (newValues); } } } @@ -5431,7 +5431,7 @@ private: ControlState cont; asm pure nothrow @nogc { - "fstcw %0" : "=m" cont; + "fstcw %0" : "=m" (cont); } return cont; } @@ -5440,7 +5440,7 @@ private: ControlState cont; asm pure nothrow @nogc { - "mrs %0, FPCR;" : "=r" cont; + "mrs %0, FPCR;" : "=r" (cont); } return cont; } @@ -5453,7 +5453,7 @@ private: { asm pure nothrow @nogc { - "vmrs %0, FPSCR" : "=r" cont; + "vmrs %0, FPSCR" : "=r" (cont); } } return cont; @@ -5467,7 +5467,7 @@ private: ControlState cont; asm pure nothrow @nogc { - "frcsr %0" : "=r" cont; + "frcsr %0" : "=r" (cont); } return cont; } @@ -5510,7 +5510,7 @@ private: { asm pure nothrow @nogc { - "fclex; fldcw %0" : : "m" newState; + "fclex; fldcw %0" : : "m" (newState); } // Also update MXCSR, SSE's control register. @@ -5519,7 +5519,7 @@ private: uint mxcsr; asm pure nothrow @nogc { - "stmxcsr %0" : "=m" mxcsr; + "stmxcsr %0" : "=m" (mxcsr); } /* In the FPU control register, rounding mode is in bits 10 and @@ -5534,7 +5534,7 @@ private: asm pure nothrow @nogc { - "ldmxcsr %0" : : "m" mxcsr; + "ldmxcsr %0" : : "m" (mxcsr); } } } |