diff options
Diffstat (limited to 'libphobos/src')
| -rw-r--r-- | libphobos/src/MERGE | 2 | ||||
| -rw-r--r-- | libphobos/src/std/math.d | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE index e4807fb..685b4e6 100644 --- a/libphobos/src/MERGE +++ b/libphobos/src/MERGE @@ -1,4 +1,4 @@ -b538f758a4d274b64751f80564b0207845cd018c +b5e9661a089b6514e01fa5195c0f2bc9cc06eddd 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 6dec9ce..062b570 100644 --- a/libphobos/src/std/math.d +++ b/libphobos/src/std/math.d @@ -174,6 +174,12 @@ else version (D_InlineAsm_X86_64) version = InlineAsm_X86_Any; } +version (CRuntime_Microsoft) +{ + version (InlineAsm_X86_Any) + version = MSVC_InlineAsm; +} + version (X86_64) version = StaticallyHaveSSE; version (X86) version (OSX) version = StaticallyHaveSSE; @@ -3692,7 +3698,7 @@ real logb(real x) @trusted nothrow @nogc ret ; } } - else version (CRuntime_Microsoft) + else version (MSVC_InlineAsm) { asm pure nothrow @nogc { @@ -3979,7 +3985,7 @@ real ceil(real x) @trusted pure nothrow @nogc ret ; } } - else version (CRuntime_Microsoft) + else version (MSVC_InlineAsm) { short cw; asm pure nothrow @nogc @@ -4107,7 +4113,7 @@ real floor(real x) @trusted pure nothrow @nogc ret ; } } - else version (CRuntime_Microsoft) + else version (MSVC_InlineAsm) { short cw; asm pure nothrow @nogc @@ -4607,7 +4613,7 @@ real trunc(real x) @trusted nothrow @nogc ret ; } } - else version (CRuntime_Microsoft) + else version (MSVC_InlineAsm) { short cw; asm pure nothrow @nogc |