From d7f7719e5e082c0b8ea2182dcbd2242b7834aa26 Mon Sep 17 00:00:00 2001 From: Roman Divacky Date: Tue, 4 May 2010 16:11:02 +0000 Subject: Update LLVM to r103004. --- examples/ExceptionDemo/ExceptionDemo.cpp | 5 ++--- examples/ExceptionDemo/Makefile | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/ExceptionDemo/ExceptionDemo.cpp b/examples/ExceptionDemo/ExceptionDemo.cpp index 46dc4810214ba..bbca963707617 100644 --- a/examples/ExceptionDemo/ExceptionDemo.cpp +++ b/examples/ExceptionDemo/ExceptionDemo.cpp @@ -813,8 +813,7 @@ _Unwind_Reason_Code ourPersonality(int version, } #endif - const uint8_t* lsda = (uint8_t*) - _Unwind_GetLanguageSpecificData(context); + const uint8_t* lsda = _Unwind_GetLanguageSpecificData(context); #ifdef DEBUG fprintf(stderr, @@ -1949,7 +1948,7 @@ int main(int argc, char* argv[]) { } // If not set, exception handling will not be turned on - llvm::DwarfExceptionHandling = true; + llvm::JITExceptionHandling = true; llvm::InitializeNativeTarget(); llvm::LLVMContext& context = llvm::getGlobalContext(); diff --git a/examples/ExceptionDemo/Makefile b/examples/ExceptionDemo/Makefile index 06bba66e8bf3b..480744730eb79 100644 --- a/examples/ExceptionDemo/Makefile +++ b/examples/ExceptionDemo/Makefile @@ -9,9 +9,8 @@ LEVEL = ../.. TOOLNAME = ExceptionDemo EXAMPLE_TOOL = 1 +REQUIRES_EH = 1 LINK_COMPONENTS := jit interpreter nativecodegen include $(LEVEL)/Makefile.common - -CXXFLAGS += -fexceptions -- cgit v1.3