diff --git a/llvm/runtime/GCCLibraries/crtend/C++-Exception.h b/llvm/runtime/GCCLibraries/crtend/C++-Exception.h
index 133f43a58ecc..d66b8acd7c98 100644
--- a/llvm/runtime/GCCLibraries/crtend/C++-Exception.h
+++ b/llvm/runtime/GCCLibraries/crtend/C++-Exception.h
@@ -12,6 +12,11 @@
 #include <typeinfo>
 #include <cassert>
 
+// Assert should only be used for debugging the runtime library.  Enabling it in
+// CVS will break some platforms!
+#undef assert
+#define assert(X)
+
 struct llvm_cxx_exception {
   // TypeInfo - A pointer to the C++ std::type_info object for this exception
   // class.  This is required because the class may not be polymorphic.
diff --git a/llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp b/llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp
index 8bc13e7659f9..0221df1e4375 100644
--- a/llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp
+++ b/llvm/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp
@@ -9,6 +9,11 @@
 #include <cstdlib>
 #include <cassert>
 
+// Assert should only be used for debugging the runtime library.  Enabling it in
+// CVS will break some platforms!
+#undef assert
+#define assert(X)
+
 // get_sjlj_exception - Adjust the llvm_exception pointer to be an appropriate
 // llvm_sjlj_exception pointer.
 inline llvm_sjlj_exception *get_sjlj_exception(llvm_exception *E) {