diff --git a/runtime/GCCLibraries/crtend/Makefile b/runtime/GCCLibraries/crtend/Makefile
index 9bfb9d1ed85..f542f53d41d 100644
--- a/runtime/GCCLibraries/crtend/Makefile
+++ b/runtime/GCCLibraries/crtend/Makefile
@@ -3,9 +3,9 @@ BYTECODE_LIBRARY=1
 DONT_BUILD_RELINKED=1
 LIBRARYNAME=crtend
 
-Source = crtend.c listend.ll
+Source = $(wildcard *.cpp) $(wildcard *.c) listend.ll
 
-EXPORTED_SYMBOL_LIST = __main,llvm.global_ctors,llvm.global_dtors
+EXPORTED_SYMBOL_FILE = exported_symbol_list.lst
 
 include $(LEVEL)/Makefile.common
 
@@ -14,4 +14,5 @@ $(LLVMGCCDIR)/bytecode-libs/crtend.o: $(LIBNAME_BC)
 	@cp $< $@
 
 install:: $(LLVMGCCDIR)/bytecode-libs/crtend.o
-	@rm $(LLVMGCCDIR)/bytecode-libs/libcrtend.bc
\ No newline at end of file
+	@rm $(LLVMGCCDIR)/bytecode-libs/libcrtend.bc
+
diff --git a/runtime/GCCLibraries/crtend/exported_symbol_list.lst b/runtime/GCCLibraries/crtend/exported_symbol_list.lst
new file mode 100644
index 00000000000..df12cc8a7b5
--- /dev/null
+++ b/runtime/GCCLibraries/crtend/exported_symbol_list.lst
@@ -0,0 +1,29 @@
+__main
+llvm.global_ctors
+llvm.global_dtors
+
+__llvm_eh_has_uncaught_exception
+__llvm_eh_current_uncaught_exception_type
+__llvm_eh_add_uncaught_exception
+__llvm_eh_get_uncaught_exception
+__llvm_eh_pop_from_uncaught_stack
+
+__llvm_cxxeh_allocate_exception
+__llvm_cxxeh_free_exception
+__llvm_cxxeh_throw
+__llvm_cxxeh_call_terminate
+__llvm_cxxeh_current_uncaught_exception_isa
+__llvm_cxxeh_begin_catch
+__llvm_cxxeh_begin_catch_if_isa
+__llvm_cxxeh_end_catch
+__llvm_cxxeh_rethrow
+__llvm_cxxeh_get_last_caught
+__llvm_cxxeh_check_eh_spec
+
+__llvm_sjljeh_throw_longjmp
+__llvm_sjljeh_init_setjmpmap
+__llvm_sjljeh_destroy_setjmpmap
+__llvm_sjljeh_add_setjmp_to_map
+__llvm_sjljeh_is_longjmp_exception
+__llvm_sjljeh_get_longjmp_value
+__llvm_sjljeh_try_catching_longjmp_exception