Add and fix tests to reflect changing text alignment to 4 bytes.

7 files changed, 54 insertions, 4 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 4764d1b..7c53cb1a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-12  Tom Rix  <trix@redhat.com>
+
+	* gas/ppc/aix.exp: Run tests for all versions of powerpc AIX. Add
+	text alignment tests.
+	* gas/ppc/textalign-xcoff-001.d: New Test.
+	* gas/ppc/textalign-xcoff-002.d: New Test.
+	* gas/ppc/test1xcoff32.d : Change text section alignment.
+	* gas/ppc/booke_xcoff.d: Remove invalid pad.
+
 2002-06-06  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* gas/hppa/basic/add.s: Set code level to 1.1.
diff --git a/gas/testsuite/gas/ppc/aix.exp b/gas/testsuite/gas/ppc/aix.exp
index 46eeb3e..dc180d5 100644
--- a/gas/testsuite/gas/ppc/aix.exp
+++ b/gas/testsuite/gas/ppc/aix.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # Contributed by Red Hat
 
 # This program is free software; you can redistribute it and/or modify
@@ -56,8 +56,11 @@ proc do_align_test {} {
 }
 
 
-if [istarget powerpc*-*-aix4.3*] then {
+if [istarget powerpc-ibm-aix*] then {
 
     # Make sure that symbols are correctly aligned 
     do_align_test
+
+    run_dump_test "textalign-xcoff-001"
+    run_dump_test "textalign-xcoff-002"
 }
diff --git a/gas/testsuite/gas/ppc/booke_xcoff.d b/gas/testsuite/gas/ppc/booke_xcoff.d
index 9e56be1..2d633fd 100644
--- a/gas/testsuite/gas/ppc/booke_xcoff.d
+++ b/gas/testsuite/gas/ppc/booke_xcoff.d
@@ -26,5 +26,4 @@ Disassembly of section .text:
   40:	7c 00 04 ac 	sync	
   44:	7c 09 55 ec 	dcba	r9,r10
   48:	7c 00 06 ac 	eieio
-  4c:	00 00 00 00 	.long 0x0
 Disassembly of section .data:
diff --git a/gas/testsuite/gas/ppc/test1xcoff32.d b/gas/testsuite/gas/ppc/test1xcoff32.d
index 6bbea53..e720587 100644
--- a/gas/testsuite/gas/ppc/test1xcoff32.d
+++ b/gas/testsuite/gas/ppc/test1xcoff32.d
@@ -10,7 +10,7 @@ start address 0x0+0000
 
 Sections:
 Idx Name +Size +VMA +LMA +File off +Algn
-  0 \.text +00000068  0+0000  0+0000  000000a8  2\*\*3
+  0 \.text +00000068  0+0000  0+0000  000000a8  2\*\*2
  +CONTENTS, ALLOC, LOAD, RELOC, CODE
   1 \.data +00000028  0+0068  0+0068  00000110  2\*\*3
  +CONTENTS, ALLOC, LOAD, RELOC, DATA
diff --git a/gas/testsuite/gas/ppc/textalign-xcoff-001.d b/gas/testsuite/gas/ppc/textalign-xcoff-001.d
new file mode 100644
index 0000000..6292c32
--- /dev/null
+++ b/gas/testsuite/gas/ppc/textalign-xcoff-001.d
@@ -0,0 +1,14 @@
+#objdump: -h
+#source: textalign-xcoff-001.s
+#as: 
+
+.*:     file format aixcoff-rs6000
+
+Sections:
+Idx Name          Size      VMA               LMA               File off  Algn
+  0 \.text         00000004  0000000000000000  0000000000000000  000000a8  2\*\*2
+                  CONTENTS, ALLOC, LOAD, CODE
+  1 \.data         00000008  0000000000000004  0000000000000004  000000ac  2\*\*3
+                  CONTENTS, ALLOC, LOAD, RELOC, DATA
+  2 \.bss          00000000  000000000000000c  000000000000000c  00000000  2\*\*3
+                  ALLOC
diff --git a/gas/testsuite/gas/ppc/textalign-xcoff-001.s b/gas/testsuite/gas/ppc/textalign-xcoff-001.s
new file mode 100644
index 0000000..220b379
--- /dev/null
+++ b/gas/testsuite/gas/ppc/textalign-xcoff-001.s
@@ -0,0 +1,11 @@
+	.globl __start
+	.globl .__start
+
+__start:	
+	.csect   .data[DS]
+	.long    .__start
+
+	.csect .text[pr]
+.__start:
+	nop
+	
\ No newline at end of file
diff --git a/gas/testsuite/gas/ppc/textalign-xcoff-002.d b/gas/testsuite/gas/ppc/textalign-xcoff-002.d
new file mode 100644
index 0000000..1bd08e1
--- /dev/null
+++ b/gas/testsuite/gas/ppc/textalign-xcoff-002.d
@@ -0,0 +1,14 @@
+#objdump: -h
+#source: textalign-xcoff-001.s
+#as: -mppc64 -a64
+
+.*:     file format .*coff64-rs6000
+
+Sections:
+Idx Name          Size      VMA               LMA               File off  Algn
+  0 \.text         00000004  0000000000000000  0000000000000000  000000f0  2\*\*2
+                  CONTENTS, ALLOC, LOAD, CODE
+  1 \.data         00000008  0000000000000004  0000000000000004  000000f4  2\*\*3
+                  CONTENTS, ALLOC, LOAD, RELOC, DATA
+  2 \.bss          00000000  000000000000000c  000000000000000c  00000000  2\*\*3
+                  ALLOC