PR 12610
        * config/tc-alpha.c (s_alpha_align): Don't auto-align a previous 
        label; zap alpha_insn_label.


diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index d1de6f9..5c1c73e 100644
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -5081,12 +5081,13 @@ s_alpha_align (int ignore ATTRIBUTE_UNUSED)
   if (align != 0)
     {
       alpha_auto_align_on = 1;
-      alpha_align (align, pfill, alpha_insn_label, 1);
+      alpha_align (align, pfill, NULL, 1);
     }
   else
     {
       alpha_auto_align_on = 0;
     }
+  alpha_insn_label = NULL;
 
   demand_empty_rest_of_line ();
 }
diff --git a/gas/testsuite/gas/alpha/auto-align-1.d b/gas/testsuite/gas/alpha/auto-align-1.d
new file mode 100644
index 0000000..971f117
--- /dev/null
+++ b/gas/testsuite/gas/alpha/auto-align-1.d
@@ -0,0 +1,6 @@
+#objdump: -s -j .data
+#name: alpha auto-align-1
+
+.*:     file format *
+Contents of section .data:
+ 0000 04000000 .*
diff --git a/gas/testsuite/gas/alpha/auto-align-1.s b/gas/testsuite/gas/alpha/auto-align-1.s
new file mode 100644
index 0000000..0b088c2
--- /dev/null
+++ b/gas/testsuite/gas/alpha/auto-align-1.s
@@ -0,0 +1,7 @@
+.text
+	.align	4
+$B:	 unop
+$E:	.align	4
+	fnop
+.data
+	.long	$E - $B