Add a replacement for __GI_strcspn() required on s390x/Linux.

Fixes BZ#380397.
Patch by: Andreas Arnez <arnez@linux.vnet.ibm.com>

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16436

diff --git a/NEWS b/NEWS
index 9a3c9207a05bab209d49976aabf74a3c530d0363..10ba9f5760cf4c2f9017e41994754d4c0dc059f2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,43 @@
+Release 3.14.0 (?? ????????? 201?)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--
+Release 3.14.0 is under development, not yet released.
+
+3.14.0 is a feature release with many improvements and the usual collection of
+bug fixes.
+
+This release supports X86/Linux, AMD64/Linux, ARM32/Linux, ARM64/Linux,
+PPC32/Linux, PPC64BE/Linux, PPC64LE/Linux, S390X/Linux, MIPS32/Linux,
+MIPS64/Linux, ARM/Android, ARM64/Android, MIPS32/Android, X86/Android,
+X86/Solaris, AMD64/Solaris and AMD64/MacOSX 10.12.
+
+* ==================== CORE CHANGES ===================
+
+
+* ================== PLATFORM CHANGES =================
+
+
+* ==================== TOOL CHANGES ====================
+
+
+* ==================== OTHER CHANGES ====================
+
+
+* ==================== FIXED BUGS ====================
+
+The following bugs have been fixed or resolved.  Note that "n-i-bz"
+stands for "not in bugzilla" -- that is, a bug that was reported to us
+but never got a bugzilla entry.  We encourage you to file bugs in
+bugzilla (https://bugs.kde.org/enter_bug.cgi?product=valgrind) rather
+than mailing the developers (or mailing lists) directly -- bugs that
+are not entered into bugzilla tend to get forgotten about or ignored.
+
+To see details of a given bug, visit
+  https://bugs.kde.org/show_bug.cgi?id=XXXXXX
+where XXXXXX is the bug number as listed below.
+
+380397  s390x: __GI_strcspn() replacemenet needed
+
+
 Release 3.13.0 (15 June 2017)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
index 74afa4b9eaf9516d6eccfcf6cc7bf5f3aaaf6695..f2875fc2a66aa924662dccea15b95875d6730bb5 100644 (file)
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -1721,6 +1721,7 @@ static inline void my_exit ( int x )
 
 #if defined(VGO_linux)
  STRCSPN(VG_Z_LIBC_SONAME,          strcspn)
+ STRCSPN(VG_Z_LIBC_SONAME,          __GI_strcspn)
 
 #elif defined(VGO_darwin)