Skip to content

Commit 802dce7

Browse files
committed
Address review comments
1 parent 0c753f7 commit 802dce7

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
@@ -79,7 +79,7 @@ _start:
7979

8080
#--- ok-tiny.s
8181

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

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

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

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

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

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

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

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

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

132126
# LOCAL-TINY-ASM: <_start>:
133-
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20320
134-
# LOCAL-TINY-ASM-NEXT: ldr x1, [x0]
135-
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20320
136-
# LOCAL-TINY-ASM-NEXT: ldr x1, 0x20320
137-
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20328
138-
# LOCAL-TINY-ASM-NEXT: ldr x1, [x0]
139-
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20328
140-
# LOCAL-TINY-ASM-NEXT: ldr x1, 0x20328
127+
# LOCAL-TINY-ASM-NEXT: adr x0, 0x20308
128+
# LOCAL-TINY-ASM-NEXT: ldr x1, 0x20310
141129

142130
.globl _start
143131
_start:
144132
adr x0, :got_auth:bar
145-
ldr x1, [x0]
146-
adr x0, :got_auth:bar
147-
ldr x1, :got_auth:bar
148-
adr x0, :got_auth:zed
149-
ldr x1, [x0]
150-
adr x0, :got_auth:zed
151133
ldr x1, :got_auth:zed
152134

153135
#--- err.s

0 commit comments

Comments
 (0)