about summary refs log tree commit diff
path: root/sysdeps/i386/i686/memcpy.S
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-02-21 22:21:52 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-02-21 22:21:52 +0000
commit2366713d874342c94f9362b0d6b2461e1c68dbc3 (patch)
tree4e46c602c175d0487a7ab45a9ed178fac38abbe5 /sysdeps/i386/i686/memcpy.S
parent9bf95cbc357fc0c6597be223f66259a91b1e9bb0 (diff)
downloadglibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.gz
glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.tar.xz
glibc-2366713d874342c94f9362b0d6b2461e1c68dbc3.zip
Remove remaining bounded-pointers support from i386 .S files.
Diffstat (limited to 'sysdeps/i386/i686/memcpy.S')
-rw-r--r--sysdeps/i386/i686/memcpy.S16
1 files changed, 7 insertions, 9 deletions
diff --git a/sysdeps/i386/i686/memcpy.S b/sysdeps/i386/i686/memcpy.S
index 78d60e56b4..bb05c3d0b4 100644
--- a/sysdeps/i386/i686/memcpy.S
+++ b/sysdeps/i386/i686/memcpy.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 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 && !defined NOT_IN_libc
@@ -37,7 +35,7 @@ ENTRY_CHK (__memcpy_chk)
 	jb	HIDDEN_JUMPTARGET (__chk_fail)
 END_CHK (__memcpy_chk)
 #endif
-ENTRY (BP_SYM (memcpy))
+ENTRY (memcpy)
 
 	movl	%edi, %eax
 	movl	DEST(%esp), %edi
@@ -81,7 +79,7 @@ ENTRY (BP_SYM (memcpy))
 	movl	%edx, %esi
 	movl	DEST(%esp), %eax
 
-	RET_PTR
+	ret
 
 	/* When we come here the pointers do not have the same
 	   alignment or the length is too short.  No need to optimize for
@@ -96,5 +94,5 @@ ENTRY (BP_SYM (memcpy))
 2:	rep
 	movsl
 	jmp	.Lend
-END (BP_SYM (memcpy))
+END (memcpy)
 libc_hidden_builtin_def (memcpy)