about summary refs log tree commit diff
path: root/sysdeps/i386/i586/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/i586/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/i586/strchr.S')
-rw-r--r--sysdeps/i386/i586/strchr.S16
1 files changed, 7 insertions, 9 deletions
diff --git a/sysdeps/i386/i586/strchr.S b/sysdeps/i386/i586/strchr.S
index e2dfa20152..648d52830d 100644
--- a/sysdeps/i386/i586/strchr.S
+++ b/sysdeps/i386/i586/strchr.S
@@ -20,8 +20,6 @@
 
 #include <sysdep.h>
 #include "asm-syntax.h"
-#include "bp-sym.h"
-#include "bp-asm.h"
 
 /* This version is especially optimized for the i586 (and following?)
    processors.  This is mainly done by using the two pipelines.  The
@@ -36,13 +34,13 @@
 /* The magic value which is used throughout in the whole code.  */
 #define magic 0xfefefeff
 
-#define PARMS	LINKAGE+16	/* space for 4 saved regs */
+#define PARMS	4+16	/* space for 4 saved regs */
 #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.  */
 	cfi_adjust_cfa_offset (-4)
@@ -301,7 +299,7 @@ L(out):	popl %ebp		/* restore saved registers */
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (edi)
 
-	RET_PTR
+	ret
 
 	cfi_adjust_cfa_offset (16)
 	cfi_rel_offset (edi, 12)
@@ -343,8 +341,8 @@ L(4):	subl $4, %eax		/* adjust pointer */
 
 L(3):	xorl %eax, %eax
 	jmp L(out)
-END (BP_SYM (strchr))
+END (strchr)
 
 #undef index
-weak_alias (BP_SYM (strchr), BP_SYM (index))
+weak_alias (strchr, index)
 libc_hidden_builtin_def (strchr)