MC: Remove NullStreamer hook, as it is redundant with NullTargetStreamer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229799 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Collingbourne
2015-02-19 00:45:07 +00:00
parent 7d3b145da4
commit d93ca09fe0
5 changed files with 15 additions and 37 deletions

View File

@@ -139,7 +139,6 @@ namespace llvm {
MCCodeEmitter *CE,
MCAsmBackend *TAB,
bool ShowInst);
typedef MCStreamer *(*NullStreamerCtorTy)(MCContext &Ctx);
typedef MCTargetStreamer *(*NullTargetStreamerCtorTy)(MCStreamer &S);
typedef MCRelocationInfo *(*MCRelocationInfoCtorTy)(StringRef TT,
MCContext &Ctx);
@@ -225,10 +224,6 @@ namespace llvm {
/// AsmStreamer, if registered (default = llvm::createAsmStreamer).
AsmStreamerCtorTy AsmStreamerCtorFn;
/// Construction function for this target's NullStreamer, if registered
/// (default = llvm::createNullStreamer).
NullStreamerCtorTy NullStreamerCtorFn;
/// Construction function for this target's null TargetStreamer, if
/// registered (default = nullptr).
NullTargetStreamerCtorTy NullTargetStreamerCtorFn;
@@ -243,8 +238,8 @@ namespace llvm {
public:
Target()
: AsmStreamerCtorFn(nullptr), NullStreamerCtorFn(nullptr),
MCRelocationInfoCtorFn(nullptr), MCSymbolizerCtorFn(nullptr) {}
: AsmStreamerCtorFn(nullptr), MCRelocationInfoCtorFn(nullptr),
MCSymbolizerCtorFn(nullptr) {}
/// @name Target Information
/// @{
@@ -454,9 +449,9 @@ namespace llvm {
}
MCStreamer *createNullStreamer(MCContext &Ctx) const {
if (NullStreamerCtorFn)
return NullStreamerCtorFn(Ctx);
return llvm::createNullStreamer(Ctx);
MCStreamer *S = llvm::createNullStreamer(Ctx);
createNullTargetStreamer(*S);
return S;
}
MCTargetStreamer *createNullTargetStreamer(MCStreamer &S) const {
@@ -791,10 +786,6 @@ namespace llvm {
T.AsmStreamerCtorFn = Fn;
}
static void RegisterNullStreamer(Target &T, Target::NullStreamerCtorTy Fn) {
T.NullStreamerCtorFn = Fn;
}
static void
RegisterNullTargetStreamer(Target &T, Target::NullTargetStreamerCtorTy Fn) {
T.NullTargetStreamerCtorFn = Fn;