Skip to content

[SPARC][MC] Fix %gdop_hix22() and %gdop_lox10() to use correct relocations #137915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2025
Merged

[SPARC][MC] Fix %gdop_hix22() and %gdop_lox10() to use correct relocations #137915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ static unsigned adjustFixupValue(unsigned Kind, uint64_t Value) {

case Sparc::fixup_sparc_hm:
return (Value >> 32) & 0x3ff;

case Sparc::fixup_sparc_gotdata_lox10:
case Sparc::fixup_sparc_gotdata_hix22:
case Sparc::fixup_sparc_gotdata_op:
return 0;
}
}

Expand Down Expand Up @@ -137,6 +132,7 @@ namespace {
}

MCFixupKindInfo getFixupKindInfo(MCFixupKind Kind) const override {
// clang-format off
const static MCFixupKindInfo InfosBE[Sparc::NumTargetFixupKinds] = {
// name offset bits flags
{ "fixup_sparc_call30", 2, 30, MCFixupKindInfo::FKF_IsPCRel },
Expand All @@ -157,9 +153,6 @@ namespace {
{ "fixup_sparc_wplt30", 2, 30, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_sparc_hix22", 10, 22, 0 },
{ "fixup_sparc_lox10", 19, 13, 0 },
{ "fixup_sparc_gotdata_hix22", 0, 0, 0 },
{ "fixup_sparc_gotdata_lox10", 0, 0, 0 },
{ "fixup_sparc_gotdata_op", 0, 0, 0 },
};

const static MCFixupKindInfo InfosLE[Sparc::NumTargetFixupKinds] = {
Expand All @@ -182,10 +175,8 @@ namespace {
{ "fixup_sparc_wplt30", 0, 30, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_sparc_hix22", 0, 22, 0 },
{ "fixup_sparc_lox10", 0, 13, 0 },
{ "fixup_sparc_gotdata_hix22", 0, 0, 0 },
{ "fixup_sparc_gotdata_lox10", 0, 0, 0 },
{ "fixup_sparc_gotdata_op", 0, 0, 0 },
};
// clang-format on

// Fixup kinds from .reloc directive are like R_SPARC_NONE. They do
// not require any extra processing.
Expand Down
5 changes: 2 additions & 3 deletions llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ unsigned SparcELFObjectWriter::getRelocType(MCContext &Ctx,
}
}

// clang-format off
switch(Fixup.getTargetKind()) {
default:
llvm_unreachable("Unimplemented fixup -> relocation");
Expand Down Expand Up @@ -127,10 +128,8 @@ unsigned SparcELFObjectWriter::getRelocType(MCContext &Ctx,
case Sparc::fixup_sparc_lm: return ELF::R_SPARC_LM22;
case Sparc::fixup_sparc_hix22: return ELF::R_SPARC_HIX22;
case Sparc::fixup_sparc_lox10: return ELF::R_SPARC_LOX10;
case Sparc::fixup_sparc_gotdata_hix22: return ELF::R_SPARC_GOTDATA_HIX22;
case Sparc::fixup_sparc_gotdata_lox10: return ELF::R_SPARC_GOTDATA_LOX10;
case Sparc::fixup_sparc_gotdata_op: return ELF::R_SPARC_GOTDATA_OP;
}
// clang-format on

return ELF::R_SPARC_NONE;
}
Expand Down
9 changes: 2 additions & 7 deletions llvm/lib/Target/Sparc/MCTargetDesc/SparcFixupKinds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace llvm {
namespace Sparc {
// clang-format off
enum Fixups {
// fixup_sparc_call30 - 30-bit PC relative relocation for call
fixup_sparc_call30 = FirstTargetFixupKind,
Expand Down Expand Up @@ -70,17 +71,11 @@ namespace llvm {
/// 13-bit fixup corresponding to %lox(foo)
fixup_sparc_lox10,

/// 22-bit fixup corresponding to %gdop_hix22(foo)
fixup_sparc_gotdata_hix22,
/// 13-bit fixup corresponding to %gdop_lox10(foo)
fixup_sparc_gotdata_lox10,
/// 32-bit fixup corresponding to %gdop(foo)
fixup_sparc_gotdata_op,

// Marker
LastTargetFixupKind,
NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind
};
// clang-format on
}
}

Expand Down
16 changes: 8 additions & 8 deletions llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ StringRef SparcMCExpr::getSpecifierName(SparcMCExpr::Specifier S) {
case VK_TLS_LE_LOX10: return "tle_lox10";
case VK_HIX22: return "hix";
case VK_LOX10: return "lox";
case VK_GOTDATA_HIX22: return "gdop_hix22";
case VK_GOTDATA_LOX10: return "gdop_lox10";
case VK_GOTDATA_OP: return "gdop";
case VK_GOTDATA_OP_HIX22: return "gdop_hix22";
case VK_GOTDATA_OP_LOX10: return "gdop_lox10";
case VK_GOTDATA_OP: return "gdop";
}
// clang-format on
llvm_unreachable("Unhandled SparcMCExpr::Specifier");
Expand Down Expand Up @@ -126,8 +126,8 @@ SparcMCExpr::Specifier SparcMCExpr::parseSpecifier(StringRef name) {
.Case("tle_lox10", VK_TLS_LE_LOX10)
.Case("hix", VK_HIX22)
.Case("lox", VK_LOX10)
.Case("gdop_hix22", VK_GOTDATA_HIX22)
.Case("gdop_lox10", VK_GOTDATA_LOX10)
.Case("gdop_hix22", VK_GOTDATA_OP_HIX22)
.Case("gdop_lox10", VK_GOTDATA_OP_LOX10)
.Case("gdop", VK_GOTDATA_OP)
.Default(VK_None);
}
Expand Down Expand Up @@ -172,9 +172,9 @@ uint16_t SparcMCExpr::getFixupKind() const {
case VK_TLS_LE_LOX10: return ELF::R_SPARC_TLS_LE_LOX10;
case VK_HIX22: return Sparc::fixup_sparc_hix22;
case VK_LOX10: return Sparc::fixup_sparc_lox10;
case VK_GOTDATA_HIX22: return Sparc::fixup_sparc_gotdata_hix22;
case VK_GOTDATA_LOX10: return Sparc::fixup_sparc_gotdata_lox10;
case VK_GOTDATA_OP: return Sparc::fixup_sparc_gotdata_op;
case VK_GOTDATA_OP_HIX22: return ELF::R_SPARC_GOTDATA_OP_HIX22;
case VK_GOTDATA_OP_LOX10: return ELF::R_SPARC_GOTDATA_OP_LOX10;
case VK_GOTDATA_OP: return ELF::R_SPARC_GOTDATA_OP;
}
// clang-format on
}
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class SparcMCExpr : public MCTargetExpr {
VK_TLS_LE_LOX10,
VK_HIX22,
VK_LOX10,
VK_GOTDATA_HIX22,
VK_GOTDATA_LOX10,
VK_GOTDATA_OP_HIX22,
VK_GOTDATA_OP_LOX10,
VK_GOTDATA_OP,
};

Expand Down
4 changes: 2 additions & 2 deletions llvm/test/MC/Sparc/relocation-specifier.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ sethi %lm(sym), %l0
# ASM-NEXT: ldx [%l7+%l1], %l2, %gdop(sym)
# OBJDUMP: R_SPARC_HIX22 sym
# OBJDUMP: R_SPARC_LOX10 sym
# OBJDUMP: R_SPARC_GOTDATA_HIX22 sym
# OBJDUMP: R_SPARC_GOTDATA_LOX10 sym
# OBJDUMP: R_SPARC_GOTDATA_OP_HIX22 sym
# OBJDUMP: R_SPARC_GOTDATA_OP_LOX10 sym
# OBJDUMP: R_SPARC_GOTDATA_OP sym
sethi %hix(sym), %g1
xor %g1, %lox(sym), %g1
Expand Down
Loading