From c7a8ba94040820cd324e02babc2d340d395138fc Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 28 Feb 2013 21:28:57 +0000
Subject: Remove bounded-pointers relics from am33 code.

---
 ports/ChangeLog.am33                       | 7 +++++++
 ports/sysdeps/am33/elf/start.S             | 8 +++-----
 ports/sysdeps/unix/sysv/linux/am33/clone.S | 7 +++----
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'ports')

diff --git a/ports/ChangeLog.am33 b/ports/ChangeLog.am33
index 2e5c0caac0..2bb7893f9a 100644
--- a/ports/ChangeLog.am33
+++ b/ports/ChangeLog.am33
@@ -1,3 +1,10 @@
+2013-02-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/am33/elf/start.S: Don't include "bp-sym.h".
+	(_start): Don't use BP_SYM.
+	* sysdeps/unix/sysv/linux/am33/clone.S: Don't include <bp-sym.h>.
+	(__clone): Don't use BP_SYM.
+
 2013-02-14  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #13550]
diff --git a/ports/sysdeps/am33/elf/start.S b/ports/sysdeps/am33/elf/start.S
index 0ca71f14a4..e89f9db15c 100644
--- a/ports/sysdeps/am33/elf/start.S
+++ b/ports/sysdeps/am33/elf/start.S
@@ -37,8 +37,6 @@
 					NULL
 */
 
-#include "bp-sym.h"
-
 	.text
 	.globl _start
 	.type _start,@function
@@ -63,13 +61,13 @@ _start:
 	mov 0,a3
 
 	mov (32,sp), d1		/* argc.  */
-	mov BP_SYM (main), d0	/* main.  */
+	mov main, d0		/* main.  */
 
 	/* Call the user's main function, and exit with its value.
 	   But let the libc call main.    */
-	call BP_SYM (__libc_start_main),[],0
+	call __libc_start_main,[],0
 
-	call BP_SYM (abort),[],0 /* Crash if somehow `exit' does return.  */
+	call abort,[],0 /* Crash if somehow `exit' does return.  */
 
 /* Define a symbol for the first piece of initialized data.  */
 	.data
diff --git a/ports/sysdeps/unix/sysv/linux/am33/clone.S b/ports/sysdeps/unix/sysv/linux/am33/clone.S
index 151950c5db..cece99bf34 100644
--- a/ports/sysdeps/unix/sysv/linux/am33/clone.S
+++ b/ports/sysdeps/unix/sysv/linux/am33/clone.S
@@ -24,12 +24,11 @@
 #define _ERRNO_H	1
 #include <bits/errno.h>
 #include <asm-syntax.h>
-#include <bp-sym.h>
 
 /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
 
         .text
-ENTRY (BP_SYM (__clone))
+ENTRY (__clone)
 	/* Sanity check arguments.  */
 	cmp	0,d0	/* no NULL function pointers */
 	beq	L(error_inval)
@@ -75,6 +74,6 @@ L(here):
 #endif
 	call	JUMPTARGET (_exit),[],0
 
-PSEUDO_END (BP_SYM (__clone))
+PSEUDO_END (__clone)
 
-weak_alias (BP_SYM (__clone), BP_SYM (clone))
+weak_alias (__clone, clone)
-- 
cgit 1.4.1