aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--sysdeps/powerpc/powerpc64/power8/memset.S5
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cd093808ff..3c5ed3c1d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-01-24 Adhemerval Zanellla <azanella@linux.vnet.ibm.com>
+ [BZ #17869]
+ * sysdeps/powerpc/powerpc64/power8/memset.S: Use power7 instead of
+ power8 in .machine directive.
+
[BZ #17868]
* sysdeps/powerpc/powerpc64/dl-machine.h (resolve_ifunc): Force value
set dependency from opd value.
diff --git a/NEWS b/NEWS
index f9ea7cf697..5ca959ee15 100644
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,7 @@ Version 2.21
17664, 17665, 17668, 17682, 17702, 17717, 17719, 17722, 17723, 17724,
17725, 17732, 17733, 17744, 17745, 17746, 17747, 17748, 17775, 17777,
17780, 17781, 17782, 17791, 17793, 17796, 17797, 17803, 17806, 17834,
- 17844, 17848, 17868, 17870
+ 17844, 17848, 17868, 17869, 17870
* A new semaphore algorithm has been implemented in generic C code for all
machines. Previous custom assembly implementations of semaphore were
diff --git a/sysdeps/powerpc/powerpc64/power8/memset.S b/sysdeps/powerpc/powerpc64/power8/memset.S
index 4596926709..eaff0e6b81 100644
--- a/sysdeps/powerpc/powerpc64/power8/memset.S
+++ b/sysdeps/powerpc/powerpc64/power8/memset.S
@@ -23,7 +23,10 @@
/* __ptr_t [r3] memset (__ptr_t s [r3], int c [r4], size_t n [r5]));
Returns 's'. */
- .machine power8
+ /* No need to use .machine power8 since mtvsrd is already
+ handled by the define. It avoid breakage on binutils
+ that does not support this machine specifier. */
+ .machine power7
EALIGN (memset, 5, 0)
CALL_MCOUNT 3