From 2366713d874342c94f9362b0d6b2461e1c68dbc3 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 21 Feb 2013 22:21:52 +0000 Subject: Remove remaining bounded-pointers support from i386 .S files. --- sysdeps/i386/strchr.S | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'sysdeps/i386/strchr.S') 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 #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) -- cgit 1.4.1