[glibc] aarch64: Drop strchrnul.S revert, apply fix from Richard Earnshaw.

[Kyle McMartin]

commit fd8c9e71258caa85fbed28f6349ea633d3a9dbb4
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Wed Dec 10 12:12:56 2014 -0500

    aarch64: Drop strchrnul.S revert, apply fix from Richard Earnshaw.

 glibc-aarch64-fix-strchrnul-clobbering-v15.patch |   19 +++
 glibc-aarch64-strchrnul-revert.patch             |  144 ----------------------
 glibc.spec                                       |    5 +-
 3 files changed, 23 insertions(+), 145 deletions(-)
---
diff --git a/glibc-aarch64-fix-strchrnul-clobbering-v15.patch b/glibc-aarch64-fix-strchrnul-clobbering-v15.patch
new file mode 100644
index 0000000..bee505f
--- /dev/null
+++ b/glibc-aarch64-fix-strchrnul-clobbering-v15.patch
@@ -0,0 +1,19 @@
+commit aa76a5c7010e98c737d79f37aa6ae668f60f7a00
+Author: Richard Earnshaw <rearnsha at arm.com>
+Date:   Wed Dec 10 09:54:09 2014 +0000
+
+    [AArch64] Fix strchrnul clobbering v15
+
+diff --git a/sysdeps/aarch64/strchrnul.S b/sysdeps/aarch64/strchrnul.S
+index b98c2e9..57835d8 100644
+--- a/sysdeps/aarch64/strchrnul.S
++++ b/sysdeps/aarch64/strchrnul.S
+@@ -46,7 +46,7 @@
+ #define vhas_nul2	v4
+ #define vhas_chr1	v5
+ #define vhas_chr2	v6
+-#define vrepmask	v15
++#define vrepmask	v7
+ #define vend1		v16
+ 
+ /* Core algorithm.
diff --git a/glibc.spec b/glibc.spec
index 1c1fe40..5cccc7b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -237,7 +237,7 @@ Patch2031: %{name}-rh1070416.patch
 
 Patch2033: %{name}-aarch64-tls-fixes.patch
 Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
-Patch2035: %{name}-aarch64-strchrnul-revert.patch
+Patch2035: %{name}-aarch64-fix-strchrnul-clobbering-v15.patch
 
 ##############################################################################
 # End of glibc patches.
@@ -1745,6 +1745,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Dec 10 2014 Kyle McMartin <kmcmarti at redhat.com>
+- aarch64: Drop strchrnul.S revert, apply fix from Richard Earnshaw.
+
 * Fri Dec 05 2014 Carlos O'Donell <carlos at redhat.com> - 2.20.90-13
 - Fix permission of debuginfo source files to allow multiarch
   debuginfo packages to be installed and upgraded.