diff --git a/test/MC/AArch64/ldr-pseudo.s b/test/MC/AArch64/ldr-pseudo.s
index 1bdb5d69f6f..3dbe6fd6e73 100644
--- a/test/MC/AArch64/ldr-pseudo.s
+++ b/test/MC/AArch64/ldr-pseudo.s
@@ -209,31 +209,31 @@ f18:
 // Constant Pools
 //
 // CHECK: .section b,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP0]]
 // CHECK: .word 65537
 
 // CHECK: .section c,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP1]]
 // CHECK: .word 65538
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP2]]
 // CHECK: .word 65539
 
 // CHECK: .section d,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP3]]
 // CHECK: .word 65540
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP4]]
 // CHECK: .word 65540
 
 // CHECK: .section e,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP5]]
 // CHECK: .word 65542
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP6]]
 // CHECK: .word 65543
 
@@ -241,79 +241,79 @@ f18:
 // CHECK-NOT: .section f,"ax",@progbits
 
 // CHECK: .section g,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP7]]
 // CHECK: .word foo
 
 // CHECK: .section h,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP8]]
 // CHECK: .word f5
 
 // CHECK: .section i,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP9]]
 // CHECK: .word f12
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP10]]
 // CHECK: .word 245760
 
 // CHECK: .section j,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP11]]
 // CHECK: .word bar
 
 // CHECK: .section k,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP12]]
 // CHECK: .word 65544
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP13]]
 // CHECK: .word baz
 
 // CHECK: .section l,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP14]]
 // CHECK: .word 65545
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP15]]
 // CHECK: .word bar+4
 
 // CHECK: .section m,"ax",@progbits
-// CHECK: .align 3
+// CHECK: .p2align 3
 // CHECK: .Ltmp[[TMP16]]
 // CHECK: .xword 72623859790382856
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP17]]
 // CHECK: .word bar
-// CHECK: .align 3
+// CHECK: .p2align 3
 // CHECK: .Ltmp[[TMP18]]
 // CHECK: .xword bar+16
-// CHECK: .align 3
+// CHECK: .p2align 3
 // CHECK: .Ltmp[[TMP19]]
 // CHECK: .xword 4294967297
-// CHECK: .align 3
+// CHECK: .p2align 3
 // CHECK: .Ltmp[[TMP20]]
 // CHECK: .xword -2147483649
-// CHECK: .align 3
+// CHECK: .p2align 3
 // CHECK: .Ltmp[[TMP21]]
 // CHECK: .xword 65537
 
 // CHECK: .section n,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP22]]
 // CHECK: .word 4294967295
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP23]]
 // CHECK: .word -2147483647
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP24]]
 // CHECK: .word -1
 
 // CHECK: .section o,"ax",@progbits
-// CHECK: .align 2
+// CHECK: .p2align 2
 // CHECK: .Ltmp[[TMP25]]
 // CHECK: .word 3276900
-// CHECK: .align 3
+// CHECK: .p2align 3
 // CHECK: .Ltmp[[TMP26]]
 // CHECK: .xword 3276900
diff --git a/test/MC/ARM/directive-align.s b/test/MC/ARM/directive-align.s
index d3e39cb1c56..34fd96d6cc6 100644
--- a/test/MC/ARM/directive-align.s
+++ b/test/MC/ARM/directive-align.s
@@ -8,7 +8,7 @@ unaligned:
 
 @ CHECK-LABEL: unaligned
 @ CHECK-NEXT:	.byte 1
-@ CHECK-NEXT:	.align 2
+@ CHECK-NEXT:	.p2align 2
 
 aligned:
 	.long 0x1d10c1e5
@@ -16,7 +16,7 @@ aligned:
 
 @ CHECK-LABEL: aligned
 @ CHECK-NEXT:	.long 487637477
-@ CHECK-NEXT:	.align 2
+@ CHECK-NEXT:	.p2align 2
 
 trailer:
 	.long 0xd1ab011c
@@ -24,5 +24,5 @@ trailer:
 
 @ CHECK-LABEL: trailer
 @ CHECK-NEXT:	.long 3517645084
-@ CHECK-NEXT:	.align 2
+@ CHECK-NEXT:	.p2align 2
 
diff --git a/test/MC/ARM/inst-directive-emit.s b/test/MC/ARM/inst-directive-emit.s
index 63fdd15ee38..fbcc9c91d68 100644
--- a/test/MC/ARM/inst-directive-emit.s
+++ b/test/MC/ARM/inst-directive-emit.s
@@ -3,7 +3,7 @@
 	.syntax unified
 	.thumb
 
-	.align 2
+	.p2align 2
 	.global emit_asm
 	.type emit_asm,%function
 emit_asm:
@@ -11,7 +11,7 @@ emit_asm:
 
 @ CHECK: 	.text
 @ CHECK: 	.code	16
-@ CHECK: 	.align	2
+@ CHECK: 	.p2align	2
 @ CHECK: 	.globl	emit_asm
 @ CHECK: 	.type	emit_asm,%function
 @ CHECK: emit_asm:
diff --git a/test/MC/ARM/ldr-pseudo-darwin.s b/test/MC/ARM/ldr-pseudo-darwin.s
index f04f533cfae..086a7a86848 100644
--- a/test/MC/ARM/ldr-pseudo-darwin.s
+++ b/test/MC/ARM/ldr-pseudo-darwin.s
@@ -157,37 +157,37 @@ f15:
 @
 @ CHECK: .section __TEXT,b,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp0:
 @ CHECK: .long 65537
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,c,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp1:
 @ CHECK: .long 65538
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp2:
 @ CHECK: .long 65539
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,d,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp3:
 @ CHECK: .long 65540
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp4:
 @ CHECK: .long 65540
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,e,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp5:
 @ CHECK: .long 65542
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp6:
 @ CHECK: .long 65543
 @ CHECK: .end_data_region
@@ -197,51 +197,51 @@ f15:
 
 @ CHECK: .section __TEXT,g,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp7:
 @ CHECK: .long foo
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,h,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp8:
 @ CHECK: .long f5
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,i,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp9:
 @ CHECK: .long f12
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,j,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp10:
 @ CHECK: .long 257
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp11:
 @ CHECK: .long bar
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,k,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp12:
 @ CHECK: .long 65544
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp13:
 @ CHECK: .long baz
 @ CHECK: .end_data_region
 
 @ CHECK: .section __TEXT,l,regular,pure_instructions
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp14:
 @ CHECK: .long 65545
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp15:
 @ CHECK: .long bar+4
 @ CHECK: .end_data_region
diff --git a/test/MC/ARM/ldr-pseudo.s b/test/MC/ARM/ldr-pseudo.s
index df0d88a9a56..cb000bbfdfc 100644
--- a/test/MC/ARM/ldr-pseudo.s
+++ b/test/MC/ARM/ldr-pseudo.s
@@ -156,26 +156,26 @@ f15:
 @ Constant Pools
 @
 @ CHECK: .section b,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP0]]
 @ CHECK: .long 65537
 
 @ CHECK: .section c,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP1]]
 @ CHECK: .long 65538
 @ CHECK: .Ltmp[[TMP2]]
 @ CHECK: .long 65539
 
 @ CHECK: .section d,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP3]]
 @ CHECK: .long 65540
 @ CHECK: .Ltmp[[TMP4]]
 @ CHECK: .long 65540
 
 @ CHECK: .section e,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP5]]
 @ CHECK: .long 65542
 @ CHECK: .Ltmp[[TMP6]]
@@ -185,36 +185,36 @@ f15:
 @ CHECK-NOT: .section f,"ax",%progbits
 
 @ CHECK: .section g,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP7]]
 @ CHECK: .long foo
 
 @ CHECK: .section h,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP8]]
 @ CHECK: .long f5
 
 @ CHECK: .section i,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP9]]
 @ CHECK: .long f12
 
 @ CHECK: .section j,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP10]]
 @ CHECK: .long 257
 @ CHECK: .Ltmp[[TMP11]]
 @ CHECK: .long bar
 
 @ CHECK: .section k,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP12]]
 @ CHECK: .long 65544
 @ CHECK: .Ltmp[[TMP13]]
 @ CHECK: .long baz
 
 @ CHECK: .section l,"ax",%progbits
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP14]]
 @ CHECK: .long 65545
 @ CHECK: .Ltmp[[TMP15]]
diff --git a/test/MC/ARM/ltorg-darwin.s b/test/MC/ARM/ltorg-darwin.s
index 3402f4053cb..e3480520c67 100644
--- a/test/MC/ARM/ltorg-darwin.s
+++ b/test/MC/ARM/ltorg-darwin.s
@@ -20,7 +20,7 @@ f2:
 .ltorg
 @ constant pool
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp0:
 @ CHECK: .long 65537
 @ CHECK: .end_data_region
@@ -42,7 +42,7 @@ f4:
 .ltorg
 @ constant pool
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp1:
 @ CHECK: .long 65538
 @ CHECK: .end_data_region
@@ -58,7 +58,7 @@ f5:
 .ltorg
 @ constant pool
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp2:
 @ CHECK: .long 65539
 @ CHECK: .end_data_region
@@ -93,7 +93,7 @@ f9:
 .ltorg
 @ constant pool
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp3:
 @ CHECK: .long bar
 @ CHECK: .end_data_region
@@ -115,7 +115,7 @@ f11:
   .ltorg
 @ constant pool
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp4:
 @ CHECK: .long 65540
 @ CHECK: .end_data_region
@@ -142,7 +142,7 @@ f13:
 @ CHECK: .section __TEXT,e,regular,pure_instructions
 @ constant pool
 @ CHECK: .data_region
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK-LABEL: Ltmp5:
 @ CHECK: .long 65541
 @ CHECK: .end_data_region
diff --git a/test/MC/ARM/ltorg.s b/test/MC/ARM/ltorg.s
index e28862cb2a4..3a3c02707b2 100644
--- a/test/MC/ARM/ltorg.s
+++ b/test/MC/ARM/ltorg.s
@@ -19,7 +19,7 @@ f2:
   b f3
 .ltorg
 @ constant pool
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP0]]
 @ CHECK: .long 65537
 
@@ -39,7 +39,7 @@ f4:
   b f5
 .ltorg
 @ constant pool
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP1]]
 @ CHECK: .long 65538
 
@@ -53,7 +53,7 @@ f5:
   b f6
 .ltorg
 @ constant pool
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP2]]
 @ CHECK: .long 65539
 
@@ -86,7 +86,7 @@ f9:
   b f10
 .ltorg
 @ constant pool
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP3]]
 @ CHECK: .long bar
 
@@ -106,7 +106,7 @@ f11:
   b f12
   .ltorg
 @ constant pool
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP4]]
 @ CHECK: .long 65540
 @ CHECK-LABEL: f12:
@@ -130,7 +130,7 @@ f13:
 @ should have a non-empty constant pool at end of this section
 @ CHECK: .section e,"ax",%progbits
 @ constant pool
-@ CHECK: .align 2
+@ CHECK: .p2align 2
 @ CHECK: .Ltmp[[TMP5]]
 @ CHECK: .long 65541
 
diff --git a/test/MC/ARM/pool.s b/test/MC/ARM/pool.s
index 782f67e1fea..c87d37f9efd 100644
--- a/test/MC/ARM/pool.s
+++ b/test/MC/ARM/pool.s
@@ -2,7 +2,7 @@
 
 	.syntax unified
 
-	.align 2
+	.p2align 2
 	.global pool
 	.type pool,%function
 pool:
@@ -12,7 +12,7 @@ pool:
 
 @ CHECK-LABEL: pool
 @ CHECK: ldr r0, .Ltmp0
-@ CHECK: .align	2
+@ CHECK: .p2align	2
 @ CHECK-LABEL: .Ltmp0:
 @ CHECK: .long	3126770193
 
diff --git a/test/MC/AsmParser/comments-x86-darwin.s b/test/MC/AsmParser/comments-x86-darwin.s
index e201f48b1d7..5a873495ce6 100644
--- a/test/MC/AsmParser/comments-x86-darwin.s
+++ b/test/MC/AsmParser/comments-x86-darwin.s
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -triple x86_64-apple-darwin %s 2>&1 | FileCheck %s
 # ensure that single '#' comments are worink as expected on x86 darwin
-.align 3            # test single hash after align
-// CHECK: .align 3
+.p2align 3            # test single hash after align
+// CHECK: .p2align 3
 foo:                # single hash should be ignored as comment
 // CHECK-LABEL: foo:
     movl %esp, %ebp # same after an instruction
diff --git a/test/MC/AsmParser/directive_align.s b/test/MC/AsmParser/directive_align.s
index 7ce28559d95..9eb1d7f2d8f 100644
--- a/test/MC/AsmParser/directive_align.s
+++ b/test/MC/AsmParser/directive_align.s
@@ -1,7 +1,7 @@
 # RUN: not llvm-mc -triple i386-apple-darwin9 %s | FileCheck %s
 
 # CHECK: TEST0:
-# CHECK: .align 1
+# CHECK: .p2align 1
 TEST0:  
         .align 1