diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index fb0d06080db..0f77156cc5e 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -9,6 +9,7 @@
 LEVEL = ../..
 TOOLNAME = llc
 USEDLIBS = cwriter \
+	   sparcv8 \
            sparcv9 \
            x86 \
            powerpc \
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index d7c9faeb261..7e800f11319 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -37,13 +37,14 @@ OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename"));
 
 static cl::opt<bool> Force("f", cl::desc("Overwrite output files"));
 
-enum ArchName { noarch, X86, SparcV9, PowerPC, CBackend };
+enum ArchName { noarch, X86, SparcV8, SparcV9, PowerPC, CBackend };
 
 static cl::opt<ArchName>
 Arch("march", cl::desc("Architecture to generate assembly for:"), cl::Prefix,
      cl::values(clEnumValN(X86,      "x86",     "  IA-32 (Pentium and above)"),
+                clEnumValN(SparcV8,  "sparcv8", "  SPARC V8 (experimental)"),
                 clEnumValN(SparcV9,  "sparcv9", "  SPARC V9"),
-                clEnumValN(PowerPC,  "powerpc", "  PowerPC"),
+                clEnumValN(PowerPC,  "powerpc", "  PowerPC (experimental)"),
                 clEnumValN(CBackend, "c",       "  C backend"),
 		0),
      cl::init(noarch));
@@ -93,6 +94,9 @@ int main(int argc, char **argv) {
   case SparcV9:
     TargetMachineAllocator = allocateSparcV9TargetMachine;
     break;
+  case SparcV8:
+    TargetMachineAllocator = allocateSparcV8TargetMachine;
+    break;
   case PowerPC:
     TargetMachineAllocator = allocatePowerPCTargetMachine;
     break;