* gas/i386/float.s, gas/i386/float.l: Modify to work correctly

	when gas uses 2**4 alignment for .text.
	* gas/i386/general.s, gas/i386/general.l: Likewise.
	* gas/i386/katmai.s, gas/i386/katmai.d: Likewise.
	* gas/i386/modrm.s, gas/i386/modrm.l: Likewise.
	* gas/i386/prefix.s, gas/i386/prefix.d: Likewise.

11 files changed, 28 insertions, 18 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 7164ed3..5197d73 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+1999-08-09  Ian Lance Taylor  <ian@zembu.com>
+
+	* gas/i386/float.s, gas/i386/float.l: Modify to work correctly
+	when gas uses 2**4 alignment for .text.
+	* gas/i386/general.s, gas/i386/general.l: Likewise.
+	* gas/i386/katmai.s, gas/i386/katmai.d: Likewise.
+	* gas/i386/modrm.s, gas/i386/modrm.l: Likewise.
+	* gas/i386/prefix.s, gas/i386/prefix.d: Likewise.
+
 1999-07-27  Alan Modra  <alan@spri.levels.unisa.edu.au>
 
 	* gas/i386/reloc.d: Fix so that test passes when enable-targets
diff --git a/gas/testsuite/gas/i386/float.l b/gas/testsuite/gas/i386/float.l
index 6d6cadd..ec56f55 100644
--- a/gas/testsuite/gas/i386/float.l
+++ b/gas/testsuite/gas/i386/float.l
@@ -79,3 +79,7 @@
   66 007e DEF9 [ 	]*fdivrp
   67 0080 DEFB [ 	]*fdivrp	%st\(3\)
   68 0082 DEFB [ 	]*fdivrp	%st,%st\(3\)
+  69 [ 	]*
+  70 0084 00000000 [ 	]*.p2align	4,0
+  70      00000000 
+  70      00000000 
diff --git a/gas/testsuite/gas/i386/float.s b/gas/testsuite/gas/i386/float.s
index 6bb09f8..03d30b7 100644
--- a/gas/testsuite/gas/i386/float.s
+++ b/gas/testsuite/gas/i386/float.s
@@ -66,3 +66,5 @@
 	fdivrp
 	fdivrp	%st(3)
 	fdivrp	%st,%st(3)
+
+	.p2align	4,0
diff --git a/gas/testsuite/gas/i386/general.l b/gas/testsuite/gas/i386/general.l
index a403447..68f6600 100644
--- a/gas/testsuite/gas/i386/general.l
+++ b/gas/testsuite/gas/i386/general.l
@@ -201,5 +201,6 @@
  148 013e 80250000 00007F   		andb	\$~0x80,foo
  149                       	
  150                       		# Force a good alignment.
- 151 0145 0000              		.word	0
- 152 0147 00                		.byte	0
+ 151 0145 00000000 00000000[ 	]*.p2align	4,0
+ 151      000000
+
diff --git a/gas/testsuite/gas/i386/general.s b/gas/testsuite/gas/i386/general.s
index d73f489..cbe0373 100644
--- a/gas/testsuite/gas/i386/general.s
+++ b/gas/testsuite/gas/i386/general.s
@@ -148,5 +148,4 @@
 	andb	$~0x80,foo
 
 	# Force a good alignment.
-	.word	0
-	.byte	0
+	.p2align	4,0
diff --git a/gas/testsuite/gas/i386/katmai.d b/gas/testsuite/gas/i386/katmai.d
index 4215498c..7d08581 100644
--- a/gas/testsuite/gas/i386/katmai.d
+++ b/gas/testsuite/gas/i386/katmai.d
@@ -167,11 +167,6 @@ Disassembly of section .text:
  248:	65 [ 	]*gs
  249:	0f [ 	]*sfence.*\(bad\).*
  24a:	ae [ 	]*scas   %es:\(%edi\),%al
- 24b:	ff 90 90 90 90 90 [ 	]*call   \*0x90909090\(%eax\)
- 251:	90 [ 	]*nop    
- 252:	90 [ 	]*nop    
- 253:	90 [ 	]*nop    
- 254:	90 [ 	]*nop    
- 255:	90 [ 	]*nop    
- 256:	90 [ 	]*nop    
- 257:	90 [ 	]*nop    
+ 24b:	ff 00 [ 	]*incl   \(%eax\)
+ 24d:	00 00 [ 	]*add    %al,\(%eax\)
+	...
diff --git a/gas/testsuite/gas/i386/katmai.s b/gas/testsuite/gas/i386/katmai.s
index d42a74d..534d15d 100644
--- a/gas/testsuite/gas/i386/katmai.s
+++ b/gas/testsuite/gas/i386/katmai.s
@@ -163,5 +163,5 @@ foo:
  nop
 # A bad sfence modrm byte
 .byte 0x65,0x0F,0xAE,0xff
-# Pad out to goo alignment
-.byte 0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90
+# Pad out to good alignment
+ .p2align 4,0
diff --git a/gas/testsuite/gas/i386/modrm.l b/gas/testsuite/gas/i386/modrm.l
index 8a1bc79..3e3b096 100644
--- a/gas/testsuite/gas/i386/modrm.l
+++ b/gas/testsuite/gas/i386/modrm.l
@@ -1981,4 +1981,4 @@
 .*Warning:.*
  1669 [ 	]*
  1670 [ 	]*     		# Force a good alignment.
- 1671 217b 00 [ 	]*	.byte	0
+ 1671 217b 00000000 00[ 	]*.p2align	4,0
diff --git a/gas/testsuite/gas/i386/modrm.s b/gas/testsuite/gas/i386/modrm.s
index a6fc689..dbd446c 100644
--- a/gas/testsuite/gas/i386/modrm.s
+++ b/gas/testsuite/gas/i386/modrm.s
@@ -1668,4 +1668,4 @@
 	mov	%ds,%ds:0x12(,8)
 
 	# Force a good alignment.
-	.byte	0
+	.p2align	4,0
diff --git a/gas/testsuite/gas/i386/prefix.d b/gas/testsuite/gas/i386/prefix.d
index 61eba81..054b658 100644
--- a/gas/testsuite/gas/i386/prefix.d
+++ b/gas/testsuite/gas/i386/prefix.d
@@ -12,4 +12,4 @@ Disassembly of section .text:
    b:	9b df e0 [ 	]*fstsw  %ax
    e:	9b 67 df e0 [ 	]*addr16 fstsw %ax
   12:	f3 67 66 36 a7 [ 	]*repz addr16 cmpsw %es:\(%di\),%ss:\(%si\)
-  17:	90 [ 	]*nop    
+	...
diff --git a/gas/testsuite/gas/i386/prefix.s b/gas/testsuite/gas/i386/prefix.s
index a998b41..8f5dffd 100644
--- a/gas/testsuite/gas/i386/prefix.s
+++ b/gas/testsuite/gas/i386/prefix.s
@@ -8,4 +8,4 @@ foo:
  addr16 rep cmpsw %es:(%di),%ss:(%si)
 
 # Get a good alignment.
- nop
+ .p2align	4,0