Skip to content

Commit 980d28d

Browse files
MaskRayMaskRay
committed
ELFObjectWriter: Don't sort local symbols
GNU as does not sort local symbols. This has several advantages: * The .symtab order is roughly the symbol occurrence order. * The closest preceding STT_SECTION symbol is the definition of a local symbol. * The closest preceding STT_FILE symbol is the defining file of a local symbol, if there are multiple default-version .file directives. (Not implemented in MC.)
1 parent ca268ed commit 980d28d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+250
-360
lines changed

‎lld/test/ELF/aarch64-variant_pcs.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
# T5-PCSSYM: Symbol table '.symtab' contains 10 entries:
5050
# T5-PCSSYM: 0 NOTYPE LOCAL DEFAULT [VARIANT_PCS] [[#]] pcs_func_local
5151
# T5-PCSSYM-NEXT: 0 IFUNC LOCAL DEFAULT [VARIANT_PCS] [[#]] pcs_ifunc_local
52-
# T5-PCSSYM-NEXT: 0 NOTYPE LOCAL HIDDEN [VARIANT_PCS] [[#]] pcs_func_global_hidden
52+
# T5-PCSSYM: 0 NOTYPE LOCAL HIDDEN [VARIANT_PCS] [[#]] pcs_func_global_hidden
5353
# T5-PCSSYM-NEXT: 0 IFUNC LOCAL HIDDEN [VARIANT_PCS] [[#]] pcs_ifunc_global_hidden
5454
# T5-PCSSYM: 0 NOTYPE GLOBAL DEFAULT [VARIANT_PCS] [[#]] pcs_func_global_def
5555
# T5-PCSSYM-NEXT: 0 NOTYPE GLOBAL DEFAULT [VARIANT_PCS] UND pcs_func_global_undef

‎lld/test/ELF/cgprofile-bad-clusters.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ H:
5050
I:
5151
.fill 13, 1, 0
5252

53-
# CHECK: Name: B
54-
# CHECK-NEXT: Value: 0x201131
55-
# CHECK: Name: C
56-
# CHECK-NEXT: Value: 0x20112F
5753
# CHECK: Name: D
5854
# CHECK-NEXT: Value: 0x201519
5955
# CHECK: Name: E
6056
# CHECK-NEXT: Value: 0x201130
57+
# CHECK: Name: C
58+
# CHECK-NEXT: Value: 0x20112F
59+
# CHECK: Name: B
60+
# CHECK-NEXT: Value: 0x201131
6161
# CHECK: Name: F
6262
# CHECK-NEXT: Value: 0x201901
6363
# CHECK: Name: G

‎lld/test/ELF/discard-none.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
// CHECK-NEXT: AddressAlignment:
2121
// CHECK-NEXT: EntrySize:
2222
// CHECK-NEXT: SectionData (
23-
// CHECK-NEXT: 0000: 002E4C6D 796F7468 65727661 72002E4C |..Lmyothervar..L|
24-
// CHECK-NEXT: 0010: 6D797661 72005F44 594E414D 494300 |myvar._DYNAMIC.|
23+
// CHECK-NEXT: 0000: 002E4C6D 79766172 002E4C6D 796F7468 |..Lmyvar..Lmyoth|
24+
// CHECK-NEXT: 0010: 65727661 72005F44 594E414D 494300 |ervar._DYNAMIC.|
2525
// CHECK-NEXT: )
2626
// CHECK-NEXT: }
2727

@@ -35,7 +35,7 @@
3535
// CHECK-NEXT: Section: Undefined
3636
// CHECK-NEXT: }
3737
// CHECK-NEXT: Symbol {
38-
// CHECK-NEXT: Name: .Lmyothervar
38+
// CHECK-NEXT: Name: .Lmyvar
3939
// CHECK-NEXT: Value:
4040
// CHECK-NEXT: Size: 0
4141
// CHECK-NEXT: Binding: Local
@@ -44,7 +44,7 @@
4444
// CHECK-NEXT: Section: .text
4545
// CHECK-NEXT: }
4646
// CHECK-NEXT: Symbol {
47-
// CHECK-NEXT: Name: .Lmyvar
47+
// CHECK-NEXT: Name: .Lmyothervar
4848
// CHECK-NEXT: Value:
4949
// CHECK-NEXT: Size: 0
5050
// CHECK-NEXT: Binding: Local

‎lld/test/ELF/emit-relocs-discard-locals.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
## --discard-locals removes unused local symbols which start with ".L"
2828
# DISCARD-LOCALS: 0: {{0+}} 0 NOTYPE LOCAL DEFAULT UND
2929
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} .Lused
30+
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} used
3031
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} unused
3132
# DISCARD-LOCALS-NOGC-NEXT: NOTYPE LOCAL DEFAULT {{.*}} unused_gc
32-
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} used
3333
# DISCARD-LOCALS-NEXT: SECTION LOCAL DEFAULT {{.*}} .text
3434
# DISCARD-LOCALS-NEXT: SECTION LOCAL DEFAULT {{.*}} text
3535
# DISCARD-LOCALS-NOGC-NEXT: SECTION LOCAL DEFAULT {{.*}} gc

‎lld/test/ELF/local.s

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@
2727
// CHECK-NEXT: Section: Undefined
2828
// CHECK-NEXT: }
2929
// CHECK-NEXT: Symbol {
30-
// CHECK-NEXT: Name: .Labs
30+
// CHECK-NEXT: Name: blah
3131
// CHECK-NEXT: Value:
3232
// CHECK-NEXT: Size: 0
3333
// CHECK-NEXT: Binding: Local
3434
// CHECK-NEXT: Type: None
3535
// CHECK-NEXT: Other: 0
36-
// CHECK-NEXT: Section: Absolute
36+
// CHECK-NEXT: Section: .text
3737
// CHECK-NEXT: }
3838
// CHECK-NEXT: Symbol {
39-
// CHECK-NEXT: Name: abs
39+
// CHECK-NEXT: Name: foo
4040
// CHECK-NEXT: Value:
4141
// CHECK-NEXT: Size: 0
4242
// CHECK-NEXT: Binding: Local
4343
// CHECK-NEXT: Type: None
4444
// CHECK-NEXT: Other: 0
45-
// CHECK-NEXT: Section: Absolute
45+
// CHECK-NEXT: Section: .text
4646
// CHECK-NEXT: }
4747
// CHECK-NEXT: Symbol {
48-
// CHECK-NEXT: Name: blah
48+
// CHECK-NEXT: Name: goo
4949
// CHECK-NEXT: Value:
5050
// CHECK-NEXT: Size: 0
5151
// CHECK-NEXT: Binding: Local
@@ -54,22 +54,22 @@
5454
// CHECK-NEXT: Section: .text
5555
// CHECK-NEXT: }
5656
// CHECK-NEXT: Symbol {
57-
// CHECK-NEXT: Name: foo
57+
// CHECK-NEXT: Name: abs
5858
// CHECK-NEXT: Value:
5959
// CHECK-NEXT: Size: 0
6060
// CHECK-NEXT: Binding: Local
6161
// CHECK-NEXT: Type: None
6262
// CHECK-NEXT: Other: 0
63-
// CHECK-NEXT: Section: .text
63+
// CHECK-NEXT: Section: Absolute
6464
// CHECK-NEXT: }
6565
// CHECK-NEXT: Symbol {
66-
// CHECK-NEXT: Name: goo
66+
// CHECK-NEXT: Name: .Labs
6767
// CHECK-NEXT: Value:
6868
// CHECK-NEXT: Size: 0
6969
// CHECK-NEXT: Binding: Local
7070
// CHECK-NEXT: Type: None
7171
// CHECK-NEXT: Other: 0
72-
// CHECK-NEXT: Section: .text
72+
// CHECK-NEXT: Section: Absolute
7373
// CHECK-NEXT: }
7474
// CHECK-NEXT: Symbol {
7575
// CHECK-NEXT: Name: _start

‎lld/test/ELF/merge-string.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ zed:
9494
// CHECK-NEXT: )
9595

9696

97-
// CHECK: Name: bar
98-
// CHECK-NEXT: Value: 0x20E
99-
10097
// CHECK: Name: foo
10198
// CHECK-NEXT: Value: 0x20D
10299

100+
// CHECK: Name: bar
101+
// CHECK-NEXT: Value: 0x20E
102+
103103
// CHECK: Name: zed
104104
// CHECK-NEXT: Value: 0x212
105105
// CHECK-NEXT: Size: 0

‎lld/test/ELF/mips-64-disp.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
# CHECK-NEXT: {{.*}}: addiu $2, $2, -32712
2424

2525
# GOT: Symbol table '.symtab'
26-
# GOT: {{.*}} [[B12:[0-9a-f]+]] {{.*}} b12
2726
# GOT: {{.*}} [[B04:[0-9a-f]+]] {{.*}} b4
28-
# GOT: {{.*}} [[B08:[0-9a-f]+]] {{.*}} b8
2927
# GOT: {{.*}} [[FOO:[0-9a-f]+]] {{.*}} foo
28+
# GOT: {{.*}} [[B08:[0-9a-f]+]] {{.*}} b8
29+
# GOT: {{.*}} [[B12:[0-9a-f]+]] {{.*}} b12
3030

3131
# GOT: Primary GOT:
3232
# GOT-NEXT: Canonical gp value:

‎lld/test/ELF/mips-got-page.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
# RUN: ld.lld --section-start .rodata=0x27FFC -shared -o %t.so %t.o
88
# RUN: llvm-readobj --symbols -A %t.so | FileCheck %s
99

10-
# CHECK: Name: bar
11-
# CHECK-NEXT: Value: 0x28000
12-
# ^ page-address = (0x28000 + 0x8000) & ~0xffff = 0x30000
13-
1410
# CHECK: Name: foo
1511
# CHECK-NEXT: Value: 0x27FFC
1612
# ^ page-address = (0x27ffc + 0x8000) & ~0xffff = 0x20000
1713

14+
# CHECK: Name: bar
15+
# CHECK-NEXT: Value: 0x28000
16+
# ^ page-address = (0x28000 + 0x8000) & ~0xffff = 0x30000
17+
1818
# CHECK: Local entries [
1919
# CHECK-NEXT: Entry {
2020
# CHECK-NEXT: Address:

‎lld/test/ELF/mips-gprel32-relocs.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ v1:
2424
.gpword bar
2525

2626
# CHECK: SYMBOL TABLE:
27-
# CHECK: 00020008 l .text 00000000 bar
2827
# CHECK: 00020004 l .text 00000000 foo
28+
# CHECK: 00020008 l .text 00000000 bar
2929
# CHECK: 00028000 l .got 00000000 .hidden _gp
3030

3131
# CHECK: Contents of section .rodata:

‎lld/test/ELF/ppc64-pcrel-call-to-pcrel.s

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@
2929
# RUN: llvm-objdump -d --no-show-raw-insn --mcpu=pwr10 %t | FileCheck %s
3030

3131
# SYMBOL: 2: 0000000010010000 0 NOTYPE LOCAL DEFAULT 5 callee1_stother0_default
32-
# SYMBOL-NEXT: 3: 0000000010020004 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 6 callee2_stother1_default
33-
# SYMBOL-NEXT: 4: 0000000010010004 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 5 caller1
34-
# SYMBOL-NEXT: 5: 000000001002000c 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 6 caller2
35-
# SYMBOL-NEXT: 6: 0000000010030000 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 7 caller3
36-
# SYMBOL-NEXT: 7: 0000000010040000 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 8 caller4
37-
# SYMBOL-NEXT: 8: 0000000010020000 0 NOTYPE LOCAL DEFAULT 6 func_local
32+
# SYMBOL-NEXT: 3: 0000000010010004 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 5 caller1
33+
# SYMBOL-NEXT: 4: 0000000010020000 0 NOTYPE LOCAL DEFAULT 6 func_local
34+
# SYMBOL-NEXT: 5: 0000000010020004 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 6 callee2_stother1_default
35+
# SYMBOL-NEXT: 6: 000000001002000c 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 6 caller2
36+
# SYMBOL-NEXT: 7: 0000000010030000 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 7 caller3
37+
# SYMBOL-NEXT: 8: 0000000010040000 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 8 caller4
3838
# SYMBOL-NEXT: 9: 0000000010040008 0 NOTYPE LOCAL DEFAULT 9 func_extern
3939
# SYMBOL-NEXT: 10: 000000001004000c 0 NOTYPE LOCAL HIDDEN 9 callee3_stother0_hidden
4040
# SYMBOL-NEXT: 11: 0000000010040010 0 NOTYPE LOCAL HIDDEN [<other: 0x22>] 9 callee4_stother1_hidden
4141

4242
# SYMBOL-GLOBAL: 2: 0000000010010004 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 1 caller1
43-
# SYMBOL-GLOBAL-NEXT: 3: 000000001002000c 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 2 caller2
44-
# SYMBOL-GLOBAL-NEXT: 4: 0000000010020000 0 NOTYPE LOCAL DEFAULT 2 func_local
43+
# SYMBOL-GLOBAL-NEXT: 3: 0000000010020000 0 NOTYPE LOCAL DEFAULT 2 func_local
44+
# SYMBOL-GLOBAL-NEXT: 4: 000000001002000c 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 2 caller2
4545
# SYMBOL-GLOBAL-NEXT: 5: 0000000010010000 0 NOTYPE GLOBAL DEFAULT 1 callee1_stother0_default
4646
# SYMBOL-GLOBAL-NEXT: 6: 0000000010020004 0 NOTYPE GLOBAL DEFAULT [<other: 0x20>] 2 callee2_stother1_default
4747

‎lld/test/ELF/ppc64-pcrel-call-to-toc.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
## When a function without TOC accesses a function using TOC, an r12 setup stub
1919
## is inserted
2020

21-
# SYMBOL: 1: 0000000010020000 0 NOTYPE LOCAL DEFAULT [<other: 0x60>] 2 callee
22-
# SYMBOL-NEXT: 2: 0000000010030000 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 3 caller
23-
# SYMBOL-NEXT: 3: 0000000010010000 0 NOTYPE LOCAL DEFAULT 1 func
21+
# SYMBOL: 1: 0000000010010000 0 NOTYPE LOCAL DEFAULT 1 func
22+
# SYMBOL-NEXT: 2: 0000000010020000 0 NOTYPE LOCAL DEFAULT [<other: 0x60>] 2 callee
23+
# SYMBOL: 4: 0000000010030000 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 3 caller
2424
# SYMBOL: 6: 0000000010030010 16 FUNC LOCAL DEFAULT 3 __gep_setup_callee
2525

2626
# CHECK-LABEL: <func>:

‎lld/test/ELF/ppc64-tls-pcrel-ld.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
# LD-RELOC: 0000000001004168 0000000000000044 R_PPC64_DTPMOD64 0
2323

2424
# LD-SYM: Symbol table '.symtab' contains 11 entries:
25-
# LD-SYM: 5: 0000000000000000 0 TLS LOCAL DEFAULT 13 x
26-
# LD-SYM-NEXT: 6: 0000000000000004 0 TLS LOCAL DEFAULT 13 y
25+
# LD-SYM: 0000000000000000 0 TLS LOCAL DEFAULT 13 x
26+
# LD-SYM: 0000000000000004 0 TLS LOCAL DEFAULT 13 y
2727

2828
# LD-GOT: section '.got':
2929
# LD-GOT-NEXT: 0x01004160 60c10001 00000000 00000000 00000000
@@ -32,8 +32,8 @@
3232
# LDTOLE-RELOC: There are no relocations in this file.
3333

3434
# LDTOLE-SYM: Symbol table '.symtab' contains 9 entries:
35-
# LDTOLE-SYM: 5: 0000000000000000 0 TLS LOCAL DEFAULT 6 x
36-
# LDTOLE-SYM-NEXT: 6: 0000000000000004 0 TLS LOCAL DEFAULT 6 y
35+
# LDTOLE-SYM: 0000000000000000 0 TLS LOCAL DEFAULT 6 x
36+
# LDTOLE-SYM: 0000000000000004 0 TLS LOCAL DEFAULT 6 y
3737

3838
# LDTOLE-GOT: section '.got':
3939
# LDTOLE-GOT-NEXT: 0x01004020 20c00001 00000000

‎lld/test/ELF/ppc64-tls-pcrel-le.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
## when using prefixed instructions like paddi.
1414

1515
# SYMBOL: Symbol table '.symtab' contains 6 entries:
16-
# SYMBOL: 3: 0000000000000000 0 TLS LOCAL DEFAULT 2 x
17-
# SYMBOL-NEXT: 4: 0000000000000004 0 TLS LOCAL DEFAULT 2 y
18-
# SYMBOL-NEXT: 5: 0000000000000008 0 TLS LOCAL DEFAULT 2 z
16+
# SYMBOL: 0000000000000000 0 TLS LOCAL DEFAULT 2 x
17+
# SYMBOL-NEXT: 0000000000000004 0 TLS LOCAL DEFAULT 2 y
18+
# SYMBOL-NEXT: 0000000000000008 0 TLS LOCAL DEFAULT 2 z
1919

2020
# CHECK-LABEL: <LocalExecAddr>:
2121
# CHECK: paddi 3, 13, -28672, 0

‎lld/test/ELF/ppc64-toc-call-to-pcrel-long-jump.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
# SYM: Symbol table '.symtab' contains 9 entries:
1515
# SYM: 1: 0000000010010000 0 NOTYPE LOCAL DEFAULT [<other: 0x20>] 1 callee
16-
# SYM-NEXT: 2: 0000000020020008 0 NOTYPE LOCAL DEFAULT [<other: 0x60>] 3 caller
17-
# SYM-NEXT: 3: 0000000010020008 0 NOTYPE LOCAL DEFAULT 2 caller_close
16+
# SYM-NEXT: 2: 0000000010020008 0 NOTYPE LOCAL DEFAULT 2 caller_close
17+
# SYM-NEXT: 3: 0000000020020008 0 NOTYPE LOCAL DEFAULT [<other: 0x60>] 3 caller
1818
# SYM-NEXT: 4: 0000000520020008 0 NOTYPE LOCAL DEFAULT 4 caller_far
1919
# SYM-NEXT: 5: 0000000520028038 0 NOTYPE LOCAL HIDDEN 6 .TOC.
2020
# SYM-NEXT: 6: 0000000010020020 8 FUNC LOCAL DEFAULT 2 __toc_save_callee

‎lld/test/ELF/relocatable-discard-locals.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
## --discard-locals removes unused local symbols which start with ".L"
1616
# DISCARD-LOCALS: 0: {{0+}} 0 NOTYPE LOCAL DEFAULT UND
1717
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} .Lused
18+
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} used
1819
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} unused
1920
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} unused_gc
20-
# DISCARD-LOCALS-NEXT: NOTYPE LOCAL DEFAULT {{.*}} used
2121
# DISCARD-LOCALS-NEXT: SECTION LOCAL DEFAULT {{.*}} .text
2222
# DISCARD-LOCALS-NEXT: SECTION LOCAL DEFAULT {{.*}} text
2323
# DISCARD-LOCALS-NEXT: SECTION LOCAL DEFAULT {{.*}} gc

‎llvm/lib/MC/ELFObjectWriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ void ELFWriter::computeSymbolTable(
730730
ELF::SHN_ABS, true);
731731

732732
// Symbols are required to be in lexicographic order.
733-
array_pod_sort(LocalSymbolData.begin(), LocalSymbolData.end());
733+
//array_pod_sort(LocalSymbolData.begin(), LocalSymbolData.end());
734734
array_pod_sort(ExternalSymbolData.begin(), ExternalSymbolData.end());
735735

736736
// Set the symbol indices. Local symbols must come before all other

‎llvm/test/MC/AArch64/mapping-across-sections.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
// + .starts_data to have $d at 0
2222

2323

24-
// CHECK: 0000000000000000 l .starts_data 0000000000000000 $d
25-
// CHECK-NEXT: 0000000000000000 l .text 0000000000000000 $x
24+
// CHECK: 0000000000000000 l .text 0000000000000000 $x
2625
// CHECK-NEXT: 0000000000000000 l .wibble 0000000000000000 $x
26+
// CHECK-NEXT: 0000000000000000 l .starts_data 0000000000000000 $d
2727
// CHECK-NOT: ${{[adtx]}}
2828

‎llvm/test/MC/AMDGPU/hsa-gfx10-v3.s

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
// READOBJ: 0000000000000090 {{[0-9a-f]+}}00000005 R_AMDGPU_REL64 0000000000000000 .text + 210
1414

1515
// READOBJ: Symbol table '.symtab' contains {{[0-9]+}} entries:
16-
// READOBJ: {{[0-9]+}}: 0000000000000100 0 FUNC LOCAL PROTECTED 2 complete
17-
// READOBJ: {{[0-9]+}}: 0000000000000040 64 OBJECT LOCAL DEFAULT 3 complete.kd
18-
// READOBJ: {{[0-9]+}}: 0000000000000000 0 FUNC LOCAL PROTECTED 2 minimal
19-
// READOBJ: {{[0-9]+}}: 0000000000000000 64 OBJECT LOCAL DEFAULT 3 minimal.kd
20-
// READOBJ: {{[0-9]+}}: 0000000000000200 0 FUNC LOCAL PROTECTED 2 special_sgpr
21-
// READOBJ: {{[0-9]+}}: 0000000000000080 64 OBJECT LOCAL DEFAULT 3 special_sgpr.kd
16+
// READOBJ: 0000000000000000 0 FUNC LOCAL PROTECTED 2 minimal
17+
// READOBJ-NEXT: 0000000000000100 0 FUNC LOCAL PROTECTED 2 complete
18+
// READOBJ-NEXT: 0000000000000200 0 FUNC LOCAL PROTECTED 2 special_sgpr
19+
// READOBJ-NEXT: 0000000000000000 64 OBJECT LOCAL DEFAULT 3 minimal.kd
20+
// READOBJ-NEXT: 0000000000000040 64 OBJECT LOCAL DEFAULT 3 complete.kd
21+
// READOBJ-NEXT: 0000000000000080 64 OBJECT LOCAL DEFAULT 3 special_sgpr.kd
2222

2323
// OBJDUMP: Contents of section .rodata
2424
// Note, relocation for KERNEL_CODE_ENTRY_BYTE_OFFSET is not resolved here.

‎llvm/test/MC/AMDGPU/hsa-gfx10.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
// Windows and Linux because of carriage return on Windows
1919

2020
// ELF: Symbol {
21-
// ELF: Name: amd_kernel_code_t_minimal
21+
// ELF: Name: amd_kernel_code_t_test_all
2222
// ELF: Type: AMDGPU_HSA_KERNEL (0xA)
2323
// ELF: Section: .text
2424
// ELF: }
2525
// ELF: Symbol {
26-
// ELF: Name: amd_kernel_code_t_test_all
26+
// ELF: Name: amd_kernel_code_t_minimal
2727
// ELF: Type: AMDGPU_HSA_KERNEL (0xA)
2828
// ELF: Section: .text
2929
// ELF: }

‎llvm/test/MC/AMDGPU/hsa-v3.s

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
// READOBJ: 00000000000000d0 {{[0-9a-f]+}}00000005 R_AMDGPU_REL64 0000000000000000 .text + 310
1515

1616
// READOBJ: Symbol table '.symtab' contains {{[0-9]+}} entries:
17-
// READOBJ: {{[0-9]+}}: 0000000000000100 0 FUNC LOCAL PROTECTED 2 complete
18-
// READOBJ: {{[0-9]+}}: 0000000000000040 64 OBJECT LOCAL DEFAULT 3 complete.kd
19-
// READOBJ: {{[0-9]+}}: 0000000000000300 0 FUNC LOCAL PROTECTED 2 disabled_user_sgpr
20-
// READOBJ: {{[0-9]+}}: 00000000000000c0 64 OBJECT LOCAL DEFAULT 3 disabled_user_sgpr.kd
21-
// READOBJ: {{[0-9]+}}: 0000000000000000 0 FUNC LOCAL PROTECTED 2 minimal
22-
// READOBJ: {{[0-9]+}}: 0000000000000000 64 OBJECT LOCAL DEFAULT 3 minimal.kd
23-
// READOBJ: {{[0-9]+}}: 0000000000000200 0 FUNC LOCAL PROTECTED 2 special_sgpr
24-
// READOBJ: {{[0-9]+}}: 0000000000000080 64 OBJECT LOCAL DEFAULT 3 special_sgpr.kd
17+
// READOBJ: 0000000000000000 0 FUNC LOCAL PROTECTED 2 minimal
18+
// READOBJ-NEXT: 0000000000000100 0 FUNC LOCAL PROTECTED 2 complete
19+
// READOBJ-NEXT: 0000000000000200 0 FUNC LOCAL PROTECTED 2 special_sgpr
20+
// READOBJ-NEXT: 0000000000000300 0 FUNC LOCAL PROTECTED 2 disabled_user_sgpr
21+
// READOBJ-NEXT: 0000000000000000 64 OBJECT LOCAL DEFAULT 3 minimal.kd
22+
// READOBJ-NEXT: 0000000000000040 64 OBJECT LOCAL DEFAULT 3 complete.kd
23+
// READOBJ-NEXT: 0000000000000080 64 OBJECT LOCAL DEFAULT 3 special_sgpr.kd
24+
// READOBJ-NEXT: 00000000000000c0 64 OBJECT LOCAL DEFAULT 3 disabled_user_sgpr.kd
2525

2626
// OBJDUMP: Contents of section .rodata
2727
// Note, relocation for KERNEL_CODE_ENTRY_BYTE_OFFSET is not resolved here.

‎llvm/test/MC/AMDGPU/hsa.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
// Windows and Linux because of carriage return on Windows
1919

2020
// ELF: Symbol {
21-
// ELF: Name: amd_kernel_code_t_minimal
21+
// ELF: Name: amd_kernel_code_t_test_all
2222
// ELF: Type: AMDGPU_HSA_KERNEL (0xA)
2323
// ELF: Section: .text
2424
// ELF: }
2525
// ELF: Symbol {
26-
// ELF: Name: amd_kernel_code_t_test_all
26+
// ELF: Name: amd_kernel_code_t_minimal
2727
// ELF: Type: AMDGPU_HSA_KERNEL (0xA)
2828
// ELF: Section: .text
2929
// ELF: }

0 commit comments

Comments
 (0)