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 21b76eee9113aead871db985ea2e1d2c64a10611..fb5cf2a1037640db4fa8db473f405ad616e4cec2 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-13  Sami Kerola  <kerolasa@iki.fi>
 
        * timezone/Makefile ($(objpfx)tzselect): Use zonedir instead

diff --git a/NEWS b/NEWS
index ee1ea3623746bd37398ed91b2287bf48045c8c7b..dde85f2c50955ff50897a8c89f920a53255e27f6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.19.1
 
 * The following bugs are resolved with this release:
 
-  16545, 16623, 16885, 16916, 16943.
+  16545, 16623, 16885, 16916, 16943, 16958.
 
 \f
 Version 2.19

diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S
index b43a9e3e53675c001b1b5a83bfb2239a5ddfb84e..a1a9642bd80d42e7e7b70646c1da85044c9f779e 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