diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index 0f0eb72628e..e3885a93581 100644
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -12,5 +12,6 @@ USEDLIBS = LLVMAsmParser.a LLVMBCReader.a LLVMAnalysis.a LLVMipa.a \
            LLVMDataStructure \
 	   LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \
 	   LLVMTransformUtils.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile
index 338122ac148..b713650983d 100644
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@@ -17,5 +17,6 @@ USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
 	   LLVMTransformUtils.a \
 	   LLVMAsmParser.a LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
 	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile
index 55b0379941a..1f62ade4ed2 100644
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@@ -12,5 +12,6 @@ TOOLNAME = gccas
 USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a LLVMipa.a \
            LLVMScalarOpts.a LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils.a \
            LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gccld/Makefile b/tools/gccld/Makefile
index 44c6be9834b..7638f7fb25d 100644
--- a/tools/gccld/Makefile
+++ b/tools/gccld/Makefile
@@ -14,5 +14,6 @@ USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
            LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
            LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
            LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 53f98137c2c..80af5aa9b17 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -9,6 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llc
+REQUIRES_EH := 1
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 
diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 0e537f9d7dd..8952b12f985 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -9,6 +9,7 @@
 LEVEL    := ../..
 TOOLNAME := lli
 LLVMLIBS := JIT
+REQUIRES_EH := 1
 
 # Enable JIT support
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-ar/Makefile b/tools/llvm-ar/Makefile
index fbc2bcf3530..18da6176820 100644
--- a/tools/llvm-ar/Makefile
+++ b/tools/llvm-ar/Makefile
@@ -11,6 +11,7 @@ LEVEL = ../..
 TOOLNAME = llvm-ar
 USEDLIBS = LLVMArchive.a LLVMBCReader.a \
 	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/llvm-as/Makefile b/tools/llvm-as/Makefile
index 73dcb06aff4..bd7c3d3eec0 100644
--- a/tools/llvm-as/Makefile
+++ b/tools/llvm-as/Makefile
@@ -10,5 +10,6 @@ LEVEL = ../..
 TOOLNAME = llvm-as
 USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \
            LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-bcanalyzer/Makefile b/tools/llvm-bcanalyzer/Makefile
index 79146463142..b3acd0157e0 100644
--- a/tools/llvm-bcanalyzer/Makefile
+++ b/tools/llvm-bcanalyzer/Makefile
@@ -10,4 +10,6 @@ LEVEL = ../..
 
 TOOLNAME = llvm-bcanalyzer
 USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
+
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
index 413fd0a53a3..16d8ba739fe 100644
--- a/tools/llvm-config/Makefile
+++ b/tools/llvm-config/Makefile
@@ -10,6 +10,7 @@
 LEVEL = ../..
 
 EXTRA_DIST = LibDeps.txt FinalLibDeps.txt llvm-config.in.in find-cycles.pl
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/llvm-db/Makefile b/tools/llvm-db/Makefile
index 31ebbba59cd..e7bc95fa5da 100644
--- a/tools/llvm-db/Makefile
+++ b/tools/llvm-db/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../..
 TOOLNAME = llvm-db
 USEDLIBS = LLVMDebugger LLVMBCReader.a LLVMCore.a LLVMSupport.a \
 	  LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-dis/Makefile b/tools/llvm-dis/Makefile
index 8e54fb347c8..011409e3dd5 100644
--- a/tools/llvm-dis/Makefile
+++ b/tools/llvm-dis/Makefile
@@ -10,4 +10,6 @@ LEVEL = ../..
 
 TOOLNAME = llvm-dis
 USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
+
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-extract/Makefile b/tools/llvm-extract/Makefile
index 73d5883403a..20a107c5c76 100644
--- a/tools/llvm-extract/Makefile
+++ b/tools/llvm-extract/Makefile
@@ -12,5 +12,6 @@ TOOLNAME = llvm-extract
 USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a \
 	   LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
            LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-ld/Makefile b/tools/llvm-ld/Makefile
index eb2158a252a..636aea4ef61 100644
--- a/tools/llvm-ld/Makefile
+++ b/tools/llvm-ld/Makefile
@@ -14,5 +14,6 @@ USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
 	   LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
 	   LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
 	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-link/Makefile b/tools/llvm-link/Makefile
index 41594f2c51e..0663396cdd9 100644
--- a/tools/llvm-link/Makefile
+++ b/tools/llvm-link/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../..
 TOOLNAME = llvm-link
 USEDLIBS = LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
 	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-nm/Makefile b/tools/llvm-nm/Makefile
index 996b3494de9..c7502e23061 100644
--- a/tools/llvm-nm/Makefile
+++ b/tools/llvm-nm/Makefile
@@ -11,4 +11,6 @@ LEVEL = ../..
 TOOLNAME = llvm-nm
 USEDLIBS = LLVMArchive.a LLVMBCReader.a \
 	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
+
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-prof/Makefile b/tools/llvm-prof/Makefile
index 029297a5711..9774f64fa1a 100644
--- a/tools/llvm-prof/Makefile
+++ b/tools/llvm-prof/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../..
 TOOLNAME = llvm-prof
 USEDLIBS = LLVMAnalysis.a LLVMBCReader.a \
            LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-ranlib/Makefile b/tools/llvm-ranlib/Makefile
index b97c17c79a2..1379532f5ee 100644
--- a/tools/llvm-ranlib/Makefile
+++ b/tools/llvm-ranlib/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../..
 TOOLNAME = llvm-ranlib
 USEDLIBS = LLVMArchive.a LLVMBCReader.a \
 	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm2cpp/Makefile b/tools/llvm2cpp/Makefile
index d6b65c8923c..cc3169c46f1 100644
--- a/tools/llvm2cpp/Makefile
+++ b/tools/llvm2cpp/Makefile
@@ -9,6 +9,7 @@
 LEVEL = ../..
 TOOLNAME = llvm2cpp
 USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/llvmc/Makefile b/tools/llvmc/Makefile
index 62fa82e3250..0e63d132594 100644
--- a/tools/llvmc/Makefile
+++ b/tools/llvmc/Makefile
@@ -11,6 +11,7 @@ TOOLNAME = llvmc
 USEDLIBS = LLVMCore.a LLVMSupport.a LLVMSystem.a
 CONFIG_FILES = c cpp ll
 EXTRA_DIST = c cpp ll ConfigLexer.cpp.cvs ConfigLexer.l.cvs
+REQUIRES_EH := 1
 
 # The CompilerDriver needs to know the locations of several configured
 # directories and paths. We define these as preprocessor symbols so they can 
diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index c262040ea88..f310639c08b 100644
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -8,6 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = opt
+REQUIRES_EH := 1
 
 USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMInstrumentation.a \
 	   LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure LLVMTransforms.a \