summaryrefslogtreecommitdiff
path: root/libphobos
diff options
context:
space:
mode:
Diffstat (limited to 'libphobos')
-rw-r--r--libphobos/libdruntime/MERGE2
-rw-r--r--libphobos/libdruntime/core/simd.d2
-rw-r--r--libphobos/src/MERGE2
3 files changed, 4 insertions, 2 deletions
diff --git a/libphobos/libdruntime/MERGE b/libphobos/libdruntime/MERGE
index c94634f4770..9bab8ed6395 100644
--- a/libphobos/libdruntime/MERGE
+++ b/libphobos/libdruntime/MERGE
@@ -1,4 +1,4 @@
-e361d200b287a68344095f306cf5ea3a63c080e1
+9c0d4f914e0817c9ee4eafc5a45c41130aa6b981
The first line of this file holds the git revision number of the last
merge done from the dlang/druntime repository.
diff --git a/libphobos/libdruntime/core/simd.d b/libphobos/libdruntime/core/simd.d
index 11a47118319..94b230d1493 100644
--- a/libphobos/libdruntime/core/simd.d
+++ b/libphobos/libdruntime/core/simd.d
@@ -480,6 +480,7 @@ version (D_SIMD)
/*****
* For "store" operations of the form:
* op1 op= op2
+ * such as MOVLPS.
* Returns:
* op2
* These cannot be marked as pure, as semantic() doesn't check them.
@@ -487,6 +488,7 @@ version (D_SIMD)
@safe void16 __simd_sto(XMM opcode, void16 op1, void16 op2);
@safe void16 __simd_sto(XMM opcode, double op1, void16 op2); ///
@safe void16 __simd_sto(XMM opcode, float op1, void16 op2); ///
+ @safe void16 __simd_sto(XMM opcode, void16 op1, long op2); ///
///
unittest
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE
index 3218ace50a0..c51d237983d 100644
--- a/libphobos/src/MERGE
+++ b/libphobos/src/MERGE
@@ -1,4 +1,4 @@
-ac296f80cda437483b743f953dc69cb1271c82df
+dba1bbe271a9b2d7f24edeebbc77846e29904e41
The first line of this file holds the git revision number of the last
merge done from the dlang/phobos repository.