about summary refs log tree commit diff
path: root/sysdeps/i386/i686
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
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')
-rw-r--r--sysdeps/i386/i686/add_n.S14
-rw-r--r--sysdeps/i386/i686/bzero.S2
-rw-r--r--sysdeps/i386/i686/memcmp.S16
-rw-r--r--sysdeps/i386/i686/memcpy.S16
-rw-r--r--sysdeps/i386/i686/memmove.S24
-rw-r--r--sysdeps/i386/i686/mempcpy.S20
-rw-r--r--sysdeps/i386/i686/memset.S16
-rw-r--r--sysdeps/i386/i686/strcmp.S10
-rw-r--r--sysdeps/i386/i686/strtok.S18
-rw-r--r--sysdeps/i386/i686/strtok_r.S4
10 files changed, 62 insertions, 78 deletions
diff --git a/sysdeps/i386/i686/add_n.S b/sysdeps/i386/i686/add_n.S
index bc7646d935..1e2cdc550c 100644
--- a/sysdeps/i386/i686/add_n.S
+++ b/sysdeps/i386/i686/add_n.S
@@ -19,21 +19,19 @@
 
 #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
 #ifdef PIC
 L(1):	addl    (%esp), %eax
 	ret
 #endif
-ENTRY (BP_SYM (__mpn_add_n))
+ENTRY (__mpn_add_n)
 
 	pushl %edi
 	cfi_adjust_cfa_offset (4)
@@ -109,4 +107,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/i686/bzero.S b/sysdeps/i386/i686/bzero.S
index c1e4a6d50e..34b0faa91b 100644
--- a/sysdeps/i386/i686/bzero.S
+++ b/sysdeps/i386/i686/bzero.S
@@ -1,3 +1,3 @@
 #define memset __bzero
 #include <sysdeps/i386/i686/memset.S>
-weak_alias (BP_SYM (__bzero), BP_SYM (bzero))
+weak_alias (__bzero, bzero)
diff --git a/sysdeps/i386/i686/memcmp.S b/sysdeps/i386/i686/memcmp.S
index 8215acecd3..b8091a60ec 100644
--- a/sysdeps/i386/i686/memcmp.S
+++ b/sysdeps/i386/i686/memcmp.S
@@ -18,13 +18,11 @@
 
 #include <sysdep.h>
 #include "asm-syntax.h"
-#include "bp-sym.h"
-#include "bp-asm.h"
 
-#define PARMS		LINKAGE+4	/* Preserve EBX.  */
+#define PARMS		4+4	/* Preserve EBX.  */
 #define BLK1		PARMS
-#define BLK2		BLK1+PTR_SIZE
-#define LEN		BLK2+PTR_SIZE
+#define BLK2		BLK1+4
+#define LEN		BLK2+4
 #define ENTRANCE	pushl %ebx; cfi_adjust_cfa_offset (4); \
 			cfi_rel_offset (ebx, 0)
 #define RETURN		popl %ebx; cfi_adjust_cfa_offset (-4); \
@@ -44,7 +42,7 @@
 
         .text
 	ALIGN (4)
-ENTRY (BP_SYM (memcmp))
+ENTRY (memcmp)
 	ENTRANCE
 
 	movl	BLK1(%esp), %eax
@@ -366,7 +364,7 @@ L(set):
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (esi)
 	RETURN
-END (BP_SYM (memcmp))
+END (memcmp)
 
 	.section	.rodata
 	ALIGN (2)
@@ -406,5 +404,5 @@ L(table_32bytes) :
 
 
 #undef bcmp
-weak_alias (BP_SYM (memcmp), BP_SYM (bcmp))
-libc_hidden_builtin_def (BP_SYM (memcmp))
+weak_alias (memcmp, bcmp)
+libc_hidden_builtin_def (memcmp)
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)
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
diff --git a/sysdeps/i386/i686/mempcpy.S b/sysdeps/i386/i686/mempcpy.S
index fe72287a29..97fd4966a9 100644
--- a/sysdeps/i386/i686/mempcpy.S
+++ b/sysdeps/i386/i686/mempcpy.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 (__mempcpy_chk)
 	jb	HIDDEN_JUMPTARGET (__chk_fail)
 END_CHK (__mempcpy_chk)
 #endif
-ENTRY (BP_SYM (__mempcpy))
+ENTRY (__mempcpy)
 
 	movl	LEN(%esp), %ecx
 	movl	%edi, %eax
@@ -60,8 +58,8 @@ ENTRY (BP_SYM (__mempcpy))
 	movl	%edx, %esi
 	cfi_restore (esi)
 
-	RET_PTR
-END (BP_SYM (__mempcpy))
-libc_hidden_def (BP_SYM (__mempcpy))
-weak_alias (BP_SYM (__mempcpy), BP_SYM (mempcpy))
+	ret
+END (__mempcpy)
+libc_hidden_def (__mempcpy)
+weak_alias (__mempcpy, mempcpy)
 libc_hidden_builtin_def (mempcpy)
diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S
index 9033652511..aed79a8aa9 100644
--- a/sysdeps/i386/i686/memset.S
+++ b/sysdeps/i386/i686/memset.S
@@ -20,20 +20,18 @@
 
 #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 */
 #if BZERO_P
 # define DEST	PARMS
-# define LEN	DEST+PTR_SIZE
+# define LEN	DEST+4
 #else
 # define RTN	PARMS
-# define DEST	RTN+RTN_SIZE
-# define CHR	DEST+PTR_SIZE
+# define DEST	RTN
+# define CHR	DEST+4
 # define LEN	CHR+4
 #endif
 
@@ -45,7 +43,7 @@ ENTRY_CHK (__memset_chk)
 	jb	HIDDEN_JUMPTARGET (__chk_fail)
 END_CHK (__memset_chk)
 #endif
-ENTRY (BP_SYM (memset))
+ENTRY (memset)
 
 	cld
 	pushl	%edi
@@ -96,9 +94,9 @@ ENTRY (BP_SYM (memset))
 #if BZERO_P
 	ret
 #else
-	RET_PTR
+	ret
 #endif
-END (BP_SYM (memset))
+END (memset)
 libc_hidden_builtin_def (memset)
 
 #if defined PIC && !defined NOT_IN_libc && !BZERO_P
diff --git a/sysdeps/i386/i686/strcmp.S b/sysdeps/i386/i686/strcmp.S
index 9f42977297..6ca6220a02 100644
--- a/sysdeps/i386/i686/strcmp.S
+++ b/sysdeps/i386/i686/strcmp.S
@@ -19,15 +19,13 @@
 
 #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 STR1	PARMS
-#define STR2	STR1+PTR_SIZE
+#define STR2	STR1+4
 
         .text
-ENTRY (BP_SYM (strcmp))
+ENTRY (strcmp)
 
 	movl	STR1(%esp), %ecx
 	movl	STR2(%esp), %edx
@@ -50,5 +48,5 @@ L(neq):	movl	$1, %eax
 	cmovbl	%ecx, %eax
 
 	ret
-END (BP_SYM (strcmp))
+END (strcmp)
 libc_hidden_builtin_def (strcmp)
diff --git a/sysdeps/i386/i686/strtok.S b/sysdeps/i386/i686/strtok.S
index 281f6635e1..8848faf4d9 100644
--- a/sysdeps/i386/i686/strtok.S
+++ b/sysdeps/i386/i686/strtok.S
@@ -20,8 +20,6 @@
 
 #include <sysdep.h>
 #include "asm-syntax.h"
-#include "bp-sym.h"
-#include "bp-asm.h"
 
 /* This file can be used for three variants of the strtok function:
 
@@ -58,15 +56,15 @@ save_ptr:
 #endif
 
 #if !defined USE_AS_STRTOK_R && defined PIC
-# define PARMS	LINKAGE+256+4	/* space for table and saved PIC register */
+# define PARMS	4+256+4	/* space for table and saved PIC register */
 #else
-# define PARMS	LINKAGE+256	/* space for table */
+# define PARMS	4+256	/* space for table */
 #endif
 #define RTN	PARMS
-#define STR	RTN+RTN_SIZE
-#define DELIM	STR+PTR_SIZE
+#define STR	RTN
+#define DELIM	STR+4
 #ifdef USE_AS_STRTOK_R
-# define SAVE	DELIM+PTR_SIZE
+# define SAVE	DELIM+4
 #endif
 
 	.text
@@ -76,7 +74,7 @@ save_ptr:
 	ret
 #endif
 
-ENTRY (BP_SYM (FUNCTION))
+ENTRY (FUNCTION)
 
 #if !defined USE_AS_STRTOK_R && defined PIC
 	pushl %ebx			/* Save PIC register.  */
@@ -233,7 +231,7 @@ L(epilogue):
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (ebx)
 #endif
-	RET_PTR
+	ret
 
 L(returnNULL):
 	xorl %eax, %eax
@@ -243,4 +241,4 @@ L(returnNULL):
 	movl %edx, SAVE_PTR
 	jmp L(epilogue)
 
-END (BP_SYM (FUNCTION))
+END (FUNCTION)
diff --git a/sysdeps/i386/i686/strtok_r.S b/sysdeps/i386/i686/strtok_r.S
index 1c24ca85f5..353e076ba7 100644
--- a/sysdeps/i386/i686/strtok_r.S
+++ b/sysdeps/i386/i686/strtok_r.S
@@ -1,5 +1,5 @@
 #define FUNCTION __strtok_r
 #define USE_AS_STRTOK_R	1
 #include <sysdeps/i386/i686/strtok.S>
-weak_alias (BP_SYM (__strtok_r), BP_SYM (strtok_r))
-strong_alias (BP_SYM (__strtok_r), BP_SYM (__GI___strtok_r))
+weak_alias (__strtok_r, strtok_r)
+strong_alias (__strtok_r, __GI___strtok_r)