Skip to content

Commit 4f7562d

Browse files
committed
[MC][X86] Support .reloc *, BFD_RELOC_{NONE,8,16,32,64}, *
The names are unfortunate, but BFD_RELOC_NONE provides a generic way indicating a dependency between two sections, which is useful for ld --gc-sections. See https://sourceware.org/bugzilla/show_bug.cgi?id=27530
1 parent 56ed64d commit 4f7562d

File tree

3 files changed

+38
-0
lines changed

3 files changed

+38
-0
lines changed

llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,12 +680,21 @@ Optional<MCFixupKind> X86AsmBackend::getFixupKind(StringRef Name) const {
680680
#define ELF_RELOC(X, Y) .Case(#X, Y)
681681
#include "llvm/BinaryFormat/ELFRelocs/x86_64.def"
682682
#undef ELF_RELOC
683+
.Case("BFD_RELOC_NONE", ELF::R_X86_64_NONE)
684+
.Case("BFD_RELOC_8", ELF::R_X86_64_8)
685+
.Case("BFD_RELOC_16", ELF::R_X86_64_16)
686+
.Case("BFD_RELOC_32", ELF::R_X86_64_32)
687+
.Case("BFD_RELOC_64", ELF::R_X86_64_64)
683688
.Default(-1u);
684689
} else {
685690
Type = llvm::StringSwitch<unsigned>(Name)
686691
#define ELF_RELOC(X, Y) .Case(#X, Y)
687692
#include "llvm/BinaryFormat/ELFRelocs/i386.def"
688693
#undef ELF_RELOC
694+
.Case("BFD_RELOC_NONE", ELF::R_386_NONE)
695+
.Case("BFD_RELOC_8", ELF::R_386_8)
696+
.Case("BFD_RELOC_16", ELF::R_386_16)
697+
.Case("BFD_RELOC_32", ELF::R_386_32)
689698
.Default(-1u);
690699
}
691700
if (Type == -1u)

llvm/test/MC/X86/reloc-directive-elf-32.s

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
# PRINT-NEXT: .reloc 0, R_386_32, .data+2
1111
# PRINT-NEXT: .reloc 0, R_386_IRELATIVE, foo+3
1212
# PRINT-NEXT: .reloc 0, R_386_GOT32X, 5
13+
# PRINT-NEXT: .reloc 0, BFD_RELOC_NONE, 9
14+
# PRINT-NEXT: .reloc 0, BFD_RELOC_8, 9
15+
# PRINT-NEXT: .reloc 0, BFD_RELOC_16, 9
16+
# PRINT-NEXT: .reloc 0, BFD_RELOC_32, 9
1317

1418
# X86 relocations use the Elf32_Rel format. Addends are neither stored in the
1519
# relocation entries nor applied in the referenced locations.
@@ -19,6 +23,10 @@
1923
# CHECK-NEXT: 0x0 R_386_32 .data
2024
# CHECK-NEXT: 0x0 R_386_IRELATIVE foo
2125
# CHECK-NEXT: 0x0 R_386_GOT32X -
26+
# CHECK-NEXT: 0x0 R_386_NONE -
27+
# CHECK-NEXT: 0x0 R_386_8 -
28+
# CHECK-NEXT: 0x0 R_386_16 -
29+
# CHECK-NEXT: 0x0 R_386_32 -
2230

2331
# HEX: 0x00000000 00000000 00000000
2432

@@ -33,6 +41,11 @@
3341
.reloc 0, R_386_IRELATIVE, foo+3
3442
.reloc 0, R_386_GOT32X, 5
3543

44+
.reloc 0, BFD_RELOC_NONE, 9
45+
.reloc 0, BFD_RELOC_8, 9
46+
.reloc 0, BFD_RELOC_16, 9
47+
.reloc 0, BFD_RELOC_32, 9
48+
3649
.data
3750
.globl foo
3851
foo:

llvm/test/MC/X86/reloc-directive-elf-64.s

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,23 @@
99
# PRINT-NEXT: .reloc 0, R_X86_64_64, .data+2
1010
# PRINT-NEXT: .reloc 0, R_X86_64_GOTPCRELX, foo+3
1111
# PRINT-NEXT: .reloc 0, R_X86_64_REX_GOTPCRELX, 5
12+
# PRINT-NEXT: .reloc 0, BFD_RELOC_NONE, 9
13+
# PRINT-NEXT: .reloc 0, BFD_RELOC_8, 9
14+
# PRINT-NEXT: .reloc 0, BFD_RELOC_16, 9
15+
# PRINT-NEXT: .reloc 0, BFD_RELOC_32, 9
16+
# PRINT-NEXT: .reloc 0, BFD_RELOC_64, 9
1217

1318
# CHECK: 0x2 R_X86_64_NONE .data 0x0
1419
# CHECK-NEXT: 0x1 R_X86_64_NONE foo 0x4
1520
# CHECK-NEXT: 0x0 R_X86_64_NONE - 0x8
1621
# CHECK-NEXT: 0x0 R_X86_64_64 .data 0x2
1722
# CHECK-NEXT: 0x0 R_X86_64_GOTPCRELX foo 0x3
1823
# CHECK-NEXT: 0x0 R_X86_64_REX_GOTPCRELX - 0x5
24+
# CHECK-NEXT: 0x0 R_X86_64_NONE - 0x9
25+
# CHECK-NEXT: 0x0 R_X86_64_8 - 0x9
26+
# CHECK-NEXT: 0x0 R_X86_64_16 - 0x9
27+
# CHECK-NEXT: 0x0 R_X86_64_32 - 0x9
28+
# CHECK-NEXT: 0x0 R_X86_64_64 - 0x9
1929

2030
.text
2131
ret
@@ -28,6 +38,12 @@
2838
.reloc 0, R_X86_64_GOTPCRELX, foo+3
2939
.reloc 0, R_X86_64_REX_GOTPCRELX, 5
3040

41+
.reloc 0, BFD_RELOC_NONE, 9
42+
.reloc 0, BFD_RELOC_8, 9
43+
.reloc 0, BFD_RELOC_16, 9
44+
.reloc 0, BFD_RELOC_32, 9
45+
.reloc 0, BFD_RELOC_64, 9
46+
3147
.data
3248
.globl foo
3349
foo:

0 commit comments

Comments
 (0)