diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-02-21 22:21:52 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-02-21 22:21:52 +0000 |
| commit | 2366713d874342c94f9362b0d6b2461e1c68dbc3 (patch) | |
| tree | 4e46c602c175d0487a7ab45a9ed178fac38abbe5 /sysdeps/i386/strtok.S | |
| parent | 9bf95cbc357fc0c6597be223f66259a91b1e9bb0 (diff) | |
| download | glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.gz | |
Remove remaining bounded-pointers support from i386 .S files.
Diffstat (limited to 'sysdeps/i386/strtok.S')
| -rw-r--r-- | sysdeps/i386/strtok.S | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sysdeps/i386/strtok.S b/sysdeps/i386/strtok.S index 605e5efe91..79d540b603 100644 --- a/sysdeps/i386/strtok.S +++ b/sysdeps/i386/strtok.S @@ -20,8 +20,6 @@ #include <sysdep.h> #include "asm-syntax.h" -#include "bp-sym.h" -#include "bp-asm.h" /* This file can be used for three variants of the strtok function: @@ -57,14 +55,14 @@ save_ptr: # define FUNCTION strtok #endif -#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 DELIM STR+PTR_SIZE -#define SAVE DELIM+PTR_SIZE +#define STR RTN +#define DELIM STR+4 +#define SAVE DELIM+4 .text -ENTRY (BP_SYM (FUNCTION)) +ENTRY (FUNCTION) movl STR(%esp), %edx movl DELIM(%esp), %eax @@ -347,7 +345,7 @@ L(epilogue): cfi_adjust_cfa_offset (-4) cfi_restore (ebx) #endif - RET_PTR + ret L(returnNULL): xorl %eax, %eax @@ -357,4 +355,4 @@ L(returnNULL): movl %edx, SAVE_PTR jmp L(epilogue) -END (BP_SYM (FUNCTION)) +END (FUNCTION) |