[llvm-commits] CVS: llvm/Makefile.rules

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.394 -> 1.395
---
Log message:

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: http://llvm.org/PR797  is completely
fixed. Once libraries like lib/System and lib/Support are exception free,
we can turn it back on.


---
Diffs of the changes:  (+5 -5)

 Makefile.rules |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.394 llvm/Makefile.rules:1.395
--- llvm/Makefile.rules:1.394	Fri Aug 18 04:30:03 2006
+++ llvm/Makefile.rules	Fri Aug 18 12:22:07 2006
@@ -206,6 +206,11 @@
   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 @@
   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)