about summary refs log tree commit diff
path: root/sysdeps/x86_64
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-11-12 22:35:12 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-11-12 22:35:12 +0000
commit293d9a41805b1eeb440a2c59a717b332cd9c2384 (patch)
treedfb6d99f42866a43bb8f06267d8bd79be776f04f /sysdeps/x86_64
parentbef8fd6013f7d398661077340753c745a8939279 (diff)
downloadglibc-293d9a41805b1eeb440a2c59a717b332cd9c2384.tar.gz
glibc-293d9a41805b1eeb440a2c59a717b332cd9c2384.tar.xz
glibc-293d9a41805b1eeb440a2c59a717b332cd9c2384.zip
Fix x86_64 rawmemchr namespace (bug 17572).
rawmemchr is not an ISO C function, but __rawmemchr is called from ISO
C functions, so rawmemchr should be a weak alias.  On most
architecture it is, but x86_64 defines the function as rawmemchr with
__rawmemchr as a strong alias.  This patch makes x86_64 follow the
same arrangements as other architectures.

Tested for x86_64 (testsuite, and that disassembly of installed shared
libraries is unchanged by the patch).

	[BZ #17572]
	* sysdeps/x86_64/rawmemchr.S (rawmemchr): Rename to __rawmemchr
	and define as weak alias of __rawmemchr.
	(__rawmemchr): Do not define as strong alias of rawmemchr.
Diffstat (limited to 'sysdeps/x86_64')
-rw-r--r--sysdeps/x86_64/rawmemchr.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/x86_64/rawmemchr.S b/sysdeps/x86_64/rawmemchr.S
index ed93d3f591..1b392cb60c 100644
--- a/sysdeps/x86_64/rawmemchr.S
+++ b/sysdeps/x86_64/rawmemchr.S
@@ -21,7 +21,7 @@
 #include <sysdep.h>
 
 	.text
-ENTRY (rawmemchr)
+ENTRY (__rawmemchr)
 	movd	%rsi, %xmm1
 	mov	%rdi, %rcx
 
@@ -201,7 +201,7 @@ L(return_null):
 	xor	%rax, %rax
 	ret
 
-END (rawmemchr)
+END (__rawmemchr)
 
-strong_alias (rawmemchr, __rawmemchr)
+weak_alias (__rawmemchr, rawmemchr)
 libc_hidden_builtin_def (__rawmemchr)