5 files changed, 20 insertions, 28 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S
index 4df18c8be9..dbd65d8da6 100644
--- a/sysdeps/unix/sysv/linux/i386/clone.S
+++ b/sysdeps/unix/sysv/linux/i386/clone.S
@@ -23,20 +23,18 @@
 #define _ERRNO_H	1
 #include <bits/errno.h>
 #include <asm-syntax.h>
-#include <bp-sym.h>
-#include <bp-asm.h>
 
 /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg,
 	     pid_t *ptid, struct user_desc *tls, pid_t *ctid); */
 
-#define PARMS	LINKAGE		/* no space for saved regs */
+#define PARMS	4		/* no space for saved regs */
 #define FUNC	PARMS
 #define STACK	FUNC+4
-#define FLAGS	STACK+PTR_SIZE
+#define FLAGS	STACK+4
 #define ARG	FLAGS+4
-#define PTID	ARG+PTR_SIZE
-#define TLS	PTID+PTR_SIZE
-#define CTID	TLS+PTR_SIZE
+#define PTID	ARG+4
+#define TLS	PTID+4
+#define CTID	TLS+4
 
 #define __NR_clone 120
 #define SYS_clone 120
@@ -45,7 +43,7 @@
 #define CLONE_THREAD	0x00010000
 
         .text
-ENTRY (BP_SYM (__clone))
+ENTRY (__clone)
 	/* Sanity check arguments.  */
 	movl	$-EINVAL,%eax
 	movl	FUNC(%esp),%ecx		/* no NULL function pointers */
@@ -156,6 +154,6 @@ L(nomoregetpid):
 	cfi_endproc;
 
 	cfi_startproc
-PSEUDO_END (BP_SYM (__clone))
+PSEUDO_END (__clone)
 
-weak_alias (BP_SYM (__clone), BP_SYM (clone))
+weak_alias (__clone, clone)
diff --git a/sysdeps/unix/sysv/linux/i386/mmap64.S b/sysdeps/unix/sysv/linux/i386/mmap64.S
index 4f9c7856f1..31a0f67827 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap64.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap64.S
@@ -16,8 +16,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include <bp-sym.h>
-#include <bp-asm.h>
 
 #include <kernel-features.h>
 
@@ -25,9 +23,9 @@
 #define ENOSYS	38
 
 #define SVRSP	16		/* saved register space */
-#define PARMS	LINKAGE+SVRSP	/* space for 4 saved regs */
+#define PARMS	4+SVRSP	/* space for 4 saved regs */
 #define ADDR	PARMS
-#define LEN	ADDR+PTR_SIZE
+#define LEN	ADDR+4
 #define PROT	LEN+4
 #define FLAGS	PROT+4
 #define FD	FLAGS+4
@@ -35,7 +33,7 @@
 #define OFFHI	OFFLO+4
 
 	.text
-ENTRY (BP_SYM (__mmap64))
+ENTRY (__mmap64)
 
 	/* Save registers.  */
 	pushl %ebp
@@ -115,6 +113,6 @@ L(einval):
 	movl $-EINVAL, %eax
 	jmp SYSCALL_ERROR_LABEL
 
-PSEUDO_END (BP_SYM (__mmap64))
+PSEUDO_END (__mmap64)
 
-weak_alias (BP_SYM (__mmap64), BP_SYM (mmap64))
+weak_alias (__mmap64, mmap64)
diff --git a/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S b/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
index 5f9de9d80e..6c42c610f7 100644
--- a/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
+++ b/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
@@ -16,15 +16,13 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include <bp-sym.h>
-#include <bp-asm.h>
 
 #define EINVAL	22
 #define ENOSYS	38
 #define EOVERFLOW 75
 
 #define SVRSP	16		/* saved register space */
-#define PARMS	LINKAGE+SVRSP	/* space for 4 saved regs */
+#define PARMS	4+SVRSP	/* space for 4 saved regs */
 #define FD	PARMS
 #define OFFLO	FD+4
 #define OFFHI	OFFLO+4
@@ -33,7 +31,7 @@
 #define FLAGS	LENHI+4
 
 	.text
-ENTRY (BP_SYM (__posix_fadvise64_l64))
+ENTRY (__posix_fadvise64_l64)
 
 	/* Save registers.  */
 	pushl	%ebp
@@ -81,7 +79,7 @@ ENTRY (BP_SYM (__posix_fadvise64_l64))
 	/* Successful; return the syscall's value.  */
 	ret
 
-END (BP_SYM (__posix_fadvise64_l64))
+END (__posix_fadvise64_l64)
 
 	.section	.text.compat, "ax"
 ENTRY (__posix_fadvise64_l32)
diff --git a/sysdeps/unix/sysv/linux/i386/semtimedop.S b/sysdeps/unix/sysv/linux/i386/semtimedop.S
index 01250f65e7..35eb4a8725 100644
--- a/sysdeps/unix/sysv/linux/i386/semtimedop.S
+++ b/sysdeps/unix/sysv/linux/i386/semtimedop.S
@@ -21,14 +21,14 @@
 #define SYSOP_semtimedop 4
 
 #define SVRSP	12		/* saved register space */
-#define PARMS	LINKAGE+SVRSP	/* space for 3 saved regs */
+#define PARMS	4+SVRSP	/* space for 3 saved regs */
 #define SEMID	PARMS
 #define SOPS	SEMID+4
-#define NSOPS	SOPS+PTR_SIZE
+#define NSOPS	SOPS+4
 #define TIMEOUT	NSOPS+4
 
 	.text
-ENTRY (BP_SYM (semtimedop))
+ENTRY (semtimedop)
 
 	pushl	%ebp
 	cfi_adjust_cfa_offset (4)
@@ -70,4 +70,4 @@ ENTRY (BP_SYM (semtimedop))
 #ifdef PIC
 	.align	4
 #endif
-PSEUDO_END (BP_SYM (semtimedop))
+PSEUDO_END (semtimedop)
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 071da71408..684fe27d69 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -21,8 +21,6 @@
 
 /* There is some commonality.  */
 #include <sysdeps/unix/i386/sysdep.h>
-#include <bp-sym.h>
-#include <bp-asm.h>
 /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO.  */
 #include <dl-sysdep.h>
 #include <tls.h>