From 150666fd82f96a8615e63d3797e2d00f3edcb3e0 Mon Sep 17 00:00:00 2001 From: Brian Gaeke Date: Wed, 25 Feb 2004 19:08:12 +0000 Subject: [PATCH] Great renaming part II: Sparc --> SparcV9 (also includes command-line options and Makefiles) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11827 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/TargetMachineImpls.h | 4 ++-- lib/ExecutionEngine/JIT/TargetSelect.cpp | 10 +++++----- lib/Target/Makefile | 2 +- lib/Target/SparcV9/SparcV9StackSlots.cpp | 2 +- tools/llc/Makefile | 8 ++++---- tools/llc/llc.cpp | 12 ++++++------ tools/lli/Makefile | 8 ++++---- tools/llvm-db/Makefile | 8 ++++---- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/llvm/Target/TargetMachineImpls.h b/include/llvm/Target/TargetMachineImpls.h index f1445d168ba..5003f4da98c 100644 --- a/include/llvm/Target/TargetMachineImpls.h +++ b/include/llvm/Target/TargetMachineImpls.h @@ -29,12 +29,12 @@ namespace llvm { TargetMachine *allocateCTargetMachine(const Module &M, IntrinsicLowering *IL = 0); - // allocateSparcTargetMachine - Allocate and return a subclass of + // allocateSparcV9TargetMachine - Allocate and return a subclass of // TargetMachine that implements the Sparc backend. This takes ownership of // the IntrinsicLowering pointer, deleting it when the target machine is // destroyed. // - TargetMachine *allocateSparcTargetMachine(const Module &M, + TargetMachine *allocateSparcV9TargetMachine(const Module &M, IntrinsicLowering *IL = 0); // allocateX86TargetMachine - Allocate and return a subclass of TargetMachine diff --git a/lib/ExecutionEngine/JIT/TargetSelect.cpp b/lib/ExecutionEngine/JIT/TargetSelect.cpp index 05408628703..fd96e5ef678 100644 --- a/lib/ExecutionEngine/JIT/TargetSelect.cpp +++ b/lib/ExecutionEngine/JIT/TargetSelect.cpp @@ -28,7 +28,7 @@ using namespace llvm; #endif namespace { - enum ArchName { x86, Sparc }; + enum ArchName { x86, SparcV9 }; #ifndef NO_JITS_ENABLED cl::opt @@ -38,13 +38,13 @@ namespace { clEnumVal(x86, " IA-32 (Pentium and above)"), #endif #ifdef ENABLE_SPARC_JIT - clEnumValN(Sparc, "sparc", " Sparc-V9"), + clEnumValN(Sparc, "sparcv9", " Sparc-V9"), #endif 0), #if defined(ENABLE_X86_JIT) cl::init(x86) #elif defined(ENABLE_SPARC_JIT) - cl::init(Sparc) + cl::init(SparcV9) #endif ); #endif /* NO_JITS_ENABLED */ @@ -69,8 +69,8 @@ ExecutionEngine *JIT::create(ModuleProvider *MP, IntrinsicLowering *IL) { break; #endif #ifdef ENABLE_SPARC_JIT - case Sparc: - TargetMachineAllocator = allocateSparcTargetMachine; + case SparcV9: + TargetMachineAllocator = allocateSparcV9TargetMachine; break; #endif default: diff --git a/lib/Target/Makefile b/lib/Target/Makefile index 89ed3e975d7..f4a6908fa1c 100644 --- a/lib/Target/Makefile +++ b/lib/Target/Makefile @@ -7,7 +7,7 @@ # ##===----------------------------------------------------------------------===## LEVEL = ../.. -DIRS = CBackend X86 Sparc PowerPC +DIRS = CBackend X86 SparcV9 PowerPC LIBRARYNAME = target BUILD_ARCHIVE = 1 diff --git a/lib/Target/SparcV9/SparcV9StackSlots.cpp b/lib/Target/SparcV9/SparcV9StackSlots.cpp index 5fd0ba19271..e11effc4b13 100644 --- a/lib/Target/SparcV9/SparcV9StackSlots.cpp +++ b/lib/Target/SparcV9/SparcV9StackSlots.cpp @@ -13,7 +13,7 @@ // //===----------------------------------------------------------------------===// -#include "SparcInternals.h" +#include "SparcV9Internals.h" #include "llvm/Constant.h" #include "llvm/DerivedTypes.h" #include "llvm/Function.h" diff --git a/tools/llc/Makefile b/tools/llc/Makefile index c018032f911..fb0d06080db 100644 --- a/tools/llc/Makefile +++ b/tools/llc/Makefile @@ -9,16 +9,16 @@ LEVEL = ../.. TOOLNAME = llc USEDLIBS = cwriter \ - sparc \ + sparcv9 \ x86 \ powerpc \ selectiondag \ - regalloc \ + sparcv9regalloc \ sched \ - select \ + sparcv9select \ codegen \ target.a \ - livevar \ + sparcv9livevar \ ipa.a \ transforms.a \ scalaropts.a \ diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp index 3176b4ce743..d7c9faeb261 100644 --- a/tools/llc/llc.cpp +++ b/tools/llc/llc.cpp @@ -37,12 +37,12 @@ OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename")); static cl::opt Force("f", cl::desc("Overwrite output files")); -enum ArchName { noarch, X86, Sparc, PowerPC, CBackend }; +enum ArchName { noarch, X86, SparcV9, PowerPC, CBackend }; static cl::opt Arch("march", cl::desc("Architecture to generate assembly for:"), cl::Prefix, cl::values(clEnumValN(X86, "x86", " IA-32 (Pentium and above)"), - clEnumValN(Sparc, "sparc", " SPARC V9"), + clEnumValN(SparcV9, "sparcv9", " SPARC V9"), clEnumValN(PowerPC, "powerpc", " PowerPC"), clEnumValN(CBackend, "c", " C backend"), 0), @@ -90,8 +90,8 @@ int main(int argc, char **argv) { case X86: TargetMachineAllocator = allocateX86TargetMachine; break; - case Sparc: - TargetMachineAllocator = allocateSparcTargetMachine; + case SparcV9: + TargetMachineAllocator = allocateSparcV9TargetMachine; break; case PowerPC: TargetMachineAllocator = allocatePowerPCTargetMachine; @@ -109,14 +109,14 @@ int main(int argc, char **argv) { TargetMachineAllocator = allocatePowerPCTargetMachine; } else if (mod.getEndianness() == Module::BigEndian && mod.getPointerSize() == Module::Pointer64) { - TargetMachineAllocator = allocateSparcTargetMachine; + TargetMachineAllocator = allocateSparcV9TargetMachine; } else { // If the module is target independent, favor a target which matches the // current build system. #if defined(i386) || defined(__i386__) || defined(__x86__) TargetMachineAllocator = allocateX86TargetMachine; #elif defined(sparc) || defined(__sparc__) || defined(__sparcv9) - TargetMachineAllocator = allocateSparcTargetMachine; + TargetMachineAllocator = allocateSparcV9TargetMachine; #elif defined(__POWERPC__) || defined(__ppc__) || defined(__APPLE__) TargetMachineAllocator = allocatePowerPCTargetMachine; #else diff --git a/tools/lli/Makefile b/tools/lli/Makefile index 72cb3d6f82f..617518c7c1d 100644 --- a/tools/lli/Makefile +++ b/tools/lli/Makefile @@ -40,10 +40,10 @@ endif # What the Sparc JIT requires ifdef ENABLE_SPARC_JIT CPPFLAGS += -DENABLE_SPARC_JIT - JITLIBS += sparc - ARCHLIBS += sched livevar instrument.a profpaths \ - bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \ - select + JITLIBS += sparcv9 + ARCHLIBS += sched sparcv9livevar instrument.a profpaths \ + bcwriter transforms.a ipo.a ipa.a datastructure.a \ + sparcv9regalloc sparcv9select endif USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \ diff --git a/tools/llvm-db/Makefile b/tools/llvm-db/Makefile index e261f81c60c..c7e4850e6a5 100644 --- a/tools/llvm-db/Makefile +++ b/tools/llvm-db/Makefile @@ -41,10 +41,10 @@ endif # What the Sparc JIT requires ifdef ENABLE_SPARC_JIT CPPFLAGS += -DENABLE_SPARC_JIT - JITLIBS += sparc - ARCHLIBS += sched livevar instrument.a profpaths \ - bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \ - select + JITLIBS += sparcv9 + ARCHLIBS += sched sparcv9livevar instrument.a profpaths \ + bcwriter transforms.a ipo.a ipa.a datastructure.a \ + sparcv9regalloc sparcv9select endif USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \ -- 2.34.1