aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose E. Marchesi <jose.marchesi@oracle.com>2014-05-17 11:20:27 -0700
committerDavid S. Miller <davem@davemloft.net>2014-05-17 17:20:58 -0400
commitf2b605ed8882a922c403386b2af7e7a5eecbf39f (patch)
treec675b3b1d795e1211e6c699d5c599b4916a5ab66
parentd56700df46977b14e9fe54201132fed04475cd03 (diff)
downloadtermbaud-f2b605ed8882a922c403386b2af7e7a5eecbf39f.tar.gz
termbaud-f2b605ed8882a922c403386b2af7e7a5eecbf39f.tar.xz
termbaud-f2b605ed8882a922c403386b2af7e7a5eecbf39f.zip
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.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S1
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f008fb468df..2a14ec2399f 100644
--- 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 482561767f4..4cbe73644e1 100644
--- 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.
Version 2.18
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S
index 594405051f4..63ba0811d0e 100644
--- 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