Commit fdb65785 authored by luxufan's avatar luxufan
Browse files

Revert "[JITLink] Add anonymous symbols in LinkGraph for unnamed temporary symbols"

This reverts commit de872382.

Buildbot check error
parent de872382
...@@ -79,12 +79,6 @@ enum EdgeKind_riscv : Edge::Kind { ...@@ -79,12 +79,6 @@ enum EdgeKind_riscv : Edge::Kind {
/// Fixup <- (Target - Fixup + Addend) /// Fixup <- (Target - Fixup + Addend)
R_RISCV_CALL, R_RISCV_CALL,
/// 32 bits PC relative relocation
///
/// Fixup expression:
/// Fixup <- (Target - Fixup + Addend)
R_RISCV_32_PCREL,
/// PC relative GOT offset /// PC relative GOT offset
/// ///
/// Fixup expression: /// Fixup expression:
...@@ -143,7 +137,7 @@ enum EdgeKind_riscv : Edge::Kind { ...@@ -143,7 +137,7 @@ enum EdgeKind_riscv : Edge::Kind {
/// ///
/// Fixup expression /// Fixup expression
/// Fixup <- (Target - *{1}Fixup - Addend) /// Fixup <- (Target - *{1}Fixup - Addend)
R_RISCV_SUB8, R_RISCV_SUB8
}; };
/// Returns a string name for the given riscv edge. For debugging purposes /// Returns a string name for the given riscv edge. For debugging purposes
......
...@@ -441,15 +441,11 @@ template <typename ELFT> Error ELFLinkGraphBuilder<ELFT>::graphifySymbols() { ...@@ -441,15 +441,11 @@ template <typename ELFT> Error ELFLinkGraphBuilder<ELFT>::graphifySymbols() {
<< "\"\n"; << "\"\n";
}); });
// In RISCV, temporary symbols (Used to generate dwarf, eh_frame // Model the section symbols as anonymous symbol.
// sections...) will appear in object code's symbol table, and LLVM does
// not use names on these temporary symbols (RISCV gnu toolchain uses
// names on these temporary symbols). If the symbol is unnamed, add an
// anonymous symbol.
auto &GSym = auto &GSym =
Name->empty() Sym.getType() == ELF::STT_SECTION
? G->addAnonymousSymbol(*B, Sym.getValue(), Sym.st_size, ? G->addAnonymousSymbol(*B, Sym.getValue(), Sym.st_size, false,
false, false) false)
: G->addDefinedSymbol(*B, Sym.getValue(), *Name, Sym.st_size, L, : G->addDefinedSymbol(*B, Sym.getValue(), *Name, Sym.st_size, L,
S, Sym.getType() == ELF::STT_FUNC, false); S, Sym.getType() == ELF::STT_FUNC, false);
setGraphSymbol(SymIndex, GSym); setGraphSymbol(SymIndex, GSym);
......
...@@ -359,12 +359,6 @@ private: ...@@ -359,12 +359,6 @@ private:
*FixupPtr = static_cast<uint8_t>(Value); *FixupPtr = static_cast<uint8_t>(Value);
break; break;
} }
case R_RISCV_32_PCREL: {
// FIXME: It seems that R_RISCV_32_PCREL relocation will only appear in debug sections
// like eh_frame section. Currently, because of eh_frame will not be processed in JITLink's RISCV
// backend, test this relocation is difficult, so here report error if needs to fixup this relocation
return make_error<JITLinkError>("Fixup of relocation type R_RISCV_32_PCREL is not supportted");
}
} }
return Error::success(); return Error::success();
} }
...@@ -415,8 +409,6 @@ private: ...@@ -415,8 +409,6 @@ private:
return EdgeKind_riscv::R_RISCV_SUB16; return EdgeKind_riscv::R_RISCV_SUB16;
case ELF::R_RISCV_SUB8: case ELF::R_RISCV_SUB8:
return EdgeKind_riscv::R_RISCV_SUB8; return EdgeKind_riscv::R_RISCV_SUB8;
case ELF::R_RISCV_32_PCREL:
return EdgeKind_riscv::R_RISCV_32_PCREL;
} }
return make_error<JITLinkError>("Unsupported riscv relocation:" + return make_error<JITLinkError>("Unsupported riscv relocation:" +
......
...@@ -38,8 +38,6 @@ const char *getEdgeKindName(Edge::Kind K) { ...@@ -38,8 +38,6 @@ const char *getEdgeKindName(Edge::Kind K) {
return "R_RISCV_PCREL_LO12_S"; return "R_RISCV_PCREL_LO12_S";
case R_RISCV_CALL: case R_RISCV_CALL:
return "R_RISCV_CALL"; return "R_RISCV_CALL";
case R_RISCV_32_PCREL:
return "R_RISCV_32_PCREL";
case R_RISCV_ADD64: case R_RISCV_ADD64:
return "R_RISCV_ADD64"; return "R_RISCV_ADD64";
case R_RISCV_ADD32: case R_RISCV_ADD32:
......
# RUN: llvm-mc -triple=riscv64 -filetype=obj -o %t %s
# RUN: llvm-jitlink -debug-only=jitlink -noexec %t 2>&1 | FileCheck %s
#
# Because of the exist of cfi directive, sections like eh_frame section will be emitted
# in llvm's object code emission phase. Anonymous symbols will also be emitted to indicate
# the section start and section end. So that by relocating these symbol, the section length
# can be calculated.
#
# CHECK: Creating defined graph symbol for ELF symbol ""
# CHECK: Creating defined graph symbol for ELF symbol ""
.text
.globl main
.p2align 2
.type main,@function
main:
.cfi_startproc
ret
.Lfunc_end0:
.size main, .Lfunc_end0-main
.cfi_endproc
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment