Skip to content

Commit 301fe47

Browse files
popaflorinflopop01
andauthored
[AArch64][ELF] Section alignment of 4 for AArch64 instruction (#114031)
The integrated assembler sets a minimum alignment for the .text section of 4. However user defined sections get an alignment of 1. Unlike the GNU assembler which raises the section alignment to 4 if an AArch64 instruction is used, the integrated assembler leaves the alignment at 1 --------- Co-authored-by: Florin Popa <[email protected]>
1 parent 229dcf9 commit 301fe47

File tree

3 files changed

+50
-12
lines changed

3 files changed

+50
-12
lines changed

lld/test/ELF/aarch64-relocs.s

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ mystr:
4242
# CHECK: Disassembly of section .R_AARCH64_ADD_ABS_LO12_NC:
4343
# CHECK-EMPTY:
4444
# CHECK-NEXT: <.R_AARCH64_ADD_ABS_LO12_NC>:
45-
# CHECK-NEXT: 21013b: 9104fc00 add x0, x0, #319
45+
# CHECK-NEXT: 210140: 91051000 add x0, x0, #324
4646

4747
.section .R_AARCH64_LDST64_ABS_LO12_NC,"ax",@progbits
4848
ldr x28, [x27, :lo12:foo]
@@ -56,7 +56,7 @@ foo:
5656
# CHECK: Disassembly of section .R_AARCH64_LDST64_ABS_LO12_NC:
5757
# CHECK-EMPTY:
5858
# CHECK-NEXT: <.R_AARCH64_LDST64_ABS_LO12_NC>:
59-
# CHECK-NEXT: 210144: f940a77c ldr x28, [x27, #328]
59+
# CHECK-NEXT: 21014c: f940ab7c ldr x28, [x27, #336]
6060

6161
.section .SUB,"ax",@progbits
6262
nop
@@ -86,7 +86,7 @@ foo32:
8686
# CHECK: Disassembly of section .R_AARCH64_LDST32_ABS_LO12_NC:
8787
# CHECK-EMPTY:
8888
# CHECK-NEXT: <ldst32>:
89-
# CHECK-NEXT: 21015c: bd4160a4 ldr s4, [x5, #352]
89+
# CHECK-NEXT: 210164: bd4168a4 ldr s4, [x5, #360]
9090

9191
.section .R_AARCH64_LDST8_ABS_LO12_NC,"ax",@progbits
9292
ldst8:
@@ -101,24 +101,26 @@ foo8:
101101
# CHECK: Disassembly of section .R_AARCH64_LDST8_ABS_LO12_NC:
102102
# CHECK-EMPTY:
103103
# CHECK-NEXT: <ldst8>:
104-
# CHECK-NEXT: 210164: 3985a1ab ldrsb x11, [x13, #360]
104+
# CHECK-NEXT: 21016c: 3985c1ab ldrsb x11, [x13, #368]
105105

106106
.section .R_AARCH64_LDST128_ABS_LO12_NC,"ax",@progbits
107107
ldst128:
108108
ldr q20, [x19, #:lo12:foo128]
109+
.balign 16
109110
foo128:
110111
.asciz "foo"
111112
.size mystr, 3
112113

113-
# S = 0x21016c, A = 0x4
114-
# R = ((S + A) & 0xFF8) << 6 = 0x00005c00
115-
# 0x00005c00 | 0x3dc00274 = 0x3dc05e74
114+
# S = 210180, A = 0x4
115+
# R = ((S + A) & 0xFF8) << 6 = 0x00006000
116+
# 0x00006000 | 0x3dc00274 = 0x3dc06274
116117
# CHECK: Disassembly of section .R_AARCH64_LDST128_ABS_LO12_NC:
117118
# CHECK-EMPTY:
118119
# CHECK: <ldst128>:
119-
# CHECK: 21016c: 3dc05e74 ldr q20, [x19, #368]
120+
# CHECK: 210180: 3dc06674 ldr q20, [x19, #400]
120121
#foo128:
121-
# 210170: 66 6f 6f 00 .word
122+
# CHECK: <foo128>:
123+
# CHECK-NEXT: 210190: 66 6f 6f 00 .word
122124

123125
.section .R_AARCH64_LDST16_ABS_LO12_NC,"ax",@progbits
124126
ldst16:
@@ -135,9 +137,9 @@ foo16:
135137
# CHECK: Disassembly of section .R_AARCH64_LDST16_ABS_LO12_NC:
136138
# CHECK-EMPTY:
137139
# CHECK-NEXT: <ldst16>:
138-
# CHECK-NEXT: 210174: 7d430271 ldr h17, [x19, #384]
139-
# CHECK-NEXT: 210178: 79430261 ldrh w1, [x19, #384]
140-
# CHECK-NEXT: 21017c: 79430662 ldrh w2, [x19, #386]
140+
# CHECK-NEXT: 210194: 7d434271 ldr h17, [x19, #416]
141+
# CHECK-NEXT: 210198: 79434261 ldrh w1, [x19, #416]
142+
# CHECK-NEXT: 21019c: 79434662 ldrh w2, [x19, #418]
141143

142144
.section .R_AARCH64_MOVW_UABS,"ax",@progbits
143145
movz1:

llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,10 @@ class AArch64ELFStreamer : public MCELFStreamer {
325325
LastEMS = EMS_None;
326326

327327
MCELFStreamer::changeSection(Section, Subsection);
328+
329+
// Section alignment of 4 to match GNU Assembler
330+
if (Section->isText())
331+
Section->ensureMinAlignment(Align(4));
328332
}
329333

330334
// Reset state between object emissions

llvm/test/MC/AArch64/align-code.s

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -o %t.o %s
2+
// RUN: llvm-readobj -S --sd %t.o | FileCheck %s
3+
.section sec00, "ax"
4+
.byte 1
5+
.section sec01, "ax"
6+
nop
7+
nop
8+
.section sec02, "ax"
9+
.balign 4
10+
nop
11+
nop
12+
.section sec03, "ax"
13+
.balign 8
14+
nop
15+
nop
16+
.section sec04, "ax"
17+
.byte 0
18+
.section sec05, "aw"
19+
nop
20+
nop
21+
// CHECK: Name: sec00
22+
// CHECK: AddressAlignment: 4
23+
// CHECK: Name: sec01
24+
// CHECK: AddressAlignment: 4
25+
// CHECK: Name: sec02
26+
// CHECK: AddressAlignment: 4
27+
// CHECK: Name: sec03
28+
// CHECK: AddressAlignment: 8
29+
// CHECK: Name: sec04
30+
// CHECK: AddressAlignment: 4
31+
// CHECK: Name: sec05
32+
// CHECK: AddressAlignment: 1

0 commit comments

Comments
 (0)