Ticket #6793: cxa-haiku.patch

build/jam/BuildSetup

@@ -491 +491 @@
 ;
 HAIKU_LIBRARY_BEGIN_GLUE_CODE =
     <src!system!glue!arch!$(HAIKU_ARCH)>crti.o
-    crtbegin.o
+    crtbeginS.o
     <src!system!glue>init_term_dyn.o
 ;
 HAIKU_LIBRARY_END_GLUE_CODE =
-    crtend.o
+    crtendS.o
     <src!system!glue!arch!$(HAIKU_ARCH)>crtn.o
 ;
 HAIKU_EXECUTABLE_BEGIN_GLUE_CODE =
@@ -504 +504 @@
     <src!system!glue>start_dyn.o
     <src!system!glue>init_term_dyn.o
 ;
-HAIKU_EXECUTABLE_END_GLUE_CODE = $(HAIKU_LIBRARY_END_GLUE_CODE) ;
+HAIKU_EXECUTABLE_END_GLUE_CODE =
+    crtend.o
+    <src!system!glue!arch!$(HAIKU_ARCH)>crtn.o
+;
 HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = crtbegin.o
     <src!system!glue>haiku_version_glue.o ;
 HAIKU_KERNEL_ADDON_END_GLUE_CODE = $(HAIKU_GCC_LIBGCC) crtend.o ;
 
-SEARCH on crtbegin.o crtend.o = $(HAIKU_GCC_LIB_DIR) ;
+SEARCH on crtbegin.o crtend.o crtbeginS.o crtendS.o = $(HAIKU_GCC_LIB_DIR) ;
 
 HAIKU_EXECUTABLE_MIME_TYPE = "application/x-vnd.Be-elfexecutable" ;
 

src/system/runtime_loader/Jamfile

@@ -8 +8 @@
 # Don't let gcc inject built-in function code. This will cause dependencies
 # to libroot, which we don't link against.
 SubDirCcFlags -fno-builtin ;
-SubDirC++Flags -fno-builtin -fno-exceptions ;
+SubDirC++Flags -fno-builtin -fno-exceptions -fno-use-cxa-atexit ;
 
 DEFINES +=
     KMESSAGE_CONTAINER_ONLY