about summary refs log tree commit diff
path: root/sysdeps/i386/i686/memmove.S
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386/i686/memmove.S')
-rw-r--r--sysdeps/i386/i686/memmove.S24
1 files changed, 11 insertions, 13 deletions
diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S
index a99edf4d1f..8c53d4a9a9 100644
--- a/sysdeps/i386/i686/memmove.S
+++ b/sysdeps/i386/i686/memmove.S
@@ -20,22 +20,20 @@
 
 #include <sysdep.h>
 #include "asm-syntax.h"
-#include "bp-sym.h"
-#include "bp-asm.h"
 
-#define PARMS	LINKAGE+4	/* one spilled register */
+#define PARMS	4+4	/* one spilled register */
 #define RTN	PARMS
 
 	.text
 
 #ifdef USE_AS_BCOPY
-# define SRC	RTN+RTN_SIZE
-# define DEST	SRC+PTR_SIZE
-# define LEN	DEST+PTR_SIZE
+# define SRC	RTN
+# define DEST	SRC+4
+# define LEN	DEST+4
 #else
-# 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
 
 # if defined PIC && !defined NOT_IN_libc
 ENTRY_CHK (__memmove_chk)
@@ -46,7 +44,7 @@ END_CHK (__memmove_chk)
 # endif
 #endif
 
-ENTRY (BP_SYM (memmove))
+ENTRY (memmove)
 
 	pushl	%edi
 	cfi_adjust_cfa_offset (4)
@@ -82,7 +80,7 @@ ENTRY (BP_SYM (memmove))
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (edi)
 
-	RET_PTR
+	ret
 
 	cfi_adjust_cfa_offset (4)
 	cfi_rel_offset (edi, 0)
@@ -115,8 +113,8 @@ ENTRY (BP_SYM (memmove))
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (edi)
 
-	RET_PTR
-END (BP_SYM (memmove))
+	ret
+END (memmove)
 #ifndef USE_AS_BCOPY
 libc_hidden_builtin_def (memmove)
 #endif