aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/GCCLibraries/crtend/C++-Exception.h5
-rw-r--r--runtime/GCCLibraries/crtend/SJLJ-Exception.cpp5
2 files changed, 10 insertions, 0 deletions
diff --git a/runtime/GCCLibraries/crtend/C++-Exception.h b/runtime/GCCLibraries/crtend/C++-Exception.h
index 133f43a58e..d66b8acd7c 100644
--- a/runtime/GCCLibraries/crtend/C++-Exception.h
+++ b/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/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp b/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp
index 8bc13e7659..0221df1e43 100644
--- a/runtime/GCCLibraries/crtend/SJLJ-Exception.cpp
+++ b/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) {