Skip to content

Commit 82a5205

Browse files
committed
Address review comments
1 parent 262e2f9 commit 82a5205

File tree

1 file changed

+13
-31
lines changed

1 file changed

+13
-31
lines changed

lld/test/ELF/aarch64-got-relocations-pauth.s

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ _start:
8080

8181
#--- ok-tiny.s
8282

83-
# RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux ok-tiny.s -o ok-tiny.o
83+
# RUN: llvm-mc -filetype=obj -triple=aarch64 ok-tiny.s -o ok-tiny.o
8484

8585
# RUN: ld.lld ok-tiny.o a.so -pie -o external-tiny
8686
# RUN: llvm-readelf -r -S -x .got external-tiny | FileCheck %s --check-prefix=EXTERNAL-TINY
@@ -89,28 +89,28 @@ _start:
8989
# RUN: llvm-readelf -r -S -x .got -s local-tiny | FileCheck %s --check-prefix=LOCAL-TINY
9090

9191
# EXTERNAL-TINY: Offset Info Type Symbol's Value Symbol's Name + Addend
92-
# EXTERNAL-TINY-NEXT: 0000000000020380 000000010000e201 R_AARCH64_AUTH_GLOB_DAT 0000000000000000 bar + 0
93-
# EXTERNAL-TINY-NEXT: 0000000000020388 000000020000e201 R_AARCH64_AUTH_GLOB_DAT 0000000000000000 zed + 0
92+
# EXTERNAL-TINY-NEXT: 0000000000020368 000000010000e201 R_AARCH64_AUTH_GLOB_DAT 0000000000000000 bar + 0
93+
# EXTERNAL-TINY-NEXT: 0000000000020370 000000020000e201 R_AARCH64_AUTH_GLOB_DAT 0000000000000000 zed + 0
9494

9595
## Symbol's values for bar and zed are equal since they contain no content (see Inputs/shared.s)
9696
# LOCAL-TINY: Offset Info Type Symbol's Value Symbol's Name + Addend
97-
# LOCAL-TINY-NEXT: 0000000000020320 0000000000000411 R_AARCH64_AUTH_RELATIVE 10260
98-
# LOCAL-TINY-NEXT: 0000000000020328 0000000000000411 R_AARCH64_AUTH_RELATIVE 10260
97+
# LOCAL-TINY-NEXT: 0000000000020308 0000000000000411 R_AARCH64_AUTH_RELATIVE 10248
98+
# LOCAL-TINY-NEXT: 0000000000020310 0000000000000411 R_AARCH64_AUTH_RELATIVE 10248
9999

100100
# EXTERNAL-TINY: Hex dump of section '.got':
101-
# EXTERNAL-TINY-NEXT: 0x00020380 00000000 00000080 00000000 000000a0
101+
# EXTERNAL-TINY-NEXT: 0x00020368 00000000 00000080 00000000 000000a0
102102
## ^^
103103
## 0b10000000 bit 63 address diversity = true, bits 61..60 key = IA
104104
## ^^
105105
## 0b10100000 bit 63 address diversity = true, bits 61..60 key = DA
106106

107107
# LOCAL-TINY: Symbol table '.symtab' contains {{.*}} entries:
108108
# LOCAL-TINY: Num: Value Size Type Bind Vis Ndx Name
109-
# LOCAL-TINY: 0000000000010260 0 FUNC GLOBAL DEFAULT 6 bar
110-
# LOCAL-TINY: 0000000000010260 0 NOTYPE GLOBAL DEFAULT 6 zed
109+
# LOCAL-TINY: 0000000000010248 0 FUNC GLOBAL DEFAULT 6 bar
110+
# LOCAL-TINY: 0000000000010248 0 NOTYPE GLOBAL DEFAULT 6 zed
111111

112112
# LOCAL-TINY: Hex dump of section '.got':
113-
# LOCAL-TINY-NEXT: 0x00020320 00000000 00000080 00000000 000000a0
113+
# LOCAL-TINY-NEXT: 0x00020308 00000000 00000080 00000000 000000a0
114114
## ^^
115115
## 0b10000000 bit 63 address diversity = true, bits 61..60 key = IA
116116
## ^^
@@ -119,36 +119,18 @@ _start:
119119
# RUN: llvm-objdump -d external-tiny | FileCheck %s --check-prefix=EXTERNAL-TINY-ASM
120120

121121
# EXTERNAL-TINY-ASM: <_start>:
122-
# EXTERNAL-TINY-ASM-NEXT: adr x0, 0x20380
123-
# EXTERNAL-TINY-ASM-NEXT: ldr x1, [x0]
124-
# EXTERNAL-TINY-ASM-NEXT: adr x0, 0x20380
125-
# EXTERNAL-TINY-ASM-NEXT: ldr x1, 0x20380
126-
# EXTERNAL-TINY-ASM-NEXT: adr x0, 0x20388
127-
# EXTERNAL-TINY-ASM-NEXT: ldr x1, [x0]
128-
# EXTERNAL-TINY-ASM-NEXT: adr x0, 0x20388
129-
# EXTERNAL-TINY-ASM-NEXT: ldr x1, 0x20388
122+
# EXTERNAL-TINY-ASM-NEXT: adr x0, 0x20368
123+
# EXTERNAL-TINY-ASM-NEXT: ldr x1, 0x20370
130124

131125
# RUN: llvm-objdump -d local-tiny | FileCheck %s --check-prefix=LOCAL-TINY-ASM
132126

133127
# LOCAL-TINY-ASM: <_start>:
134-
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20320
135-
# LOCAL-TINY-ASM-NEXT: ldr x1, [x0]
136-
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20320
137-
# LOCAL-TINY-ASM-NEXT: ldr x1, 0x20320
138-
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20328
139-
# LOCAL-TINY-ASM-NEXT: ldr x1, [x0]
140-
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20328
141-
# LOCAL-TINY-ASM-NEXT: ldr x1, 0x20328
128+
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20308
129+
# LOCAL-TINY-ASM-NEXT: ldr x1, 0x20310
142130

143131
.globl _start
144132
_start:
145133
adr x0, :got_auth:bar
146-
ldr x1, [x0]
147-
adr x0, :got_auth:bar
148-
ldr x1, :got_auth:bar
149-
adr x0, :got_auth:zed
150-
ldr x1, [x0]
151-
adr x0, :got_auth:zed
152134
ldr x1, :got_auth:zed
153135

154136
#--- err.s

0 commit comments

Comments
 (0)