temporarily revert devang's patch to link in the llvm codegen etc.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43544 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/ASTConsumers.cpp b/Driver/ASTConsumers.cpp
index 0fcebca..37d637b 100644
--- a/Driver/ASTConsumers.cpp
+++ b/Driver/ASTConsumers.cpp
@@ -379,19 +379,14 @@
// LLVM Emitter
#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/TargetInfo.h"
#include "clang/CodeGen/ModuleBuilder.h"
#include "llvm/Module.h"
-#include "llvm/Target/TargetData.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetMachineRegistry.h"
#include <iostream>
namespace {
class LLVMEmitter : public ASTConsumer {
Diagnostic &Diags;
llvm::Module *M;
- const llvm::TargetData *TD;
ASTContext *Ctx;
CodeGen::BuilderTy *Builder;
public:
@@ -399,16 +394,7 @@
virtual void Initialize(ASTContext &Context, unsigned MainFileID) {
Ctx = &Context;
M = new llvm::Module("foo");
- M->setTargetTriple(Ctx->Target.getTargetTriple());
- std::string Err;
- const llvm::TargetMachineRegistry::entry *TME =
- llvm::TargetMachineRegistry::getClosestStaticTargetForModule(*M, Err);
- assert(TME && "Unable to determine target machine");
- // FIXME : Set appropriate subtarget features.
- std::string FeatureStr;
- llvm::TargetMachine *TheMachine = TME->CtorFn(*M, FeatureStr);
- TD = TheMachine->getTargetData();
- Builder = CodeGen::Init(Context, *M, *TD);
+ Builder = CodeGen::Init(Context, *M);
}
virtual void HandleTopLevelDecl(Decl *D) {
diff --git a/Driver/Makefile b/Driver/Makefile
index bf86151..6d2cfe0 100644
--- a/Driver/Makefile
+++ b/Driver/Makefile
@@ -4,12 +4,8 @@
TOOLNAME = clang
USEDLIBS = clangCodeGen.a clangAnalysis.a clangRewrite.a clangSEMA.a \
- clangAST.a clangParse.a clangLex.a clangBasic.a LLVMX86 \
+ clangAST.a clangParse.a clangLex.a clangBasic.a \
LLVMCore.a LLVMSupport.a LLVMSystem.a \
- LLVMBitWriter.a LLVMBitReader.a LLVMTarget.a LLVMCodeGen.a \
- LLVMSelectionDAG.a LLVMScalarOpts.a LLVMTransformUtils.a \
- LLVMCore.a LLVMAnalysis.a
-
-
+ LLVMBitWriter.a LLVMBitReader.a
include $(LEVEL)/Makefile.common