commit 2366713d874342c94f9362b0d6b2461e1c68dbc3

Author: Joseph Myers <joseph@codesourcery.com>

Date:   Thu Feb 21 22:21:52 2013 +0000

    Remove remaining bounded-pointers support from i386 .S files.

Conflicts:

	sysdeps/i386/bp-asm.h

Copyright header change; file removed manually.

diff --git a/sysdeps/i386/add_n.S b/sysdeps/i386/add_n.S

index df3ea2362c76247a..55e454f2091c67eb 100644

--- a/sysdeps/i386/add_n.S

+++ b/sysdeps/i386/add_n.S

@@ -19,17 +19,15 @@

 #include "sysdep.h"

 #include "asm-syntax.h"

-#include "bp-sym.h"

-#include "bp-asm.h"

-#define PARMS	LINKAGE+8	/* space for 2 saved regs */

+#define PARMS	4+8	/* space for 2 saved regs */

 #define RES	PARMS

-#define S1	RES+PTR_SIZE

-#define S2	S1+PTR_SIZE

-#define SIZE	S2+PTR_SIZE

+#define S1	RES+4

+#define S2	S1+4

+#define SIZE	S2+4

 	.text

-ENTRY (BP_SYM (__mpn_add_n))

+ENTRY (__mpn_add_n)

 	pushl %edi

 	cfi_adjust_cfa_offset (4)

@@ -110,4 +108,4 @@ L(oop):	movl	(%esi),%eax

 	cfi_restore (edi)

 	ret

-END (BP_SYM (__mpn_add_n))

+END (__mpn_add_n)

diff --git a/sysdeps/i386/addmul_1.S b/sysdeps/i386/addmul_1.S

index 006c08a92de4e303..286781efdb37d304 100644

--- a/sysdeps/i386/addmul_1.S

+++ b/sysdeps/i386/addmul_1.S

@@ -19,13 +19,11 @@

 #include "sysdep.h"

 #include "asm-syntax.h"

-#include "bp-sym.h"

-#include "bp-asm.h"

-#define PARMS	LINKAGE+16	/* space for 4 saved regs */

+#define PARMS	4+16	/* space for 4 saved regs */

 #define RES	PARMS

-#define S1	RES+PTR_SIZE

-#define SIZE	S1+PTR_SIZE

+#define S1	RES+4

+#define SIZE	S1+4

 #define S2LIMB	SIZE+4

 #define res_ptr edi

@@ -34,7 +32,7 @@

 #define s2_limb ebx

 	.text

-ENTRY (BP_SYM (__mpn_addmul_1))

+ENTRY (__mpn_addmul_1)

 	pushl	%res_ptr

 	cfi_adjust_cfa_offset (4)

@@ -85,4 +83,4 @@ L(oop):

 	cfi_restore (res_ptr)

 	ret

-END (BP_SYM (__mpn_addmul_1))

+END (__mpn_addmul_1)

diff --git a/sysdeps/i386/bp-asm.h b/sysdeps/i386/bp-asm.h

deleted file mode 100644

index 75e1a007cb3eca71..0000000000000000

--- a/sysdeps/i386/bp-asm.h

+++ /dev/null

@@ -1,60 +0,0 @@

-/* Bounded-pointer definitions for x86 assembler.

-   Copyright (C) 2000 Free Software Foundation, Inc.

-   Contributed by Greg McGary <greg@mcgary.org>

-   This file is part of the GNU C Library.  Its master source is NOT part of

-   the C library, however.  The master source lives in the GNU MP Library.

-

-   The GNU C Library is free software; you can redistribute it and/or

-   modify it under the terms of the GNU Lesser General Public

-   License as published by the Free Software Foundation; either

-   version 2.1 of the License, or (at your option) any later version.

-

-   The GNU C Library is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-   Lesser General Public License for more details.

-

-   You should have received a copy of the GNU Lesser General Public

-   License along with the GNU C Library; if not, see

-   <http://www.gnu.org/licenses/>.  */

-

-#ifndef _bp_asm_h_

-# define _bp_asm_h_ 1

-

-# if __ASSEMBLER__

-

-#  if __BOUNDED_POINTERS__

-

-/* Bounded pointers occupy three words.  */

-#   define PTR_SIZE 12

-/* Bounded pointer return values are passed back through a hidden

-   argument that points to caller-allocate space.  The hidden arg

-   occupies one word on the stack.  */

-#   define RTN_SIZE 4

-/* Although the caller pushes the hidden arg, the callee is

-   responsible for popping it.  */

-#   define RET_PTR ret $RTN_SIZE

-/* Stack space overhead of procedure-call linkage: return address and

-   frame pointer.  */

-#   define LINKAGE 8

-/* Stack offset of return address after calling ENTER.  */

-#   define PCOFF 4

-

-#  else /* !__BOUNDED_POINTERS__ */

-

-/* Unbounded pointers occupy one word.  */

-#   define PTR_SIZE 4

-/* Unbounded pointer return values are passed back in the register %eax.  */

-#   define RTN_SIZE 0

-/* Use simple return instruction for unbounded pointer values.  */

-#   define RET_PTR ret

-/* Stack space overhead of procedure-call linkage: return address only.  */

-#   define LINKAGE 4

-/* Stack offset of return address after calling ENTER.  */

-#   define PCOFF 0

-

-#  endif /* !__BOUNDED_POINTERS__ */

-

-# endif /* __ASSEMBLER__ */

-

-#endif /* _bp_asm_h_ */

diff --git a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S

index fe0224145643ea0b..3a57995fa9811274 100644

--- a/sysdeps/i386/bsd-_setjmp.S

+++ b/sysdeps/i386/bsd-_setjmp.S

@@ -22,15 +22,13 @@

 #include <sysdep.h>

 #include <jmpbuf-offsets.h>

-#include "bp-sym.h"

-#include "bp-asm.h"

 #include <stap-probe.h>

-#define PARMS	LINKAGE		/* no space for saved regs */

+#define PARMS	4		/* no space for saved regs */

 #define JMPBUF	PARMS

-#define SIGMSK	JMPBUF+PTR_SIZE

+#define SIGMSK	JMPBUF+4

-ENTRY (BP_SYM (_setjmp))

+ENTRY (_setjmp)

 	xorl %eax, %eax

 	movl JMPBUF(%esp), %edx

@@ -44,7 +42,7 @@ ENTRY (BP_SYM (_setjmp))

 	PTR_MANGLE (%ecx)

 #endif

      	movl %ecx, (JB_SP*4)(%edx)

-	movl PCOFF(%esp), %ecx	/* Save PC we are returning to now.  */

+	movl 0(%esp), %ecx	/* Save PC we are returning to now.  */

 	LIBC_PROBE (setjmp, 3, 4@%edx, -4@$0, 4@%ecx)

 #ifdef PTR_MANGLE

 	PTR_MANGLE (%ecx)

@@ -54,5 +52,5 @@ ENTRY (BP_SYM (_setjmp))

 	movl %eax, JB_SIZE(%edx) /* No signal mask set.  */

 	ret

-END (BP_SYM (_setjmp))

+END (_setjmp)

 libc_hidden_def (_setjmp)

diff --git a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S

index 25470f3904a8ca73..9f2eb9d99c0807d2 100644

--- a/sysdeps/i386/bsd-setjmp.S

+++ b/sysdeps/i386/bsd-setjmp.S

@@ -22,15 +22,13 @@

 #include <sysdep.h>

 #include <jmpbuf-offsets.h>

-#include "bp-sym.h"

-#include "bp-asm.h"

 #include <stap-probe.h>

-#define PARMS  LINKAGE		/* no space for saved regs */

+#define PARMS  4		/* no space for saved regs */

 #define JMPBUF PARMS

-#define SIGMSK JMPBUF+PTR_SIZE

+#define SIGMSK JMPBUF+4

-ENTRY (BP_SYM (setjmp))

+ENTRY (setjmp)

 	/* Note that we have to use a non-exported symbol in the next

 	   jump since otherwise gas will emit it as a jump through the

 	   PLT which is what we cannot use here.  */

@@ -46,7 +44,7 @@ ENTRY (BP_SYM (setjmp))

 	PTR_MANGLE (%ecx)

 #endif

      	movl %ecx, (JB_SP*4)(%eax)

-	movl PCOFF(%esp), %ecx	/* Save PC we are returning to now.  */

+	movl 0(%esp), %ecx	/* Save PC we are returning to now.  */

 	LIBC_PROBE (setjmp, 3, 4@%eax, -4@$1, 4@%ecx)

 #ifdef PTR_MANGLE

 	PTR_MANGLE (%ecx)

@@ -59,10 +57,10 @@ ENTRY (BP_SYM (setjmp))

 	cfi_adjust_cfa_offset (4)

 	pushl 8(%esp)

 	cfi_adjust_cfa_offset (4)

-	call BP_SYM (__sigjmp_save)

+	call __sigjmp_save

 	popl %ecx

 	cfi_adjust_cfa_offset (-4)

 	popl %edx

 	cfi_adjust_cfa_offset (-4)

 	ret

-END (BP_SYM (setjmp))

+END (setjmp)

diff --git a/sysdeps/i386/fpu/s_frexp.S b/sysdeps/i386/fpu/s_frexp.S

index 6c5cd8fdfd9f825b..220eb3cb4bdedc0a 100644

--- a/sysdeps/i386/fpu/s_frexp.S

+++ b/sysdeps/i386/fpu/s_frexp.S

@@ -18,8 +18,6 @@

    <http://www.gnu.org/licenses/>.  */

 #include <machine/asm.h>

-#include "bp-sym.h"

-#include "bp-asm.h"

 	.section .rodata

@@ -34,13 +32,13 @@ two54:	.byte 0, 0, 0, 0, 0, 0, 0x50, 0x43

 #define MO(op) op

 #endif

-#define PARMS	LINKAGE		/* no space for saved regs */

+#define PARMS	4		/* no space for saved regs */

 #define VAL0	PARMS

 #define VAL1	VAL0+4

 #define EXPP	VAL1+4

 	.text

-ENTRY (BP_SYM (__frexp))

+ENTRY (__frexp)

 	movl	VAL0(%esp), %ecx

 	movl	VAL1(%esp), %eax

@@ -81,5 +79,5 @@ ENTRY (BP_SYM (__frexp))

 	movl	%ecx, (%eax)

 	ret

-END (BP_SYM (__frexp))

-weak_alias (BP_SYM (__frexp), BP_SYM (frexp))

+END (__frexp)

+weak_alias (__frexp, frexp)

diff --git a/sysdeps/i386/fpu/s_frexpf.S b/sysdeps/i386/fpu/s_frexpf.S

index 4fe2181873de7302..1515ec3d5d08fe5e 100644

--- a/sysdeps/i386/fpu/s_frexpf.S

+++ b/sysdeps/i386/fpu/s_frexpf.S

@@ -18,8 +18,6 @@

    <http://www.gnu.org/licenses/>.  */

 #include <machine/asm.h>

-#include "bp-sym.h"

-#include "bp-asm.h"

 	.section .rodata

@@ -34,12 +32,12 @@ two25:	.byte 0, 0, 0, 0x4c

 #define MO(op) op

 #endif

-#define PARMS	LINKAGE		/* no space for saved regs */

+#define PARMS	4		/* no space for saved regs */

 #define VAL	PARMS

 #define EXPP	VAL+4

 	.text

-ENTRY (BP_SYM (__frexpf))

+ENTRY (__frexpf)

 	movl	VAL(%esp), %eax

 	xorl	%ecx, %ecx

@@ -78,5 +76,5 @@ ENTRY (BP_SYM (__frexpf))

 	movl	%ecx, (%eax)

 	ret

-END (BP_SYM (__frexpf))

-weak_alias (BP_SYM (__frexpf), BP_SYM (frexpf))

+END (__frexpf)

+weak_alias (__frexpf, frexpf)

diff --git a/sysdeps/i386/fpu/s_frexpl.S b/sysdeps/i386/fpu/s_frexpl.S

index 54d5010185792bd9..bd8064ac46104921 100644

--- a/sysdeps/i386/fpu/s_frexpl.S

+++ b/sysdeps/i386/fpu/s_frexpl.S

@@ -18,8 +18,6 @@

    <http://www.gnu.org/licenses/>.  */

 #include <machine/asm.h>

-#include "bp-sym.h"

-#include "bp-asm.h"

 	.section .rodata

@@ -34,14 +32,14 @@ two64:	.byte 0, 0, 0, 0, 0, 0, 0xf0, 0x43

 #define MO(op) op

 #endif

-#define PARMS	LINKAGE		/* no space for saved regs */

+#define PARMS	4		/* no space for saved regs */

 #define VAL0	PARMS

 #define VAL1	VAL0+4

 #define VAL2	VAL1+4

 #define EXPP	VAL2+4

 	.text

-ENTRY (BP_SYM (__frexpl))

+ENTRY (__frexpl)

 	movl	VAL0(%esp), %ecx

 	movl	VAL2(%esp), %eax

@@ -83,5 +81,5 @@ ENTRY (BP_SYM (__frexpl))

 	movl	%ecx, (%eax)

 	ret

-END (BP_SYM (__frexpl))

-weak_alias (BP_SYM (__frexpl), BP_SYM (frexpl))

+END (__frexpl)

+weak_alias (__frexpl, frexpl)

diff --git a/sysdeps/i386/fpu/s_remquo.S b/sysdeps/i386/fpu/s_remquo.S

index e61ff5be7bc826df..341285db30448710 100644

--- a/sysdeps/i386/fpu/s_remquo.S

+++ b/sysdeps/i386/fpu/s_remquo.S

@@ -5,16 +5,14 @@

  */

 #include <machine/asm.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 DVDND	PARMS

 #define DVSOR	DVDND+8

 #define QUOP	DVSOR+8

 	.text

-ENTRY (BP_SYM (__remquo))

+ENTRY (__remquo)

 	fldl	DVSOR(%esp)

 	fldl	DVDND(%esp)

@@ -43,5 +41,5 @@ ENTRY (BP_SYM (__remquo))

 1:	movl	%eax, (%ecx)

 	ret

-END (BP_SYM (__remquo))

-weak_alias (BP_SYM (__remquo), BP_SYM (remquo))

+END (__remquo)

+weak_alias (__remquo, remquo)

diff --git a/sysdeps/i386/fpu/s_remquof.S b/sysdeps/i386/fpu/s_remquof.S

index c2b351b859c28e7c..62063f068f59220a 100644

--- a/sysdeps/i386/fpu/s_remquof.S

+++ b/sysdeps/i386/fpu/s_remquof.S

@@ -5,16 +5,14 @@

  */

 #include <machine/asm.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 DVDND	PARMS

 #define DVSOR	DVDND+4

 #define QUOP	DVSOR+4

 	.text

-ENTRY (BP_SYM (__remquof))

+ENTRY (__remquof)

 	flds	DVSOR(%esp)

 	flds	DVDND(%esp)

@@ -43,5 +41,5 @@ ENTRY (BP_SYM (__remquof))

 1:	movl	%eax, (%ecx)

 	ret

-END (BP_SYM (__remquof))

-weak_alias (BP_SYM (__remquof), BP_SYM (remquof))

+END (__remquof)

+weak_alias (__remquof, remquof)

diff --git a/sysdeps/i386/fpu/s_remquol.S b/sysdeps/i386/fpu/s_remquol.S

index 2cbe43589609a2b8..f3d84fc7c2c22d73 100644

--- a/sysdeps/i386/fpu/s_remquol.S

+++ b/sysdeps/i386/fpu/s_remquol.S

@@ -5,16 +5,14 @@

  */

 #include <machine/asm.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 DVDND	PARMS

 #define DVSOR	DVDND+12

 #define QUOP	DVSOR+12

 	.text

-ENTRY (BP_SYM (__remquol))

+ENTRY (__remquol)

 	fldt	DVSOR(%esp)

 	fldt	DVDND(%esp)

@@ -43,5 +41,5 @@ ENTRY (BP_SYM (__remquol))

 1:	movl	%eax, (%ecx)

 	ret

-END (BP_SYM (__remquol))

-weak_alias (BP_SYM (__remquol), BP_SYM (remquol))

+END (__remquol)

+weak_alias (__remquol, remquol)

diff --git a/sysdeps/i386/i486/strcat.S b/sysdeps/i386/i486/strcat.S

index b3212c8beb948411..d772b108d1c45e2d 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 76c31098e84a1c93..371e202902603639 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)

diff --git a/sysdeps/i386/i586/add_n.S b/sysdeps/i386/i586/add_n.S

index a2b502d0d21bf9f5..e3f439412f7d4061 100644

--- a/sysdeps/i386/i586/add_n.S

+++ b/sysdeps/i386/i586/add_n.S

@@ -19,17 +19,15 @@

 #include "sysdep.h"

 #include "asm-syntax.h"

-#include "bp-sym.h"

-#include "bp-asm.h"

-#define PARMS	LINKAGE+16		/* space for 4 saved regs */

+#define PARMS	4+16		/* space for 4 saved regs */

 #define RES	PARMS

-#define S1	RES+PTR_SIZE

-#define S2	S1+PTR_SIZE

-#define SIZE	S2+PTR_SIZE

+#define S1	RES+4

+#define S2	S1+4

+#define SIZE	S2+4

 	.text

-ENTRY (BP_SYM (__mpn_add_n))

+ENTRY (__mpn_add_n)

 	pushl	%edi

 	cfi_adjust_cfa_offset (4)

@@ -142,4 +140,4 @@ L(end2):

 	cfi_restore (edi)

 	ret

-END (BP_SYM (__mpn_add_n))

+END (__mpn_add_n)

diff --git a/sysdeps/i386/i586/addmul_1.S b/sysdeps/i386/i586/addmul_1.S

index a9d0b08b5e8072ab..333951f8e5d6d3ec 100644

--- a/sysdeps/i386/i586/addmul_1.S

+++ b/sysdeps/i386/i586/addmul_1.S

@@ -19,13 +19,11 @@

 #include "sysdep.h"

 #include "asm-syntax.h"

-#include "bp-sym.h"

-#include "bp-asm.h"

-#define PARMS	LINKAGE+16	/* space for 4 saved regs */

+#define PARMS	4+16	/* space for 4 saved regs */

 #define RES	PARMS

-#define S1	RES+PTR_SIZE

-#define SIZE	S1+PTR_SIZE

+#define S1	RES+4

+#define SIZE	S1+4

 #define S2LIMB	SIZE+4

 #define res_ptr edi

@@ -34,7 +32,7 @@

 #define s2_limb ebx

 	.text

-ENTRY (BP_SYM (__mpn_addmul_1))

+ENTRY (__mpn_addmul_1)

 	pushl	%res_ptr

 	cfi_adjust_cfa_offset (4)

@@ -93,4 +91,4 @@ L(oop):	adcl	$0, %ebp

 	ret

 #undef size

-END (BP_SYM (__mpn_addmul_1))

+END (__mpn_addmul_1)

diff --git a/sysdeps/i386/i586/bzero.S b/sysdeps/i386/i586/bzero.S

index 220aa47c3f9c6d5c..84d2f709c16d0b46 100644

--- a/sysdeps/i386/i586/bzero.S

+++ b/sysdeps/i386/i586/bzero.S

@@ -1,3 +1,3 @@

 #define memset __bzero

 #include <sysdeps/i386/i586/memset.S>

-weak_alias (BP_SYM (__bzero), BP_SYM (bzero))

+weak_alias (__bzero, bzero)

diff --git a/sysdeps/i386/i586/lshift.S b/sysdeps/i386/i586/lshift.S

index 23c5002d69f50f8f..2f25ed1d854e90c2 100644

--- a/sysdeps/i386/i586/lshift.S

+++ b/sysdeps/i386/i586/lshift.S

@@ -18,17 +18,15 @@

 #include "sysdep.h"

 #include "asm-syntax.h"

-#include "bp-sym.h"

-#include "bp-asm.h"

-#define PARMS	LINKAGE+16		/* space for 4 saved regs */

+#define PARMS	4+16		/* space for 4 saved regs */

 #define RES	PARMS

-#define S	RES+PTR_SIZE

-#define SIZE	S+PTR_SIZE

+#define S	RES+4

+#define SIZE	S+4

 #define CNT	SIZE+4

 	.text

-ENTRY (BP_SYM (__mpn_lshift))

+ENTRY (__mpn_lshift)

 	pushl	%edi

 	cfi_adjust_cfa_offset (4)

@@ -254,4 +252,4 @@ L(L1):	movl	%edx,(%edi)		/* store last limb */

 	cfi_restore (edi)

 	ret

-END (BP_SYM (__mpn_lshift))

+END (__mpn_lshift)

diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S

index 07f5432d761c453d..baa8d11c44ccfd67 100644

--- a/sysdeps/i386/i586/memcpy.S

+++ b/sysdeps/i386/i586/memcpy.S

@@ -19,19 +19,17 @@

 #include <sysdep.h>

 #include "asm-syntax.h"

-#include "bp-sym.h"

-#include "bp-asm.h"

 /* BEWARE: `#ifdef memcpy' means that memcpy is redefined as `mempcpy',

    and the return value is the byte after the last one copied in

    the destination. */

 #define MEMPCPY_P (defined memcpy)

-#define PARMS	LINKAGE+8	/* space for 2 saved regs */

+#define PARMS	4+8	/* space for 2 saved regs */

 #define RTN	PARMS

-#define DEST	RTN+RTN_SIZE

-#define SRC	DEST+PTR_SIZE

-#define LEN	SRC+PTR_SIZE

+#define DEST	RTN

+#define SRC	DEST+4

+#define LEN	SRC+4

         .text

 #if defined PIC && IS_IN (libc)

@@ -41,7 +39,7 @@ ENTRY (__memcpy_chk)

 	jb	HIDDEN_JUMPTARGET (__chk_fail)

 END (__memcpy_chk)

 #endif

-ENTRY (BP_SYM (memcpy))

+ENTRY (memcpy)

 	pushl	%edi

 	cfi_adjust_cfa_offset (4)

@@ -124,8 +122,8 @@ L(1):	rep; movsb

 	cfi_adjust_cfa_offset (-4)

 	cfi_restore (edi)

-	RET_PTR

-END (BP_SYM (memcpy))

+	ret

+END (memcpy)

 #if !MEMPCPY_P

 libc_hidden_builtin_def (memcpy)

 #endif

diff --git a/sysdeps/i386/i586/mempcpy.S b/sysdeps/i386/i586/mempcpy.S

index f492be7ca0722839..afc112d9d7986697 100644

--- a/sysdeps/i386/i586/mempcpy.S

+++ b/sysdeps/i386/i586/mempcpy.S

@@ -2,6 +2,6 @@

 #define __memcpy_chk __mempcpy_chk

 #include <sysdeps/i386/i586/memcpy.S>

-libc_hidden_def (BP_SYM (__mempcpy))

-weak_alias (BP_SYM (__mempcpy), BP_SYM (mempcpy))

+libc_hidden_def (__mempcpy)

+weak_alias (__mempcpy, mempcpy)

 libc_hidden_builtin_def (mempcpy)

diff --git a/sysdeps/i386/i586/memset.S b/sysdeps/i386/i586/memset.S

index 8234b99d734b24b0..c1b08e0f7357cc00 100644

--- a/sysdeps/i386/i586/memset.S

+++ b/sysdeps/i386/i586/memset.S

@@ -20,19 +20,17 @@

 #include <sysdep.h>

 #include "asm-syntax.h"

-#include "bp-sym.h"

-#include "bp-asm.h"

 /* BEWARE: `#ifdef memset' means that memset is redefined as `bzero' */

 #define BZERO_P (defined memset)

-#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 DEST	RTN

 #if BZERO_P

-# define LEN	DEST+PTR_SIZE

+# define LEN	DEST+4

 #else

-# define CHR	DEST+PTR_SIZE

+# define CHR	DEST+4

 # define LEN	CHR+4

 #endif

@@ -44,7 +42,7 @@ ENTRY (__memset_chk)

 	jb	HIDDEN_JUMPTARGET (__chk_fail)

 END (__memset_chk)

 #endif

-ENTRY (BP_SYM (memset))

+ENTRY (memset)

 	pushl	%edi

 	cfi_adjust_cfa_offset (4)

@@ -117,7 +115,7 @@ L(2):	shrl	$2, %ecx	/* convert byte count to longword count */

 #if BZERO_P

 	ret

 #else

-	RET_PTR

+	ret

 #endif

-END (BP_SYM (memset))

+END (memset)