[MC] Use .p2align instead of .align
For historic reasons, the behavior of .align differs between targets.
Fortunately, there are alternatives, .p2align and .balign, which make the
interpretation of the parameter explicit, and which behave consistently across
targets.
This patch teaches MC to use .p2align instead of .align, so that people reading
code for multiple architectures don't have to remember which way each platform
does its .align directive.
Differential Revision: http://reviews.llvm.org/D16549
llvm-svn: 258750
diff --git a/llvm/test/CodeGen/ARM/Windows/long-calls.ll b/llvm/test/CodeGen/ARM/Windows/long-calls.ll
index 4e5bdce..a878fad 100644
--- a/llvm/test/CodeGen/ARM/Windows/long-calls.ll
+++ b/llvm/test/CodeGen/ARM/Windows/long-calls.ll
@@ -12,7 +12,7 @@
; CHECK-LABEL: caller
; CHECK: ldr [[REG:r[0-9]+]], [[CPI:LCPI[_0-9]+]]
; CHECK: bx [[REG]]
-; CHECK: .align 2
+; CHECK: .p2align 2
; CHECK: [[CPI]]:
; CHECK: .long callee
diff --git a/llvm/test/CodeGen/ARM/align.ll b/llvm/test/CodeGen/ARM/align.ll
index 9589e72..7452590 100644
--- a/llvm/test/CodeGen/ARM/align.ll
+++ b/llvm/test/CodeGen/ARM/align.ll
@@ -8,33 +8,33 @@
; no alignment
@c = global i16 2
-;ELF: .align 1
+;ELF: .p2align 1
;ELF: c:
-;DARWIN: .align 1
+;DARWIN: .p2align 1
;DARWIN: _c:
@d = global i32 3
-;ELF: .align 2
+;ELF: .p2align 2
;ELF: d:
-;DARWIN: .align 2
+;DARWIN: .p2align 2
;DARWIN: _d:
@e = global i64 4
-;ELF: .align 3
+;ELF: .p2align 3
;ELF: e
-;DARWIN: .align 3
+;DARWIN: .p2align 3
;DARWIN: _e:
@f = global float 5.0
-;ELF: .align 2
+;ELF: .p2align 2
;ELF: f:
-;DARWIN: .align 2
+;DARWIN: .p2align 2
;DARWIN: _f:
@g = global double 6.0
-;ELF: .align 3
+;ELF: .p2align 3
;ELF: g:
-;DARWIN: .align 3
+;DARWIN: .p2align 3
;DARWIN: _g:
@bar = common global [75 x i8] zeroinitializer, align 128
diff --git a/llvm/test/CodeGen/ARM/byval_load_align.ll b/llvm/test/CodeGen/ARM/byval_load_align.ll
index 2c0910c..d00d926 100644
--- a/llvm/test/CodeGen/ARM/byval_load_align.ll
+++ b/llvm/test/CodeGen/ARM/byval_load_align.ll
@@ -7,7 +7,7 @@
; CHECK: ldr r2, [r[[REG]], #4]
; CHECK: ldr r3, [r[[REG]], #8]
; CHECK-NOT: ldm
-; CHECK: .align 1 @ @sID
+; CHECK: .p2align 1 @ @sID
%struct.ModuleID = type { [32 x i8], [32 x i8], i16 }
diff --git a/llvm/test/CodeGen/ARM/ehabi-handlerdata-nounwind.ll b/llvm/test/CodeGen/ARM/ehabi-handlerdata-nounwind.ll
index 3d380bf..517d559 100644
--- a/llvm/test/CodeGen/ARM/ehabi-handlerdata-nounwind.ll
+++ b/llvm/test/CodeGen/ARM/ehabi-handlerdata-nounwind.ll
@@ -42,7 +42,7 @@
}
; CHECK: .globl test1
-; CHECK: .align 2
+; CHECK: .p2align 2
; CHECK: .type test1,%function
; CHECK-LABEL: test1:
; CHECK: .fnstart
@@ -51,7 +51,7 @@
; CHECK: .personality __gxx_personality_v0
; CHECK: .handlerdata
-; CHECK: .align 2
+; CHECK: .p2align 2
; CHECK-LABEL: GCC_except_table0:
; CHECK-LABEL: .Lexception0:
; CHECK: .byte 255 @ @LPStart Encoding = omit
diff --git a/llvm/test/CodeGen/ARM/ehabi-handlerdata.ll b/llvm/test/CodeGen/ARM/ehabi-handlerdata.ll
index c53b36f..ecb23c3 100644
--- a/llvm/test/CodeGen/ARM/ehabi-handlerdata.ll
+++ b/llvm/test/CodeGen/ARM/ehabi-handlerdata.ll
@@ -40,13 +40,13 @@
}
; CHECK: .globl test1
-; CHECK: .align 2
+; CHECK: .p2align 2
; CHECK: .type test1,%function
; CHECK-LABEL: test1:
; CHECK: .fnstart
; CHECK: .personality __gxx_personality_v0
; CHECK: .handlerdata
-; CHECK: .align 2
+; CHECK: .p2align 2
; CHECK-LABEL: GCC_except_table0:
; CHECK-LABEL: .Lexception0:
; CHECK: .byte 255 @ @LPStart Encoding = omit
diff --git a/llvm/test/CodeGen/ARM/emutls_generic.ll b/llvm/test/CodeGen/ARM/emutls_generic.ll
index 872dd83..f5633dc 100644
--- a/llvm/test/CodeGen/ARM/emutls_generic.ll
+++ b/llvm/test/CodeGen/ARM/emutls_generic.ll
@@ -41,7 +41,7 @@
; ARM_32-NOT: __emutls_v.external_x:
; ARM_32: .data{{$}}
; ARM_32: .globl __emutls_v.external_y
-; ARM_32: .align 2
+; ARM_32: .p2align 2
; ARM_32-LABEL: __emutls_v.external_y:
; ARM_32-NEXT: .long 1
; ARM_32-NEXT: .long 2
@@ -52,7 +52,7 @@
; ARM_32-NEXT: .byte 7
; ARM_32: .data{{$}}
; ARM_32-NOT: .globl
-; ARM_32: .align 2
+; ARM_32: .p2align 2
; ARM_32-LABEL: __emutls_v.internal_y:
; ARM_32-NEXT: .long 8
; ARM_32-NEXT: .long 16
diff --git a/llvm/test/CodeGen/ARM/globals.ll b/llvm/test/CodeGen/ARM/globals.ll
index e6aa2db..399d520 100644
--- a/llvm/test/CodeGen/ARM/globals.ll
+++ b/llvm/test/CodeGen/ARM/globals.ll
@@ -15,7 +15,7 @@
; DarwinStatic: ldr r0, [r0]
; DarwinStatic: bx lr
-; DarwinStatic: .align 2
+; DarwinStatic: .p2align 2
; DarwinStatic: LCPI0_0:
; DarwinStatic: .long {{_G$}}
@@ -26,12 +26,12 @@
; DarwinDynamic: ldr r0, [r0]
; DarwinDynamic: bx lr
-; DarwinDynamic: .align 2
+; DarwinDynamic: .p2align 2
; DarwinDynamic: LCPI0_0:
; DarwinDynamic: .long L_G$non_lazy_ptr
; DarwinDynamic: .section __DATA,__nl_symbol_ptr,non_lazy_symbol_pointers
-; DarwinDynamic: .align 2
+; DarwinDynamic: .p2align 2
; DarwinDynamic: L_G$non_lazy_ptr:
; DarwinDynamic: .indirect_symbol _G
; DarwinDynamic: .long 0
@@ -46,12 +46,12 @@
; DarwinPIC-NOT: ldr
; DarwinPIC: bx lr
-; DarwinPIC: .align 2
+; DarwinPIC: .p2align 2
; DarwinPIC: LCPI0_0:
; DarwinPIC: .long L_G$non_lazy_ptr-(LPC0_0+8)
; DarwinPIC: .section __DATA,__nl_symbol_ptr,non_lazy_symbol_pointers
-; DarwinPIC: .align 2
+; DarwinPIC: .p2align 2
; DarwinPIC: L_G$non_lazy_ptr:
; DarwinPIC: .indirect_symbol _G
; DarwinPIC: .long 0
@@ -66,7 +66,7 @@
; LinuxPIC: ldr r0, [r0]
; LinuxPIC: bx lr
-; LinuxPIC: .align 2
+; LinuxPIC: .p2align 2
; LinuxPIC: .LCPI0_0:
; LinuxPIC: .Ltmp0:
; LinuxPIC: .long G(GOT_PREL)-((.LPC0_0+8)-.Ltmp0)
diff --git a/llvm/test/CodeGen/ARM/memfunc.ll b/llvm/test/CodeGen/ARM/memfunc.ll
index 46fef76..3523456 100644
--- a/llvm/test/CodeGen/ARM/memfunc.ll
+++ b/llvm/test/CodeGen/ARM/memfunc.ll
@@ -398,22 +398,22 @@
}
; CHECK: {{\.data|\.section.+data}}
-; CHECK-NOT: .align
+; CHECK-NOT: .p2align
; CHECK: arr1:
-; CHECK-IOS: .align 3
-; CHECK-DARWIN: .align 2
-; CHECK-EABI-NOT: .align
-; CHECK-GNUEABI-NOT: .align
+; CHECK-IOS: .p2align 3
+; CHECK-DARWIN: .p2align 2
+; CHECK-EABI-NOT: .p2align
+; CHECK-GNUEABI-NOT: .p2align
; CHECK: arr2:
; CHECK: {{\.section.+foo,bar}}
-; CHECK-NOT: .align
+; CHECK-NOT: .p2align
; CHECK: arr3:
-; CHECK-NOT: .align
+; CHECK-NOT: .p2align
; CHECK: arr4:
; CHECK: {{\.data|\.section.+data}}
-; CHECK-NOT: .align
+; CHECK-NOT: .p2align
; CHECK: arr5:
-; CHECK-NOT: .align
+; CHECK-NOT: .p2align
; CHECK: arr6:
; CHECK-NOT: arr7:
diff --git a/llvm/test/CodeGen/ARM/preferred-align.ll b/llvm/test/CodeGen/ARM/preferred-align.ll
index 8cd4ef6..a9a1722 100644
--- a/llvm/test/CodeGen/ARM/preferred-align.ll
+++ b/llvm/test/CodeGen/ARM/preferred-align.ll
@@ -3,19 +3,19 @@
@var_agg = global {i8, i8} zeroinitializer
; CHECK: .globl var_agg
-; CHECK-NEXT: .align 2
+; CHECK-NEXT: .p2align 2
@var1 = global i1 zeroinitializer
; CHECK: .globl var1
-; CHECK-NOT: .align
+; CHECK-NOT: .p2align
@var8 = global i8 zeroinitializer
; CHECK: .globl var8
-; CHECK-NOT: .align
+; CHECK-NOT: .p2align
@var16 = global i16 zeroinitializer
; CHECK: .globl var16
-; CHECK-NEXT: .align 1
\ No newline at end of file
+; CHECK-NEXT: .p2align 1
\ No newline at end of file
diff --git a/llvm/test/CodeGen/ARM/thumb-alignment.ll b/llvm/test/CodeGen/ARM/thumb-alignment.ll
index b9ddfbb..8e894d2 100644
--- a/llvm/test/CodeGen/ARM/thumb-alignment.ll
+++ b/llvm/test/CodeGen/ARM/thumb-alignment.ll
@@ -3,13 +3,13 @@
@x = external global i32
; CHECK: .globl foo
-; CHECK-NEXT: .align 2
+; CHECK-NEXT: .p2align 2
define i32* @foo() {
ret i32* @x
}
; CHECK: .globl bar
-; CHECK-NEXT: .align 1
+; CHECK-NEXT: .p2align 1
define i32* @bar() {
ret i32* zeroinitializer
}
@@ -22,7 +22,7 @@
; Create a Thumb-2 jump table, which should force alignment to 4 bytes.
; CHECK: .globl baz
-; CHECK-NEXT: .align 2
+; CHECK-NEXT: .p2align 2
; CHECK: tbb
define i32 @baz() {
%1 = load i32, i32* @c, align 4
diff --git a/llvm/test/CodeGen/ARM/tls-models.ll b/llvm/test/CodeGen/ARM/tls-models.ll
index f3c58f7..d8c74d2 100644
--- a/llvm/test/CodeGen/ARM/tls-models.ll
+++ b/llvm/test/CodeGen/ARM/tls-models.ll
@@ -130,7 +130,7 @@
; EMU-NOT: __emutls_t.external_gd
; EMU-NOT: __emutls_v.external_gd
-; EMU: .align 2
+; EMU: .p2align 2
; EMU-LABEL: __emutls_v.internal_gd:
; EMU-NEXT: .long 4
; EMU-NEXT: .long 4
@@ -144,7 +144,7 @@
; EMU-NOT: __emutls_t.external_gd
; EMU-NOT: __emutls_v.external_gd
-; EMU: .align 2
+; EMU: .p2align 2
; EMU-LABEL: __emutls_v.internal_le:
; EMU-NEXT: .long 4
; EMU-NEXT: .long 4
diff --git a/llvm/test/CodeGen/ARM/tls3.ll b/llvm/test/CodeGen/ARM/tls3.ll
index 94cadee..ca3cde2 100644
--- a/llvm/test/CodeGen/ARM/tls3.ll
+++ b/llvm/test/CodeGen/ARM/tls3.ll
@@ -23,7 +23,7 @@
; CHECK-NOT: __emutls_t.teste
-; EMU: .align 2
+; EMU: .p2align 2
; EMU-LABEL: __emutls_v.teste:
; EMU-NEXT: .long 8
; EMU-NEXT: .long 4