diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 9366e8d65e..a3c035db1e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-20 Dwarakanath Rajagopal	<dwarak.rajagopal@amd.com>
+	   Michael Meissner		<michael.meissner@amd.com>
+
+	* gas/i386/amdfam10.s: Add .p2align 4,0 to make sure segment is
+	aligned on all systems.
+	* gas/i386/x86-64-amdfam10.s: Likewise.
+	* gas/i386/amdfam10.d: Adjust output for alignment.
+	* gas/i386/x86-64-amdfam10.d: Likewise.
+
 2006-07-19  Paul Brook  <paul@codesourcery.com>
 
 	* gas/arm/archv6t2.d: Adjust expected output for rbit.
diff --git a/gas/testsuite/gas/i386/amdfam10.d b/gas/testsuite/gas/i386/amdfam10.d
index 1c664f62f0..79cd764699 100644
--- a/gas/testsuite/gas/i386/amdfam10.d
+++ b/gas/testsuite/gas/i386/amdfam10.d
@@ -20,3 +20,5 @@ Disassembly of section .text:
   2e:	f2 0f 78 ca 02 04[ 	]*insertq \$0x4,\$0x2,%xmm2,%xmm1
   34:	f2 0f 2b 09[ 	]+movntsd %xmm1,\(%ecx\)
   38:	f3 0f 2b 09[ 	]+movntss %xmm1,\(%ecx\)
+  3c:	00 00 [ 	]+add    %al,\(%eax\)
+	...
diff --git a/gas/testsuite/gas/i386/amdfam10.s b/gas/testsuite/gas/i386/amdfam10.s
index 9b67b9cd4c..bef51fee2f 100644
--- a/gas/testsuite/gas/i386/amdfam10.s
+++ b/gas/testsuite/gas/i386/amdfam10.s
@@ -16,3 +16,6 @@ foo:
 	insertq	$4,$2,%xmm2,%xmm1
 	movntsd	%xmm1,(%ecx)
 	movntss %xmm1,(%ecx)
+
+	# Force a good alignment.
+	.p2align	4,0
diff --git a/gas/testsuite/gas/i386/x86-64-amdfam10.d b/gas/testsuite/gas/i386/x86-64-amdfam10.d
index 84d4d523c5..3f00d19d36 100644
--- a/gas/testsuite/gas/i386/x86-64-amdfam10.d
+++ b/gas/testsuite/gas/i386/x86-64-amdfam10.d
@@ -24,3 +24,4 @@ Disassembly of section .text:
   40:	f2 0f 78 ca 02 04[ 	]+insertq \$0x4,\$0x2,%xmm2,%xmm1
   46:	f2 0f 2b 09[ 	]+movntsd %xmm1,\(%rcx\)
   4a:	f3 0f 2b 09[ 	]+movntss %xmm1,\(%rcx\)
+	...
diff --git a/gas/testsuite/gas/i386/x86-64-amdfam10.s b/gas/testsuite/gas/i386/x86-64-amdfam10.s
index 5a4be4955b..df0416443b 100644
--- a/gas/testsuite/gas/i386/x86-64-amdfam10.s
+++ b/gas/testsuite/gas/i386/x86-64-amdfam10.s
@@ -20,3 +20,6 @@ foo:
 	insertq	$4,$2,%xmm2,%xmm1
 	movntsd	%xmm1,(%rcx)
 	movntss %xmm1,(%rcx)
+
+	# Force a good alignment.
+	.p2align	4,0