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/i486 | |
| parent | 9bf95cbc357fc0c6597be223f66259a91b1e9bb0 (diff) | |
| download | glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.zip glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.gz glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.bz2 | |
Remove remaining bounded-pointers support from i386 .S files.
Diffstat (limited to 'sysdeps/i386/i486')
| -rw-r--r-- | sysdeps/i386/i486/strcat.S | 17 | ||||
| -rw-r--r-- | sysdeps/i386/i486/strlen.S | 8 |
2 files changed, 10 insertions, 15 deletions
diff --git a/sysdeps/i386/i486/strcat.S b/sysdeps/i386/i486/strcat.S index 05de49a..7d45862 100644 --- a/sysdeps/i386/i486/strcat.S +++ b/sysdeps/i386/i486/strcat.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 DEST RTN+RTN_SIZE -#define SRC DEST+PTR_SIZE +#define DEST RTN +#define SRC DEST+4 .text -ENTRY (BP_SYM (strcat)) +ENTRY (strcat) pushl %edi /* Save callee-safe register. */ cfi_adjust_cfa_offset (4) @@ -257,12 +255,11 @@ L(9): movb %al, (%ecx,%edx) /* store first byte of last word */ movb %ah, 3(%ecx,%edx) /* store fourth byte of last word */ -L(8): /* GKM FIXME: check high bounds */ - movl DEST(%esp), %eax /* start address of destination is result */ +L(8): movl DEST(%esp), %eax /* start address of destination is result */ popl %edi /* restore saved register */ cfi_adjust_cfa_offset (-4) cfi_restore (edi) - RET_PTR -END (BP_SYM (strcat)) + ret +END (strcat) libc_hidden_builtin_def (strcat) diff --git a/sysdeps/i386/i486/strlen.S b/sysdeps/i386/i486/strlen.S index a783c6f..67bee4eb 100644 --- a/sysdeps/i386/i486/strlen.S +++ b/sysdeps/i386/i486/strlen.S @@ -20,14 +20,12 @@ #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 STR PARMS .text -ENTRY (BP_SYM (strlen)) +ENTRY (strlen) movl STR(%esp), %ecx movl %ecx, %eax /* duplicate it */ @@ -130,5 +128,5 @@ L(3): testb %cl, %cl /* is first byte NUL? */ L(2): subl STR(%esp), %eax /* compute difference to string start */ ret -END (BP_SYM (strlen)) +END (strlen) libc_hidden_builtin_def (strlen) |