Skip to content

Commit 79a8279

Browse files
committed
[MC] Remove IncrementalLinkerCompatible parameters from create*WinCOFFStreamer
Follow-up to b201ab8. Similar to RelaxAll (4e34035).
1 parent b201ab8 commit 79a8279

File tree

8 files changed

+18
-27
lines changed

8 files changed

+18
-27
lines changed

llvm/include/llvm/MC/TargetRegistry.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ class Target {
206206
using COFFStreamerCtorTy =
207207
MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
208208
std::unique_ptr<MCObjectWriter> &&OW,
209-
std::unique_ptr<MCCodeEmitter> &&Emitter,
210-
bool IncrementalLinkerCompatible);
209+
std::unique_ptr<MCCodeEmitter> &&Emitter);
211210
using WasmStreamerCtorTy =
212211
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
213212
std::unique_ptr<MCAsmBackend> &&TAB,
@@ -555,13 +554,11 @@ class Target {
555554
/// \param TAB The target assembler backend object. Takes ownership.
556555
/// \param OW The stream object.
557556
/// \param Emitter The target independent assembler object.Takes ownership.
558-
/// \param RelaxAll Relax all fixups?
559557
MCStreamer *createMCObjectStreamer(const Triple &T, MCContext &Ctx,
560558
std::unique_ptr<MCAsmBackend> &&TAB,
561559
std::unique_ptr<MCObjectWriter> &&OW,
562560
std::unique_ptr<MCCodeEmitter> &&Emitter,
563-
const MCSubtargetInfo &STI, bool,
564-
bool IncrementalLinkerCompatible,
561+
const MCSubtargetInfo &STI, bool, bool,
565562
bool DWARFMustBeAtTheEnd) const {
566563
MCStreamer *S = nullptr;
567564
switch (T.getObjectFormat()) {
@@ -571,7 +568,7 @@ class Target {
571568
assert((T.isOSWindows() || T.isUEFI()) &&
572569
"only Windows and UEFI COFF are supported");
573570
S = COFFStreamerCtorFn(Ctx, std::move(TAB), std::move(OW),
574-
std::move(Emitter), IncrementalLinkerCompatible);
571+
std::move(Emitter));
575572
break;
576573
case Triple::MachO:
577574
if (MachOStreamerCtorFn)

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,11 +399,9 @@ static MCStreamer *createMachOStreamer(MCContext &Ctx,
399399
static MCStreamer *
400400
createWinCOFFStreamer(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
401401
std::unique_ptr<MCObjectWriter> &&OW,
402-
std::unique_ptr<MCCodeEmitter> &&Emitter,
403-
bool IncrementalLinkerCompatible) {
402+
std::unique_ptr<MCCodeEmitter> &&Emitter) {
404403
return createAArch64WinCOFFStreamer(Ctx, std::move(TAB), std::move(OW),
405-
std::move(Emitter),
406-
IncrementalLinkerCompatible);
404+
std::move(Emitter));
407405
}
408406

409407
namespace {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,11 @@ void AArch64TargetWinCOFFStreamer::emitARM64WinCFISaveAnyRegQPX(unsigned Reg,
291291
emitARM64WinUnwindCode(Win64EH::UOP_SaveAnyRegQPX, Reg, Offset);
292292
}
293293

294-
MCWinCOFFStreamer *llvm::createAArch64WinCOFFStreamer(
295-
MCContext &Context, std::unique_ptr<MCAsmBackend> MAB,
296-
std::unique_ptr<MCObjectWriter> OW, std::unique_ptr<MCCodeEmitter> Emitter,
297-
bool IncrementalLinkerCompatible) {
294+
MCWinCOFFStreamer *
295+
llvm::createAArch64WinCOFFStreamer(MCContext &Context,
296+
std::unique_ptr<MCAsmBackend> MAB,
297+
std::unique_ptr<MCObjectWriter> OW,
298+
std::unique_ptr<MCCodeEmitter> Emitter) {
298299
return new AArch64WinCOFFStreamer(Context, std::move(MAB), std::move(Emitter),
299300
std::move(OW));
300301
}

llvm/lib/Target/AArch64/MCTargetDesc/AArch64WinCOFFStreamer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ namespace llvm {
2020

2121
MCWinCOFFStreamer *createAArch64WinCOFFStreamer(
2222
MCContext &Context, std::unique_ptr<MCAsmBackend> TAB,
23-
std::unique_ptr<MCObjectWriter> OW, std::unique_ptr<MCCodeEmitter> Emitter,
24-
bool IncrementalLinkerCompatible);
23+
std::unique_ptr<MCObjectWriter> OW, std::unique_ptr<MCCodeEmitter> Emitter);
2524
} // end llvm namespace
2625

2726
#endif

llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ MCAsmBackend *createARMBEAsmBackend(const Target &T, const MCSubtargetInfo &STI,
9393
MCStreamer *createARMWinCOFFStreamer(MCContext &Context,
9494
std::unique_ptr<MCAsmBackend> &&MAB,
9595
std::unique_ptr<MCObjectWriter> &&OW,
96-
std::unique_ptr<MCCodeEmitter> &&Emitter,
97-
bool IncrementalLinkerCompatible);
96+
std::unique_ptr<MCCodeEmitter> &&Emitter);
9897

9998
/// Construct an ELF Mach-O object writer.
10099
std::unique_ptr<MCObjectTargetWriter> createARMELFObjectWriter(uint8_t OSABI);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ MCStreamer *
7070
llvm::createARMWinCOFFStreamer(MCContext &Context,
7171
std::unique_ptr<MCAsmBackend> &&MAB,
7272
std::unique_ptr<MCObjectWriter> &&OW,
73-
std::unique_ptr<MCCodeEmitter> &&Emitter,
74-
bool IncrementalLinkerCompatible) {
73+
std::unique_ptr<MCCodeEmitter> &&Emitter) {
7574
return new ARMWinCOFFStreamer(Context, std::move(MAB), std::move(Emitter),
7675
std::move(OW));
7776
}

llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ MCTargetStreamer *createX86ObjectTargetStreamer(MCStreamer &S,
128128
MCStreamer *createX86WinCOFFStreamer(MCContext &C,
129129
std::unique_ptr<MCAsmBackend> &&AB,
130130
std::unique_ptr<MCObjectWriter> &&OW,
131-
std::unique_ptr<MCCodeEmitter> &&CE,
132-
bool IncrementalLinkerCompatible);
131+
std::unique_ptr<MCCodeEmitter> &&CE);
133132

134133
MCStreamer *createX86ELFStreamer(const Triple &T, MCContext &Context,
135134
std::unique_ptr<MCAsmBackend> &&MAB,

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ void X86WinCOFFStreamer::finishImpl() {
7272
}
7373
} // namespace
7474

75-
MCStreamer *llvm::createX86WinCOFFStreamer(MCContext &C,
76-
std::unique_ptr<MCAsmBackend> &&AB,
77-
std::unique_ptr<MCObjectWriter> &&OW,
78-
std::unique_ptr<MCCodeEmitter> &&CE,
79-
bool IncrementalLinkerCompatible) {
75+
MCStreamer *
76+
llvm::createX86WinCOFFStreamer(MCContext &C, std::unique_ptr<MCAsmBackend> &&AB,
77+
std::unique_ptr<MCObjectWriter> &&OW,
78+
std::unique_ptr<MCCodeEmitter> &&CE) {
8079
return new X86WinCOFFStreamer(C, std::move(AB), std::move(CE), std::move(OW));
8180
}

0 commit comments

Comments
 (0)