about summary refs log tree commit diff
path: root/sysdeps/i386/strchr.S
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-02-21 22:21:52 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-02-21 22:21:52 +0000
commit2366713d874342c94f9362b0d6b2461e1c68dbc3 (patch)
tree4e46c602c175d0487a7ab45a9ed178fac38abbe5 /sysdeps/i386/strchr.S
parent9bf95cbc357fc0c6597be223f66259a91b1e9bb0 (diff)
downloadglibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.gz
glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.xz
glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.zip
Remove remaining bounded-pointers support from i386 .S files.
Diffstat (limited to 'sysdeps/i386/strchr.S')
-rw-r--r--sysdeps/i386/strchr.S18
1 files changed, 8 insertions, 10 deletions
diff --git a/sysdeps/i386/strchr.S b/sysdeps/i386/strchr.S
index 5616af46a2..666c7498fe 100644
--- a/sysdeps/i386/strchr.S
+++ b/sysdeps/i386/strchr.S
@@ -21,16 +21,14 @@
 
 #include <sysdep.h>
 #include "asm-syntax.h"
-#include "bp-sym.h"
-#include "bp-asm.h"
 
-#define PARMS	LINKAGE+4		/* space for 1 saved reg */
+#define PARMS	4+4		/* space for 1 saved reg */
 #define RTN	PARMS
-#define STR	RTN+RTN_SIZE
-#define CHR	STR+PTR_SIZE
+#define STR	RTN
+#define CHR	STR+4
 
 	.text
-ENTRY (BP_SYM (strchr))
+ENTRY (strchr)
 
 	pushl %edi		/* Save callee-safe registers used here.  */
 	cfi_adjust_cfa_offset (4)
@@ -245,7 +243,7 @@ L(2):	/* Return NULL.  */
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (edi)
 
-	RET_PTR
+	ret
 
 	cfi_adjust_cfa_offset (4)
 	cfi_rel_offset (edi, 0)
@@ -285,8 +283,8 @@ L(6):
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (edi)
 
-	RET_PTR
-END (BP_SYM (strchr))
+	ret
+END (strchr)
 
-weak_alias (BP_SYM (strchr), BP_SYM (index))
+weak_alias (strchr, index)
 libc_hidden_builtin_def (strchr)