Revert 75762, 75763, 75766..75769, 75772..75775, 75778, 75780, 75782 to repair broken LLVM-GCC build.
Will revert 75770 in the llvm-gcc trunk.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75799 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index b1361e8..caf91c8 100644
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -30,10 +30,9 @@
#include "llvm/CodeGen/Passes.h"
#include "llvm/CodeGen/IntrinsicLowering.h"
#include "llvm/Transforms/Scalar.h"
+#include "llvm/Target/TargetMachineRegistry.h"
#include "llvm/Target/TargetAsmInfo.h"
#include "llvm/Target/TargetData.h"
-#include "llvm/Target/TargetMachineRegistry.h"
-#include "llvm/Target/TargetRegistry.h"
#include "llvm/Support/CallSite.h"
#include "llvm/Support/CFG.h"
#include "llvm/Support/ErrorHandling.h"
@@ -59,8 +58,7 @@
int CBackendTargetMachineModule = 0;
// Register the target.
-extern Target TheCBackendTarget;
-static RegisterTarget<CTargetMachine> X(TheCBackendTarget, "c", "C backend");
+static RegisterTarget<CTargetMachine> X("c", "C backend");
// Force static initialization.
extern "C" void LLVMInitializeCBackendTarget() { }
@@ -3188,27 +3186,27 @@
const char *const *table = 0;
- // Grab the translation table from TargetAsmInfo if it exists.
+ //Grab the translation table from TargetAsmInfo if it exists
if (!TAsm) {
std::string E;
- const Target *Match =
- TargetRegistry::getClosestStaticTargetForModule(*TheModule, E);
+ const TargetMachineRegistry::entry* Match =
+ TargetMachineRegistry::getClosestStaticTargetForModule(*TheModule, E);
if (Match) {
- // Per platform Target Machines don't exist, so create it;
- // this must be done only once.
- const TargetMachine* TM = Match->createTargetMachine(*TheModule, "");
+ //Per platform Target Machines don't exist, so create it
+ // this must be done only once
+ const TargetMachine* TM = Match->CtorFn(*TheModule, "");
TAsm = TM->getTargetAsmInfo();
}
}
if (TAsm)
table = TAsm->getAsmCBE();
- // Search the translation table if it exists.
+ //Search the translation table if it exists
for (int i = 0; table && table[i]; i += 2)
if (c.Codes[0] == table[i])
return table[i+1];
- // Default is identity.
+ //default is identity
return c.Codes[0];
}