about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCarlos Eduardo Seo <cseo@linux.vnet.ibm.com>2015-08-11 18:30:12 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2015-08-21 17:06:06 -0300
commit854e0055b3bc904f56a38b90491583383a86ed29 (patch)
tree56f5a8fdb9a9ec71013d4e1992f823433a25ca68
parent502b91de1431f92afc650c3b5ca5650cb6b0298d (diff)
downloadglibc-854e0055b3bc904f56a38b90491583383a86ed29.tar.gz
glibc-854e0055b3bc904f56a38b90491583383a86ed29.tar.xz
glibc-854e0055b3bc904f56a38b90491583383a86ed29.zip
powerpc: Fix memchr for powerpc32.
Fix a wrong #undef in memchr.c.

	* sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c: Replace
	'#undef memcpy' by '#undef memchr'.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 20d5255280..4b3d9cccc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-08-21  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
 
+	* sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c: Replace
+	'#undef memcpy' by '#undef memchr'.
+
+2015-08-21  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
+
 	* sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c: Make
 	memchr not point to the internal __GI_memchr implementation.
 
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c
index 1319df7876..7503a53854 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #if IS_IN (libc)
-# undef memcpy
+# undef memchr
 /* Redefine memchr so that the compiler won't make the weak_alias point
    to internal hidden definition (__GI_memchr), since PPC32 does not
    support local IFUNC calls.  */