diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index fad43176dc58..6351edae213c 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -1,96 +1,107 @@
 # $FreeBSD$
 
 CLANG_SRCS=${LLVM_SRCS}/tools/clang
 
 CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
 	-I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \
 	-I${LLVM_SRCS}/../../lib/clang/include \
 	-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \
 	-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG
 
 # Correct for gcc miscompilation when compiling on PPC with -O2
 .if ${MACHINE_ARCH} == "powerpc"
 CFLAGS+= -O1
 .endif
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 # XXX: 8.0, to keep __FreeBSD_cc_version happy
 CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\"
 
+.ifndef LLVM_REQUIRES_EH
+CFLAGS+=-fno-exceptions
+.else
+# If the library or program requires EH, it also requires RTTI.
+LLVM_REQUIRES_RTTI=
+.endif
+
+.ifndef LLVM_REQUIRES_RTTI
+CFLAGS+=-fno-rtti
+.endif
+
 .PATH:	${LLVM_SRCS}/${SRCDIR}
 
 TBLGEN=tblgen ${CFLAGS:M-I*}
 
 Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/Intrinsics.td
 	${TBLGEN} -gen-intrinsic \
 		${LLVM_SRCS}/include/llvm/Intrinsics.td > ${.TARGET}
 .for arch in \
 	ARM/ARM Mips/Mips PowerPC/PPC X86/X86
 . for hdr in \
 	AsmMatcher/-gen-asm-matcher \
 	AsmWriter1/-gen-asm-writer,-asmwriternum=1 \
 	AsmWriter/-gen-asm-writer \
 	CallingConv/-gen-callingconv \
 	CodeEmitter/-gen-emitter \
 	DAGISel/-gen-dag-isel \
 	FastISel/-gen-fast-isel \
 	InstrInfo/-gen-instr-desc \
 	InstrNames/-gen-instr-enums \
 	RegisterInfo.h/-gen-register-desc-header \
 	RegisterInfo/-gen-register-desc \
 	RegisterNames/-gen-register-enums \
 	Subtarget/-gen-subtarget
 ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
 	${TBLGEN} ${hdr:T:C/,/ /g} \
 		${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td > ${.TARGET}
 . endfor
 .endfor
 
 Attrs.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Basic \
 	  -gen-clang-attr-classes ${.ALLSRC} > ${.TARGET}
 
 AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Basic \
 	  -gen-clang-attr-list ${.ALLSRC} > ${.TARGET}
 
 DeclNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Basic \
 	  -gen-clang-decl-nodes ${.ALLSRC} > ${.TARGET}
 
 StmtNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/AST \
 	  -gen-clang-stmt-nodes ${.ALLSRC} > ${.TARGET}
 
 arm_neon.inc.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Basic \
 	  -gen-arm-neon-sema ${.ALLSRC} > ${.TARGET}
 
 DiagnosticGroups.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Basic \
 		-gen-clang-diag-groups \
 		${CLANG_SRCS}/include/clang/Basic/Diagnostic.td > ${.TARGET}
 .for hdr in AST Analysis Common Driver Frontend Lex Parse Sema
 Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Basic \
 		-gen-clang-diags-defs -clang-component=${hdr} \
 		${CLANG_SRCS}/include/clang/Basic/Diagnostic.td > ${.TARGET}
 .endfor
 Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Driver \
 	   -gen-opt-parser-defs \
 	   ${CLANG_SRCS}/include/clang/Driver/Options.td > ${.TARGET}
 
 CC1Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1Options.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Driver \
 	   -gen-opt-parser-defs \
 	   ${CLANG_SRCS}/include/clang/Driver/CC1Options.td > ${.TARGET}
 
 CC1AsOptions.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td
 	${TBLGEN} -I${CLANG_SRCS}/include/clang/Driver \
 	   -gen-opt-parser-defs \
 	   ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td > ${.TARGET}
 
 SRCS+=		${TGHDRS:C/$/.inc.h/}
 DPADD+=		${TGHDRS:C/$/.inc.h/}
 CLEANFILES+=	${TGHDRS:C/$/.inc.h/}
diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile
index 1215f4ef1d18..4fa54714b99c 100644
--- a/lib/clang/libllvmcore/Makefile
+++ b/lib/clang/libllvmcore/Makefile
@@ -1,41 +1,42 @@
 # $FreeBSD$
 
 LIB=	llvmcore
 
 SRCDIR=	lib/VMCore
 SRCS=	AsmWriter.cpp \
 	Attributes.cpp \
 	AutoUpgrade.cpp \
 	BasicBlock.cpp \
 	ConstantFold.cpp \
 	Constants.cpp \
 	Core.cpp \
 	DebugLoc.cpp \
 	Dominators.cpp \
 	Function.cpp \
 	GVMaterializer.cpp \
 	Globals.cpp \
 	IRBuilder.cpp \
 	InlineAsm.cpp \
 	Instruction.cpp \
 	Instructions.cpp \
 	IntrinsicInst.cpp \
 	LLVMContext.cpp \
 	LLVMContextImpl.cpp \
 	LeakDetector.cpp \
 	Metadata.cpp \
 	Module.cpp \
 	Pass.cpp \
 	PassManager.cpp \
 	PrintModulePass.cpp \
 	Type.cpp \
 	TypeSymbolTable.cpp \
 	Use.cpp \
 	Value.cpp \
 	ValueSymbolTable.cpp \
 	ValueTypes.cpp \
 	Verifier.cpp
+LLVM_REQUIRES_RTTI=
 
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index 3a96db20eb1b..1ed069ee019f 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -1,52 +1,53 @@
 # $FreeBSD$
 
 LIB=	llvmsupport
 
 SRCDIR=	lib/Support
 SRCS=	APFloat.cpp \
 	APInt.cpp \
 	APSInt.cpp \
 	Allocator.cpp \
 	CommandLine.cpp \
 	ConstantRange.cpp \
 	DAGDeltaAlgorithm.cpp \
 	Debug.cpp \
 	DeltaAlgorithm.cpp \
 	Dwarf.cpp \
 	ErrorHandling.cpp \
 	FileUtilities.cpp \
 	FoldingSet.cpp \
 	FormattedStream.cpp \
 	GraphWriter.cpp \
 	IsInf.cpp \
 	IsNAN.cpp \
 	ManagedStatic.cpp \
 	MemoryBuffer.cpp \
 	MemoryObject.cpp \
 	PluginLoader.cpp \
 	PrettyStackTrace.cpp \
 	Regex.cpp \
 	SlowOperationInformer.cpp \
 	SmallPtrSet.cpp \
 	SmallVector.cpp \
 	SourceMgr.cpp \
 	Statistic.cpp \
 	StringExtras.cpp \
 	StringMap.cpp \
 	StringPool.cpp \
 	StringRef.cpp \
 	SystemUtils.cpp \
 	TargetRegistry.cpp \
 	Timer.cpp \
 	Triple.cpp \
 	Twine.cpp \
 	circular_raw_ostream.cpp \
 	raw_os_ostream.cpp \
 	raw_ostream.cpp \
 	regcomp.c \
 	regerror.c \
 	regexec.c \
 	regfree.c \
 	regstrlcpy.c
+LLVM_REQUIRES_RTTI=
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsystem/Makefile b/lib/clang/libllvmsystem/Makefile
index ae8cdc905d23..0c08ec265bc8 100644
--- a/lib/clang/libllvmsystem/Makefile
+++ b/lib/clang/libllvmsystem/Makefile
@@ -1,26 +1,27 @@
 # $FreeBSD$
 
 LIB=	llvmsystem
 
 SRCDIR=	lib/System
 SRCS=	Alarm.cpp \
 	Atomic.cpp \
 	Disassembler.cpp \
 	DynamicLibrary.cpp \
 	Errno.cpp \
 	Host.cpp \
 	IncludeFile.cpp \
 	Memory.cpp \
 	Mutex.cpp \
 	Path.cpp \
 	Process.cpp \
 	Program.cpp \
 	RWMutex.cpp \
 	SearchForAddressOfSpecialSymbol.cpp \
 	Signals.cpp \
 	ThreadLocal.cpp \
 	Threading.cpp \
 	TimeValue.cpp \
 	Valgrind.cpp
+LLVM_REQUIRES_RTTI=
 
 .include "../clang.lib.mk"
diff --git a/usr.bin/clang/tblgen/Makefile b/usr.bin/clang/tblgen/Makefile
index 9cc687828fce..83741d08fc7a 100644
--- a/usr.bin/clang/tblgen/Makefile
+++ b/usr.bin/clang/tblgen/Makefile
@@ -1,46 +1,47 @@
 # $FreeBSD$
 
 PROG_CXX=tblgen
 
 SRCDIR=	utils/TableGen
 SRCS=	ARMDecoderEmitter.cpp \
 	AsmMatcherEmitter.cpp \
 	AsmWriterEmitter.cpp \
 	AsmWriterInst.cpp \
 	CallingConvEmitter.cpp \
 	ClangASTNodesEmitter.cpp \
 	ClangAttrEmitter.cpp \
 	ClangDiagnosticsEmitter.cpp \
 	CodeEmitterGen.cpp \
 	CodeGenDAGPatterns.cpp \
 	CodeGenInstruction.cpp \
 	CodeGenTarget.cpp \
 	DAGISelEmitter.cpp \
 	DAGISelMatcher.cpp \
 	DAGISelMatcherEmitter.cpp \
 	DAGISelMatcherGen.cpp \
 	DAGISelMatcherOpt.cpp \
 	DisassemblerEmitter.cpp \
 	EDEmitter.cpp \
 	FastISelEmitter.cpp \
 	InstrEnumEmitter.cpp \
 	InstrInfoEmitter.cpp \
 	IntrinsicEmitter.cpp \
 	LLVMCConfigurationEmitter.cpp \
 	NeonEmitter.cpp \
 	OptParserEmitter.cpp \
 	Record.cpp \
 	RegisterInfoEmitter.cpp \
 	SubtargetEmitter.cpp \
 	TGLexer.cpp \
 	TGParser.cpp \
 	TGValueTypes.cpp \
 	TableGen.cpp \
 	TableGenBackend.cpp \
 	X86DisassemblerTables.cpp \
 	X86RecognizableInstr.cpp
 MAN=
+LLVM_REQUIRES_EH=
 
 LIBDEPS=llvmsupport llvmsystem
 
 .include "../clang.prog.mk"