Skip to content

Commit a331937

Browse files
MaskRayMaskRay
committed
[MC] Move CompressDebugSections/RelaxELFRelocations from TargetOptions/MCAsmInfo to MCTargetOptions
The convention is for such MC-specific options to reside in MCTargetOptions. However, CompressDebugSections/RelaxELFRelocations do not follow the convention: `CompressDebugSections` is defined in both TargetOptions and MCAsmInfo and there is forwarding complexity. Move the option to MCTargetOptions and hereby simplify the code. Rename the misleading RelaxELFRelocations to X86RelaxRelocations. llvm-mc -relax-relocations and llc -x86-relax-relocations can now be unified.
1 parent 886ecb3 commit a331937

25 files changed

+61
-83
lines changed

‎clang/lib/CodeGen/BackendUtil.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,6 @@ static bool initTargetOptions(DiagnosticsEngine &Diags,
356356
llvm::TargetMachine::parseBinutilsVersion(CodeGenOpts.BinutilsVersion);
357357
Options.UseInitArray = CodeGenOpts.UseInitArray;
358358
Options.DisableIntegratedAS = CodeGenOpts.DisableIntegratedAS;
359-
Options.CompressDebugSections = CodeGenOpts.getCompressDebugSections();
360-
Options.RelaxELFRelocations = CodeGenOpts.RelaxELFRelocations;
361359

362360
// Set EABI version.
363361
Options.EABIVersion = TargetOpts.EABIVersion;
@@ -460,6 +458,9 @@ static bool initTargetOptions(DiagnosticsEngine &Diags,
460458
Options.MCOptions.AsmVerbose = CodeGenOpts.AsmVerbose;
461459
Options.MCOptions.Dwarf64 = CodeGenOpts.Dwarf64;
462460
Options.MCOptions.PreserveAsmComments = CodeGenOpts.PreserveAsmComments;
461+
Options.MCOptions.X86RelaxRelocations = CodeGenOpts.RelaxELFRelocations;
462+
Options.MCOptions.CompressDebugSections =
463+
CodeGenOpts.getCompressDebugSections();
463464
Options.MCOptions.ABIName = TargetOpts.ABI;
464465
for (const auto &Entry : HSOpts.UserEntries)
465466
if (!Entry.IsFramework &&

‎clang/tools/driver/cc1as_main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,8 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
428428
MCTargetOptions MCOptions;
429429
MCOptions.EmitDwarfUnwind = Opts.EmitDwarfUnwind;
430430
MCOptions.EmitCompactUnwindNonCanonical = Opts.EmitCompactUnwindNonCanonical;
431+
MCOptions.X86RelaxRelocations = Opts.RelaxELFRelocations;
432+
MCOptions.CompressDebugSections = Opts.CompressDebugSections;
431433
MCOptions.AsSecureLogFile = Opts.AsSecureLogFile;
432434

433435
std::unique_ptr<MCAsmInfo> MAI(
@@ -436,9 +438,7 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts,
436438

437439
// Ensure MCAsmInfo initialization occurs before any use, otherwise sections
438440
// may be created with a combination of default and explicit settings.
439-
MAI->setCompressDebugSections(Opts.CompressDebugSections);
440441

441-
MAI->setRelaxELFRelocations(Opts.RelaxELFRelocations);
442442

443443
bool IsBinary = Opts.OutputType == AssemblerInvocation::FT_Obj;
444444
if (Opts.OutputPath.empty())

‎lld/test/ELF/weak-undef-got-pie.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# REQUIRES: x86
22
# RUN: llvm-mc -filetype=obj -triple=x86_64 %p/Inputs/dummy-shared.s -o %t1.o
33
# RUN: ld.lld %t1.o -shared -o %t1.so
4-
# RUN: llvm-mc -filetype=obj -relax-relocations=false -triple=x86_64 %s -o %t.o
4+
# RUN: llvm-mc -filetype=obj -x86-relax-relocations=false -triple=x86_64 %s -o %t.o
55

66
# RUN: ld.lld -pie %t.o %t1.so -o %t
77
# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOCS %s

‎llvm/include/llvm/CodeGen/CommandFlags.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ bool getUseCtors();
9898

9999
bool getDisableIntegratedAS();
100100

101-
bool getRelaxELFRelocations();
102-
103101
bool getDataSections();
104102
std::optional<bool> getExplicitDataSections();
105103

‎llvm/include/llvm/MC/MCAsmInfo.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -524,17 +524,10 @@ class MCAsmInfo {
524524
/// Preserve Comments in assembly
525525
bool PreserveAsmComments;
526526

527-
/// Compress DWARF debug sections. Defaults to no compression.
528-
DebugCompressionType CompressDebugSections = DebugCompressionType::None;
529-
530527
/// True if the integrated assembler should interpret 'a >> b' constant
531528
/// expressions as logical rather than arithmetic.
532529
bool UseLogicalShr = true;
533530

534-
// If true, emit GOTPCRELX/REX_GOTPCRELX instead of GOTPCREL, on
535-
// X86_64 ELF.
536-
bool RelaxELFRelocations = true;
537-
538531
// If true, then the lexer and expression parser will support %neg(),
539532
// %hi(), and similar unary operators.
540533
bool HasMipsExpressions = false;
@@ -875,18 +868,9 @@ class MCAsmInfo {
875868
PreserveAsmComments = Value;
876869
}
877870

878-
DebugCompressionType compressDebugSections() const {
879-
return CompressDebugSections;
880-
}
881-
882-
void setCompressDebugSections(DebugCompressionType CompressDebugSections) {
883-
this->CompressDebugSections = CompressDebugSections;
884-
}
885871

886872
bool shouldUseLogicalShr() const { return UseLogicalShr; }
887873

888-
bool canRelaxRelocations() const { return RelaxELFRelocations; }
889-
void setRelaxELFRelocations(bool V) { RelaxELFRelocations = V; }
890874
bool hasMipsExpressions() const { return HasMipsExpressions; }
891875
bool needsFunctionDescriptors() const { return NeedsFunctionDescriptors; }
892876
bool shouldUseMotorolaIntegers() const { return UseMotorolaIntegers; }

‎llvm/include/llvm/MC/MCContext.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,8 @@ class MCContext {
451451

452452
const MCSubtargetInfo *getSubtargetInfo() const { return MSTI; }
453453

454+
const MCTargetOptions *getTargetOptions() const { return TargetOptions; }
455+
454456
CodeViewContext &getCVContext();
455457

456458
void setAllowTemporaryLabels(bool Value) { AllowTemporaryLabels = Value; }

‎llvm/include/llvm/MC/MCTargetOptions.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ class MCTargetOptions {
6161

6262
bool Dwarf64 : 1;
6363

64+
// If true, prefer R_X86_64_[REX_]GOTPCRELX to R_X86_64_GOTPCREL on x86-64
65+
// ELF.
66+
bool X86RelaxRelocations = true;
67+
6468
EmitDwarfUnwindType EmitDwarfUnwind;
6569

6670
int DwarfVersion = 0;
@@ -76,6 +80,9 @@ class MCTargetOptions {
7680
};
7781
DwarfDirectory MCUseDwarfDirectory;
7882

83+
// Whether to compress DWARF debug sections.
84+
DebugCompressionType CompressDebugSections = DebugCompressionType::None;
85+
7986
std::string ABIName;
8087
std::string AssemblyLanguage;
8188
std::string SplitDwarfFile;

‎llvm/include/llvm/MC/MCTargetOptionsCommandFlags.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ bool getNoDeprecatedWarn();
4949

5050
bool getNoTypeCheck();
5151

52+
bool getX86RelaxRelocations();
53+
5254
std::string getABIName();
5355

5456
std::string getAsSecureLogFile();

‎llvm/include/llvm/Target/TargetOptions.h

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,18 @@ namespace llvm {
141141
HonorSignDependentRoundingFPMathOption(false), NoZerosInBSS(false),
142142
GuaranteedTailCallOpt(false), StackSymbolOrdering(true),
143143
EnableFastISel(false), EnableGlobalISel(false), UseInitArray(false),
144-
DisableIntegratedAS(false), RelaxELFRelocations(true),
145-
FunctionSections(false), DataSections(false),
146-
IgnoreXCOFFVisibility(false), XCOFFTracebackTable(true),
147-
UniqueSectionNames(true), UniqueBasicBlockSectionNames(false),
148-
TrapUnreachable(false), NoTrapAfterNoreturn(false), TLSSize(0),
149-
EmulatedTLS(false), EnableTLSDESC(false), EnableIPRA(false),
150-
EmitStackSizeSection(false), EnableMachineOutliner(false),
151-
EnableMachineFunctionSplitter(false), SupportsDefaultOutlining(false),
152-
EmitAddrsig(false), BBAddrMap(false), EmitCallSiteInfo(false),
153-
SupportsDebugEntryValues(false), EnableDebugEntryValues(false),
154-
ValueTrackingVariableLocations(false), ForceDwarfFrameSection(false),
155-
XRayFunctionIndex(true), DebugStrictDwarf(false), Hotpatch(false),
144+
DisableIntegratedAS(false), FunctionSections(false),
145+
DataSections(false), IgnoreXCOFFVisibility(false),
146+
XCOFFTracebackTable(true), UniqueSectionNames(true),
147+
UniqueBasicBlockSectionNames(false), TrapUnreachable(false),
148+
NoTrapAfterNoreturn(false), TLSSize(0), EmulatedTLS(false),
149+
EnableTLSDESC(false), EnableIPRA(false), EmitStackSizeSection(false),
150+
EnableMachineOutliner(false), EnableMachineFunctionSplitter(false),
151+
SupportsDefaultOutlining(false), EmitAddrsig(false), BBAddrMap(false),
152+
EmitCallSiteInfo(false), SupportsDebugEntryValues(false),
153+
EnableDebugEntryValues(false), ValueTrackingVariableLocations(false),
154+
ForceDwarfFrameSection(false), XRayFunctionIndex(true),
155+
DebugStrictDwarf(false), Hotpatch(false),
156156
PPCGenScalarMASSEntries(false), JMCInstrument(false),
157157
EnableCFIFixup(false), MisExpect(false), XCOFFReadOnlyPointers(false),
158158
FPDenormalMode(DenormalMode::IEEE, DenormalMode::IEEE) {}
@@ -260,11 +260,6 @@ namespace llvm {
260260
/// Disable the integrated assembler.
261261
unsigned DisableIntegratedAS : 1;
262262

263-
/// Compress DWARF debug sections.
264-
DebugCompressionType CompressDebugSections = DebugCompressionType::None;
265-
266-
unsigned RelaxELFRelocations : 1;
267-
268263
/// Emit functions into separate sections.
269264
unsigned FunctionSections : 1;
270265

‎llvm/lib/CodeGen/CommandFlags.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ CGOPT(bool, StackRealign)
8585
CGOPT(std::string, TrapFuncName)
8686
CGOPT(bool, UseCtors)
8787
CGOPT(bool, DisableIntegratedAS)
88-
CGOPT(bool, RelaxELFRelocations)
8988
CGOPT_EXP(bool, DataSections)
9089
CGOPT_EXP(bool, FunctionSections)
9190
CGOPT(bool, IgnoreXCOFFVisibility)
@@ -362,13 +361,6 @@ codegen::RegisterCodeGenFlags::RegisterCodeGenFlags() {
362361
cl::init(false));
363362
CGBINDOPT(UseCtors);
364363

365-
static cl::opt<bool> RelaxELFRelocations(
366-
"x86-relax-relocations",
367-
cl::desc(
368-
"Emit GOTPCRELX/REX_GOTPCRELX instead of GOTPCREL on x86-64 ELF"),
369-
cl::init(true));
370-
CGBINDOPT(RelaxELFRelocations);
371-
372364
static cl::opt<bool> DataSections(
373365
"data-sections", cl::desc("Emit data into separate sections"),
374366
cl::init(false));
@@ -568,7 +560,6 @@ codegen::InitTargetOptionsFromCodeGenFlags(const Triple &TheTriple) {
568560
Options.StackSymbolOrdering = getStackSymbolOrdering();
569561
Options.UseInitArray = !getUseCtors();
570562
Options.DisableIntegratedAS = getDisableIntegratedAS();
571-
Options.RelaxELFRelocations = getRelaxELFRelocations();
572563
Options.DataSections =
573564
getExplicitDataSections().value_or(TheTriple.hasDefaultDataSections());
574565
Options.FunctionSections = getFunctionSections();

‎llvm/lib/CodeGen/LLVMTargetMachine.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ void LLVMTargetMachine::initAsmInfo() {
7777

7878
TmpAsmInfo->setPreserveAsmComments(Options.MCOptions.PreserveAsmComments);
7979

80-
TmpAsmInfo->setCompressDebugSections(Options.CompressDebugSections);
81-
82-
TmpAsmInfo->setRelaxELFRelocations(Options.RelaxELFRelocations);
83-
8480
TmpAsmInfo->setFullRegisterNames(Options.MCOptions.PPCUseFullRegisterNames);
8581

8682
if (Options.ExceptionModel != ExceptionHandling::None)

‎llvm/lib/LTO/LTO.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ void llvm::computeLTOCacheKey(
124124
AddString(Conf.CPU);
125125
// FIXME: Hash more of Options. For now all clients initialize Options from
126126
// command-line flags (which is unsupported in production), but may set
127-
// RelaxELFRelocations. The clang driver can also pass FunctionSections,
127+
// X86RelaxRelocations. The clang driver can also pass FunctionSections,
128128
// DataSections and DebuggerTuning via command line flags.
129-
AddUnsigned(Conf.Options.RelaxELFRelocations);
129+
AddUnsigned(Conf.Options.MCOptions.X86RelaxRelocations);
130130
AddUnsigned(Conf.Options.FunctionSections);
131131
AddUnsigned(Conf.Options.DataSections);
132132
AddUnsigned((unsigned)Conf.Options.DebuggerTuning);

‎llvm/lib/MC/ELFObjectWriter.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -875,11 +875,10 @@ void ELFWriter::writeSectionData(const MCAssembler &Asm, MCSection &Sec,
875875
const MCAsmLayout &Layout) {
876876
MCSectionELF &Section = static_cast<MCSectionELF &>(Sec);
877877
StringRef SectionName = Section.getName();
878-
879-
auto &MC = Asm.getContext();
880-
const auto &MAI = MC.getAsmInfo();
881-
882-
const DebugCompressionType CompressionType = MAI->compressDebugSections();
878+
auto &Ctx = Asm.getContext();
879+
const DebugCompressionType CompressionType =
880+
Ctx.getTargetOptions() ? Ctx.getTargetOptions()->CompressDebugSections
881+
: DebugCompressionType::None;
883882
if (CompressionType == DebugCompressionType::None ||
884883
!SectionName.starts_with(".debug_")) {
885884
Asm.writeSectionData(W.OS, &Section, Layout);

‎llvm/lib/MC/MCTargetOptionsCommandFlags.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ MCOPT(bool, FatalWarnings)
4646
MCOPT(bool, NoWarn)
4747
MCOPT(bool, NoDeprecatedWarn)
4848
MCOPT(bool, NoTypeCheck)
49+
MCOPT(bool, X86RelaxRelocations)
4950
MCOPT(std::string, ABIName)
5051
MCOPT(std::string, AsSecureLogFile)
5152

@@ -122,6 +123,13 @@ llvm::mc::RegisterMCTargetOptionsFlags::RegisterMCTargetOptionsFlags() {
122123
"no-type-check", cl::desc("Suppress type errors (Wasm)"));
123124
MCBINDOPT(NoTypeCheck);
124125

126+
static cl::opt<bool> X86RelaxRelocations(
127+
"x86-relax-relocations",
128+
cl::desc(
129+
"Emit GOTPCRELX/REX_GOTPCRELX instead of GOTPCREL on x86-64 ELF"),
130+
cl::init(true));
131+
MCBINDOPT(X86RelaxRelocations);
132+
125133
static cl::opt<std::string> ABIName(
126134
"target-abi", cl::Hidden,
127135
cl::desc("The name of the ABI to be targeted from the backend."),
@@ -148,6 +156,7 @@ MCTargetOptions llvm::mc::InitMCTargetOptionsFromFlags() {
148156
Options.MCNoWarn = getNoWarn();
149157
Options.MCNoDeprecatedWarn = getNoDeprecatedWarn();
150158
Options.MCNoTypeCheck = getNoTypeCheck();
159+
Options.X86RelaxRelocations = getX86RelaxRelocations();
151160
Options.EmitDwarfUnwind = getEmitDwarfUnwind();
152161
Options.EmitCompactUnwindNonCanonical = getEmitCompactUnwindNonCanonical();
153162
Options.AsSecureLogFile = getAsSecureLogFile();

‎llvm/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static unsigned getRelocType64(MCContext &Ctx, SMLoc Loc,
207207
// Older versions of ld.bfd/ld.gold/lld
208208
// do not support GOTPCRELX/REX_GOTPCRELX,
209209
// and we want to keep back-compatibility.
210-
if (!Ctx.getAsmInfo()->canRelaxRelocations())
210+
if (!Ctx.getTargetOptions()->X86RelaxRelocations)
211211
return ELF::R_X86_64_GOTPCREL;
212212
switch (unsigned(Kind)) {
213213
default:
@@ -259,7 +259,7 @@ static unsigned getRelocType32(MCContext &Ctx, SMLoc Loc,
259259
return ELF::R_386_GOTPC;
260260
// Older versions of ld.bfd/ld.gold/lld do not support R_386_GOT32X and we
261261
// want to maintain compatibility.
262-
if (!Ctx.getAsmInfo()->canRelaxRelocations())
262+
if (!Ctx.getTargetOptions()->X86RelaxRelocations)
263263
return ELF::R_386_GOT32;
264264

265265
return Kind == MCFixupKind(X86::reloc_signed_4byte_relax)

‎llvm/lib/Target/X86/X86MCInstLower.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,13 @@ void X86AsmPrinter::LowerTlsAddr(X86MCInstLower &MCInstLowering,
546546
const MCSymbolRefExpr *Sym = MCSymbolRefExpr::create(
547547
MCInstLowering.GetSymbolFromOperand(MI.getOperand(3)), SRVK, Ctx);
548548

549-
// As of binutils 2.32, ld has a bogus TLS relaxation error when the GD/LD
549+
// Before binutils 2.41, ld has a bogus TLS relaxation error when the GD/LD
550550
// code sequence using R_X86_64_GOTPCREL (instead of R_X86_64_GOTPCRELX) is
551551
// attempted to be relaxed to IE/LE (binutils PR24784). Work around the bug by
552552
// only using GOT when GOTPCRELX is enabled.
553-
// TODO Delete the workaround when GOTPCRELX becomes commonplace.
553+
// TODO Delete the workaround when rustc no longer relies on the hack
554554
bool UseGot = MMI->getModule()->getRtLibUseGOT() &&
555-
Ctx.getAsmInfo()->canRelaxRelocations();
555+
Ctx.getTargetOptions()->X86RelaxRelocations;
556556

557557
if (Is64Bits) {
558558
bool NeedsPadding = SRVK == MCSymbolRefExpr::VK_TLSGD;

‎llvm/test/ExecutionEngine/JITLink/AArch64/ELF_minimal.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: rm -rf %t && mkdir -p %t
2-
# RUN: llvm-mc -triple=aarch64-unknown-linux-gnu -relax-relocations=false \
2+
# RUN: llvm-mc -triple=aarch64-unknown-linux-gnu -x86-relax-relocations=false \
33
# RUN: -position-independent -filetype=obj -o %t/elf_minimal.o %s
44
# RUN: llvm-jitlink -noexec %t/elf_minimal.o
55

‎llvm/test/ExecutionEngine/JITLink/AArch64/ELF_relocations.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: rm -rf %t && mkdir -p %t
2-
# RUN: llvm-mc -triple=aarch64-unknown-linux-gnu -relax-relocations=false \
2+
# RUN: llvm-mc -triple=aarch64-unknown-linux-gnu -x86-relax-relocations=false \
33
# RUN: -position-independent -filetype=obj -o %t/elf_reloc.o %s
44
# RUN: llvm-jitlink -noexec \
55
# RUN: -abs external_data=0xdeadbeef \

‎llvm/test/ExecutionEngine/JITLink/x86-64/COFF_small_pic_relocations.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: rm -rf %t && mkdir -p %t
2-
# RUN: llvm-mc -triple=x86_64-windows-msvc -relax-relocations=false \
2+
# RUN: llvm-mc -triple=x86_64-windows-msvc -x86-relax-relocations=false \
33
# RUN: -position-independent -filetype=obj -o %t/coff_sm_reloc.o %s
44
# RUN: llvm-jitlink -noexec \
55
# RUN: -slab-allocate 100Kb -slab-address 0xfff00000 -slab-page-size 4096 \

‎llvm/test/ExecutionEngine/JITLink/x86-64/ELF_common_var.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: rm -rf %t && mkdir -p %t
2-
# RUN: llvm-mc -triple=x86_64-unknown-linux -relax-relocations=false -position-independent -filetype=obj -o %t/elf_common.o %s
2+
# RUN: llvm-mc -triple=x86_64-unknown-linux -x86-relax-relocations=false -position-independent -filetype=obj -o %t/elf_common.o %s
33
# RUN: llvm-jitlink -entry=load_common -noexec -check %s %t/elf_common.o
44
#
55
# Check that common variable GOT entry is synthesized correctly.

‎llvm/test/MC/ELF/got-relaxed-i386.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: llvm-mc -filetype=obj -triple i386-pc-linux %s -o - | llvm-readobj -r - | FileCheck %s
2-
// RUN: llvm-mc -filetype=obj -relax-relocations=false -triple i386-pc-linux %s -o - | llvm-readobj -r - | FileCheck --check-prefix=OLD %s
2+
// RUN: llvm-mc -filetype=obj -x86-relax-relocations=false -triple i386-pc-linux %s -o - | llvm-readobj -r - | FileCheck --check-prefix=OLD %s
33

44
movl mov@GOT(%ebx), %eax
55
mull mul@GOT(%ebx)

‎llvm/test/MC/ELF/relocation-386.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -relax-relocations=false -o - | llvm-readobj -r - | FileCheck %s --check-prefix=CHECK --check-prefix=I386
2-
// RUN: llvm-mc -filetype=obj -triple i386-pc-elfiamcu %s -relax-relocations=false -o - | llvm-readobj -r - | FileCheck %s --check-prefix=CHECK --check-prefix=IAMCU
1+
// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -x86-relax-relocations=false -o - | llvm-readobj -r - | FileCheck %s --check-prefix=CHECK --check-prefix=I386
2+
// RUN: llvm-mc -filetype=obj -triple i386-pc-elfiamcu %s -x86-relax-relocations=false -o - | llvm-readobj -r - | FileCheck %s --check-prefix=CHECK --check-prefix=IAMCU
33
// RUN: not llvm-mc -filetype=obj -triple=i686 --defsym ERR=1 %s -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR --implicit-check-not=error:
44

55
// Test that we produce the correct relocation types and that the relocations

‎llvm/test/MC/X86/gotpcrelx.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
22
# RUN: llvm-readobj -r %t.o | FileCheck %s --check-prefixes=CHECK,COMMON
3-
# RUN: llvm-mc -filetype=obj -triple=x86_64 -relax-relocations=false %s -o %t1.o
3+
# RUN: llvm-mc -filetype=obj -triple=x86_64 -x86-relax-relocations=false %s -o %t1.o
44
# RUN: llvm-readobj -r %t1.o | FileCheck %s --check-prefixes=NORELAX,COMMON
55

66
# COMMON: Relocations [

‎llvm/tools/gold/gold-plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ static std::unique_ptr<LTO> createLTO(IndexWriteCallback OnIndexWrite,
857857

858858
// Disable the new X86 relax relocations since gold might not support them.
859859
// FIXME: Check the gold version or add a new option to enable them.
860-
Conf.Options.RelaxELFRelocations = false;
860+
Conf.Options.MCOptions.X86RelaxRelocations = false;
861861

862862
// Toggle function/data sections.
863863
if (!codegen::getExplicitFunctionSections())

0 commit comments

Comments
 (0)