Skip to content

Commit 45b59cb

Browse files
committed
[MC] Move setRelaxAll() calls to MCObjectStreamer
Related to clean-up opportunities discussed at #90013.
1 parent 7045c14 commit 45b59cb

File tree

15 files changed

+2
-25
lines changed

15 files changed

+2
-25
lines changed

llvm/lib/MC/MCDXContainerStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,5 @@ MCStreamer *llvm::createDXContainerStreamer(
2525
bool RelaxAll) {
2626
auto *S = new MCDXContainerStreamer(Context, std::move(MAB), std::move(OW),
2727
std::move(CE));
28-
if (RelaxAll)
29-
S->getAssembler().setRelaxAll(true);
3028
return S;
3129
}

llvm/lib/MC/MCELFStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,5 @@ MCStreamer *llvm::createELFStreamer(MCContext &Context,
896896
bool RelaxAll) {
897897
MCELFStreamer *S =
898898
new MCELFStreamer(Context, std::move(MAB), std::move(OW), std::move(CE));
899-
if (RelaxAll)
900-
S->getAssembler().setRelaxAll(true);
901899
return S;
902900
}

llvm/lib/MC/MCGOFFStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@ MCStreamer *llvm::createGOFFStreamer(MCContext &Context,
2828
bool RelaxAll) {
2929
MCGOFFStreamer *S =
3030
new MCGOFFStreamer(Context, std::move(MAB), std::move(OW), std::move(CE));
31-
if (RelaxAll)
32-
S->getAssembler().setRelaxAll(true);
3331
return S;
3432
}

llvm/lib/MC/MCMachOStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,8 +574,6 @@ MCStreamer *llvm::createMachOStreamer(MCContext &Context,
574574
Target, Context.getObjectFileInfo()->getSDKVersion(),
575575
Context.getObjectFileInfo()->getDarwinTargetVariantTriple(),
576576
Context.getObjectFileInfo()->getDarwinTargetVariantSDKVersion());
577-
if (RelaxAll)
578-
S->getAssembler().setRelaxAll(true);
579577
return S;
580578
}
581579

llvm/lib/MC/MCObjectStreamer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ MCObjectStreamer::MCObjectStreamer(MCContext &Context,
3434
EmitEHFrame(true), EmitDebugFrame(false) {
3535
if (Assembler->getBackendPtr())
3636
setAllowAutoPadding(Assembler->getBackend().allowAutoPadding());
37+
if (Context.getTargetOptions() && Context.getTargetOptions()->MCRelaxAll)
38+
Assembler->setRelaxAll(true);
3739
}
3840

3941
MCObjectStreamer::~MCObjectStreamer() = default;

llvm/lib/MC/MCSPIRVStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,5 @@ MCStreamer *llvm::createSPIRVStreamer(MCContext &Context,
3838
bool RelaxAll) {
3939
MCSPIRVStreamer *S = new MCSPIRVStreamer(Context, std::move(MAB),
4040
std::move(OW), std::move(CE));
41-
if (RelaxAll)
42-
S->getAssembler().setRelaxAll(true);
4341
return S;
4442
}

llvm/lib/MC/MCWasmStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,5 @@ MCStreamer *llvm::createWasmStreamer(MCContext &Context,
279279
bool RelaxAll) {
280280
MCWasmStreamer *S =
281281
new MCWasmStreamer(Context, std::move(MAB), std::move(OW), std::move(CE));
282-
if (RelaxAll)
283-
S->getAssembler().setRelaxAll(true);
284282
return S;
285283
}

llvm/lib/MC/MCXCOFFStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ MCStreamer *llvm::createXCOFFStreamer(MCContext &Context,
166166
bool RelaxAll) {
167167
MCXCOFFStreamer *S = new MCXCOFFStreamer(Context, std::move(MAB),
168168
std::move(OW), std::move(CE));
169-
if (RelaxAll)
170-
S->getAssembler().setRelaxAll(true);
171169
return S;
172170
}
173171

llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,5 @@ MCELFStreamer *llvm::createAArch64ELFStreamer(
312312
bool RelaxAll) {
313313
AArch64ELFStreamer *S = new AArch64ELFStreamer(
314314
Context, std::move(TAB), std::move(OW), std::move(Emitter));
315-
if (RelaxAll)
316-
S->getAssembler().setRelaxAll(true);
317315
return S;
318316
}

llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,8 +1497,6 @@ MCELFStreamer *createARMELFStreamer(MCContext &Context,
14971497
// the status quo for ARM and setting EF_ARM_EABI_VER5 as the default.
14981498
S->getAssembler().setELFHeaderEFlags(ELF::EF_ARM_EABI_VER5);
14991499

1500-
if (RelaxAll)
1501-
S->getAssembler().setRelaxAll(true);
15021500
return S;
15031501
}
15041502

llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCTargetDesc.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ static MCStreamer *createELFStreamer(const Triple &T, MCContext &Ctx,
9393
CSKYELFStreamer *S = new CSKYELFStreamer(Ctx, std::move(MAB), std::move(OW),
9494
std::move(Emitter));
9595

96-
if (RelaxAll)
97-
S->getAssembler().setRelaxAll(true);
9896
return S;
9997
}
10098

llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchELFStreamer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ MCELFStreamer *createLoongArchELFStreamer(MCContext &C,
8686
bool RelaxAll) {
8787
LoongArchELFStreamer *S = new LoongArchELFStreamer(
8888
C, std::move(MAB), std::move(MOW), std::move(MCE));
89-
S->getAssembler().setRelaxAll(RelaxAll);
9089
return S;
9190
}
9291
} // end namespace llvm

llvm/lib/Target/Mips/MCTargetDesc/MipsNaClELFStreamer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,6 @@ MCELFStreamer *createMipsNaClELFStreamer(MCContext &Context,
266266
bool RelaxAll) {
267267
MipsNaClELFStreamer *S = new MipsNaClELFStreamer(
268268
Context, std::move(TAB), std::move(OW), std::move(Emitter));
269-
if (RelaxAll)
270-
S->getAssembler().setRelaxAll(true);
271269

272270
// Set bundle-alignment as required by the NaCl ABI for the target.
273271
S->emitBundleAlignMode(MIPS_NACL_BUNDLE_ALIGN);

llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ MCELFStreamer *createRISCVELFStreamer(MCContext &C,
201201
bool RelaxAll) {
202202
RISCVELFStreamer *S =
203203
new RISCVELFStreamer(C, std::move(MAB), std::move(MOW), std::move(MCE));
204-
S->getAssembler().setRelaxAll(RelaxAll);
205204
return S;
206205
}
207206
} // namespace llvm

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ MCStreamer *llvm::createX86WinCOFFStreamer(MCContext &C,
7474
bool IncrementalLinkerCompatible) {
7575
X86WinCOFFStreamer *S =
7676
new X86WinCOFFStreamer(C, std::move(AB), std::move(CE), std::move(OW));
77-
S->getAssembler().setRelaxAll(RelaxAll);
7877
S->getAssembler().setIncrementalLinkerCompatible(IncrementalLinkerCompatible);
7978
return S;
8079
}

0 commit comments

Comments
 (0)