To avoid errors where a non-exception .o is on the stack between a throw

and a handler, which would produce errors like:
  terminate called after throwing an instance of 'std::string'
we must comment out setting -fno-exceptions until PR797 is completely
fixed. Once libraries like lib/System and lib/Support are exception free,
we can turn it back on.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29768 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 055baa08dc55ef637f39853df098db3f6d24f210..42c367a9499361bb0413c491d6389f697772f500 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -206,6 +206,11 @@ else
   OPTIMIZE_OPTION := -O2
 endif
 
+# IF REQUIRES_EH=1 is specified then don't disable exceptions
+#ifndef REQUIRES_EH
+#  CXX.Flags += -fno-exceptions
+#endif
+
 ifdef ENABLE_PROFILING
   BuildMode := Profile
   CXX.Flags := $(OPTIMIZE_OPTION) -pg -g
@@ -249,11 +254,6 @@ else
   C.Flags   += -D_DEBUG
 endif
 
-# IF REQUIRES_EH=1 is specified then don't disable exceptions
-ifndef REQUIRES_EH
-  CXX.Flags += -fno-exceptions
-endif
-
 CXX.Flags     += $(CXXFLAGS)
 C.Flags       += $(CFLAGS)
 CPP.BaseFlags += $(CPPFLAGS)