From c9c33288af68d70f666cbc6ae92684dbcd1d3ee7 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 18 May 2004 16:18:56 +0000
Subject: [PATCH] Fixes for assembling with an ARM targeted version of GAS

---
 ld/testsuite/ChangeLog      |  9 +++++++++
 ld/testsuite/ld-elf/frame.s |  2 +-
 ld/testsuite/ld-elf/table.s |  2 +-
 ld/testsuite/ld-elf/tbss.s  | 12 ++++++------
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index a0d258f0b0..aeebbd81a7 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-18  Nick Clifton  <nickc@redhat.com>
+
+	* ld-elf/frame.s: Replace @ with % so that the file can be
+	compiled by an ARM targeted GAS.
+	* ld-elf/table.s: Likewise.
+	* ld-elf/tbss.s: Likewise.  Also replace .align <foo> with
+	.p2align (log2 <foo>) to cope with the fact that the ARM .align
+	directive takes a power-of-two argument.
+
 2004-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-elf/frame.exp: New file. Test read-only .eh_frame and
diff --git a/ld/testsuite/ld-elf/frame.s b/ld/testsuite/ld-elf/frame.s
index ece463ccb0..c7522636fc 100644
--- a/ld/testsuite/ld-elf/frame.s
+++ b/ld/testsuite/ld-elf/frame.s
@@ -1,2 +1,2 @@
-	.section	.eh_frame,"a",@progbits
+	.section	.eh_frame,"a",%progbits
 	.4byte	0
diff --git a/ld/testsuite/ld-elf/table.s b/ld/testsuite/ld-elf/table.s
index 3641eceab0..2b13f70e95 100644
--- a/ld/testsuite/ld-elf/table.s
+++ b/ld/testsuite/ld-elf/table.s
@@ -1 +1 @@
-	.section	.gcc_except_table,"a",@progbits
+	.section	.gcc_except_table,"a",%progbits
diff --git a/ld/testsuite/ld-elf/tbss.s b/ld/testsuite/ld-elf/tbss.s
index fc3be3d637..37246bbd0b 100644
--- a/ld/testsuite/ld-elf/tbss.s
+++ b/ld/testsuite/ld-elf/tbss.s
@@ -1,15 +1,15 @@
 	.file	"x.c"
 .globl bss
-	.section	.bss,"aw",@nobits
-	.align 4096
-	.type	bss,@object
+	.section	.bss,"aw",%nobits
+	.p2align 12
+	.type	bss,%object
 	.size	bss,4096
 bss:
 	.zero	4096
 .globl tbss
-	.section	.tbss,"awT",@nobits
-	.align 4096
-	.type	tbss,@object
+	.section	.tbss,"awT",%nobits
+	.p2align 12
+	.type	tbss,%object
 	.size	tbss,4096
 tbss:
 	.zero	4096