diff --git a/lib/Target/Sparc/SparcV8ISelSimple.cpp b/lib/Target/Sparc/SparcV8ISelSimple.cpp
index 67cac56f1f5..47a2d010ef6 100644
--- a/lib/Target/Sparc/SparcV8ISelSimple.cpp
+++ b/lib/Target/Sparc/SparcV8ISelSimple.cpp
@@ -1336,8 +1336,17 @@ void V8ISel::LowerUnknownIntrinsicFunctionCalls(Function &F) {
 
 
 void V8ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) {
-  unsigned TmpReg1, TmpReg2;
   switch (ID) {
-  default: assert(0 && "Intrinsic not supported!");
+  default:
+    std::cerr << "Sorry, unknown intrinsic function call:\n" << CI; abort ();
+
+  case Intrinsic::vastart:
+    std::cerr << "Sorry, va_start intrinsic still unsupported:\n" << CI; abort ();
+
+  case Intrinsic::vaend:
+    std::cerr << "Sorry, va_end intrinsic still unsupported:\n" << CI; abort ();
+
+  case Intrinsic::vacopy:
+    std::cerr << "Sorry, va_copy intrinsic still unsupported:\n" << CI; abort ();
   }
 }
diff --git a/lib/Target/SparcV8/SparcV8ISelSimple.cpp b/lib/Target/SparcV8/SparcV8ISelSimple.cpp
index 67cac56f1f5..47a2d010ef6 100644
--- a/lib/Target/SparcV8/SparcV8ISelSimple.cpp
+++ b/lib/Target/SparcV8/SparcV8ISelSimple.cpp
@@ -1336,8 +1336,17 @@ void V8ISel::LowerUnknownIntrinsicFunctionCalls(Function &F) {
 
 
 void V8ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) {
-  unsigned TmpReg1, TmpReg2;
   switch (ID) {
-  default: assert(0 && "Intrinsic not supported!");
+  default:
+    std::cerr << "Sorry, unknown intrinsic function call:\n" << CI; abort ();
+
+  case Intrinsic::vastart:
+    std::cerr << "Sorry, va_start intrinsic still unsupported:\n" << CI; abort ();
+
+  case Intrinsic::vaend:
+    std::cerr << "Sorry, va_end intrinsic still unsupported:\n" << CI; abort ();
+
+  case Intrinsic::vacopy:
+    std::cerr << "Sorry, va_copy intrinsic still unsupported:\n" << CI; abort ();
   }
 }