about summary refs log tree commit diff
path: root/sysdeps/i386/strpbrk.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/strpbrk.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/strpbrk.S')
-rw-r--r--sysdeps/i386/strpbrk.S14
1 files changed, 6 insertions, 8 deletions
diff --git a/sysdeps/i386/strpbrk.S b/sysdeps/i386/strpbrk.S
index 0f45167f7b..bbc0cbeb6f 100644
--- a/sysdeps/i386/strpbrk.S
+++ b/sysdeps/i386/strpbrk.S
@@ -22,16 +22,14 @@
 
 #include <sysdep.h>
 #include "asm-syntax.h"
-#include "bp-sym.h"
-#include "bp-asm.h"
 
-#define PARMS	LINKAGE		/* no space for saved regs */
+#define PARMS	4		/* no space for saved regs */
 #define RTN	PARMS
-#define STR	RTN+RTN_SIZE
-#define STOP	STR+PTR_SIZE
+#define STR	RTN
+#define STOP	STR+4
 
 	.text
-ENTRY (BP_SYM (strpbrk))
+ENTRY (strpbrk)
 
 	movl STR(%esp), %edx
 	movl STOP(%esp), %eax
@@ -240,6 +238,6 @@ L(4):	addl $256, %esp		/* remove stopset */
 	jnz L(7)		/* no => return pointer */
 	xorl %eax, %eax
 
-L(7):	RET_PTR
-END (BP_SYM (strpbrk))
+L(7):	ret
+END (strpbrk)
 libc_hidden_builtin_def (strpbrk)