Fix sparc memcpy data corruption when using niagara2 optimized routines.

	* sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S: Add missing
	membar to avoid block loads/stores to overlap previous stores.

diff --git a/ChangeLog b/ChangeLog
index f008fb468dfb7ef0466d3ad6c2e532bd37e1eb24..2a14ec2399f0da1ba8114467e324507c48612fcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-17  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
+       [BZ #16958]
+       * sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S: Add missing
+       membar to avoid block loads/stores to overlap previous stores.
+
 2014-05-16  Aurelien Jarno  <aurelien@aurel32.net>
 
        [BZ #16943]

diff --git a/NEWS b/NEWS
index 482561767f4d0917cc0f4c47dd4b9e1398e90c7b..4cbe73644e10a1672b80e221da44572668a7abfe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.18.1
 * The following bugs are resolved with this release:
 
   15073, 15128, 15909, 15996, 16150, 16169, 16387, 16510, 16885, 16916,
-  16943.
+  16943, 16958.
 \f
 Version 2.18
 

diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S
index 594405051f42a4ec96aca0658828401f18a69c9d..63ba0811d0ed33d98f925fa822ef800099f44f1c 100644 (file)
--- a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S
+++ b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S
@@ -211,6 +211,7 @@ ENTRY(__memcpy_niagara2)
         */
        VISEntryHalf
 
+       membar          #Sync
        alignaddr       %o1, %g0, %g0
 
        add             %o1, (64 - 1), %o4