forked from OSchip/llvm-project
Pass a MCSubtargetInfo down to the TargetStreamer creation.
With this the target streamers will be able to know the target features that are in use. llvm-svn: 200135
This commit is contained in:
parent
3c6f5cd446
commit
e41383f899
|
@ -126,6 +126,7 @@ namespace llvm {
|
|||
MCAsmBackend &TAB,
|
||||
raw_ostream &_OS,
|
||||
MCCodeEmitter *_Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll,
|
||||
bool NoExecStack);
|
||||
typedef MCStreamer *(*AsmStreamerCtorTy)(MCContext &Ctx,
|
||||
|
@ -418,11 +419,12 @@ namespace llvm {
|
|||
MCAsmBackend &TAB,
|
||||
raw_ostream &_OS,
|
||||
MCCodeEmitter *_Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll,
|
||||
bool NoExecStack) const {
|
||||
if (!MCObjectStreamerCtorFn)
|
||||
return 0;
|
||||
return MCObjectStreamerCtorFn(*this, TT, Ctx, TAB, _OS, _Emitter,
|
||||
return MCObjectStreamerCtorFn(*this, TT, Ctx, TAB, _OS, _Emitter, STI,
|
||||
RelaxAll, NoExecStack);
|
||||
}
|
||||
|
||||
|
|
|
@ -204,10 +204,9 @@ bool LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM,
|
|||
if (MCE == 0 || MAB == 0)
|
||||
return true;
|
||||
|
||||
AsmStreamer.reset(getTarget().createMCObjectStreamer(getTargetTriple(),
|
||||
*Context, *MAB, Out,
|
||||
MCE, hasMCRelaxAll(),
|
||||
hasMCNoExecStack()));
|
||||
AsmStreamer.reset(getTarget().createMCObjectStreamer(
|
||||
getTargetTriple(), *Context, *MAB, Out, MCE, STI, hasMCRelaxAll(),
|
||||
hasMCNoExecStack()));
|
||||
break;
|
||||
}
|
||||
case CGFT_Null:
|
||||
|
@ -278,10 +277,9 @@ bool LLVMTargetMachine::addPassesToEmitMC(PassManagerBase &PM,
|
|||
return true;
|
||||
|
||||
OwningPtr<MCStreamer> AsmStreamer;
|
||||
AsmStreamer.reset(getTarget().createMCObjectStreamer(getTargetTriple(), *Ctx,
|
||||
*MAB, Out, MCE,
|
||||
hasMCRelaxAll(),
|
||||
hasMCNoExecStack()));
|
||||
AsmStreamer.reset(getTarget().createMCObjectStreamer(
|
||||
getTargetTriple(), *Ctx, *MAB, Out, MCE, STI, hasMCRelaxAll(),
|
||||
hasMCNoExecStack()));
|
||||
|
||||
// Create the AsmPrinter, which takes ownership of AsmStreamer if successful.
|
||||
FunctionPass *Printer = getTarget().createAsmPrinter(*this, *AsmStreamer);
|
||||
|
|
|
@ -97,6 +97,7 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
|
|||
MCContext &Ctx, MCAsmBackend &MAB,
|
||||
raw_ostream &OS,
|
||||
MCCodeEmitter *Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll,
|
||||
bool NoExecStack) {
|
||||
Triple TheTriple(TT);
|
||||
|
|
|
@ -236,6 +236,7 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
|
|||
MCContext &Ctx, MCAsmBackend &MAB,
|
||||
raw_ostream &OS,
|
||||
MCCodeEmitter *Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll,
|
||||
bool NoExecStack) {
|
||||
Triple TheTriple(TT);
|
||||
|
|
|
@ -130,6 +130,7 @@ static MCInstPrinter *createMipsMCInstPrinter(const Target &T,
|
|||
static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
|
||||
MCContext &Context, MCAsmBackend &MAB,
|
||||
raw_ostream &OS, MCCodeEmitter *Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll, bool NoExecStack) {
|
||||
MCStreamer *S =
|
||||
createELFStreamer(Context, MAB, OS, Emitter, RelaxAll, NoExecStack);
|
||||
|
|
|
@ -146,6 +146,7 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
|
|||
MCContext &Ctx, MCAsmBackend &MAB,
|
||||
raw_ostream &OS,
|
||||
MCCodeEmitter *Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll,
|
||||
bool NoExecStack) {
|
||||
if (Triple(TT).isOSDarwin())
|
||||
|
|
|
@ -86,6 +86,7 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
|
|||
MCContext &Ctx, MCAsmBackend &MAB,
|
||||
raw_ostream &_OS,
|
||||
MCCodeEmitter *_Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll,
|
||||
bool NoExecStack) {
|
||||
return createELFStreamer(Ctx, MAB, _OS, _Emitter, false, false);
|
||||
|
|
|
@ -104,7 +104,8 @@ static MCCodeGenInfo *createSparcV9MCCodeGenInfo(StringRef TT, Reloc::Model RM,
|
|||
static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
|
||||
MCContext &Context, MCAsmBackend &MAB,
|
||||
raw_ostream &OS, MCCodeEmitter *Emitter,
|
||||
bool RelaxAll, bool NoExecStack) {
|
||||
const MCSubtargetInfo &STI, bool RelaxAll,
|
||||
bool NoExecStack) {
|
||||
MCStreamer *S =
|
||||
createELFStreamer(Context, MAB, OS, Emitter, RelaxAll, NoExecStack);
|
||||
new SparcTargetELFStreamer(*S);
|
||||
|
|
|
@ -185,6 +185,7 @@ static MCStreamer *createSystemZMCObjectStreamer(const Target &T, StringRef TT,
|
|||
MCAsmBackend &MAB,
|
||||
raw_ostream &OS,
|
||||
MCCodeEmitter *Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll,
|
||||
bool NoExecStack) {
|
||||
return createELFStreamer(Ctx, MAB, OS, Emitter, RelaxAll, NoExecStack);
|
||||
|
|
|
@ -361,6 +361,7 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
|
|||
MCContext &Ctx, MCAsmBackend &MAB,
|
||||
raw_ostream &_OS,
|
||||
MCCodeEmitter *_Emitter,
|
||||
const MCSubtargetInfo &STI,
|
||||
bool RelaxAll,
|
||||
bool NoExecStack) {
|
||||
Triple TheTriple(TT);
|
||||
|
|
|
@ -448,7 +448,7 @@ int main(int argc, char **argv) {
|
|||
MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, *STI, Ctx);
|
||||
MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*MRI, TripleName, MCPU);
|
||||
Str.reset(TheTarget->createMCObjectStreamer(TripleName, Ctx, *MAB,
|
||||
FOS, CE, RelaxAll,
|
||||
FOS, CE, *STI, RelaxAll,
|
||||
NoExecStack));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue