From 92945b5261c412eb590b2b34c7ec9a035f0693a1 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 19 Feb 2013 21:58:08 +0000 Subject: Remove some bounded-pointers support from i386 .S files. --- sysdeps/i386/memchr.S | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'sysdeps/i386/memchr.S') diff --git a/sysdeps/i386/memchr.S b/sysdeps/i386/memchr.S index b9bb88a457..fc98b7b026 100644 --- a/sysdeps/i386/memchr.S +++ b/sysdeps/i386/memchr.S @@ -39,7 +39,6 @@ .text ENTRY (BP_SYM (__memchr)) - ENTER /* Save callee-safe registers used in this function. */ pushl %esi @@ -53,7 +52,6 @@ ENTRY (BP_SYM (__memchr)) movl CHR(%esp), %edx /* c: byte we are looking for. */ movl LEN(%esp), %esi /* len: length of memory block. */ cfi_rel_offset (esi, 4) - CHECK_BOUNDS_LOW (%eax, STR(%esp)) /* If my must not test more than three characters test them one by one. This is especially true for 0. */ @@ -312,23 +310,13 @@ L(8): testb %cl, %cl /* test first byte in dword */ incl %eax /* increment source pointer */ /* No further test needed we we know it is one of the four bytes. */ -L(9): -#if __BOUNDED_POINTERS__ - CHECK_BOUNDS_HIGH (%eax, STR(%esp), jb) - /* If RTN pointer is phony, don't copy return value into it. */ - movl RTN(%esp), %ecx - testl %ecx, %ecx - jz L(pop) - RETURN_BOUNDED_POINTER (STR(%esp)) -#endif -L(pop): popl %edi /* pop saved registers */ +L(9): popl %edi /* pop saved registers */ cfi_adjust_cfa_offset (-4) cfi_restore (edi) popl %esi cfi_adjust_cfa_offset (-4) cfi_restore (esi) - LEAVE RET_PTR END (BP_SYM (__memchr)) -- cgit 1.4.1