Ticket #6793: cxa-gcc.patch

gcc/config.gcc

@@ -1060 +1060 @@
 i[34567]86-*-haiku*)
     tmake_file='t-haiku i386/t-crtpic'
     tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h haiku.h i386/haiku.h"
-    extra_parts='crtbegin.o crtend.o'
+    extra_parts='crtbegin.o crtend.o crtbeginS.o crtendS.o'
+    default_use_cxa_atexit=yes
     ;;
 x86_64-*-haiku*)
     tmake_file='t-haiku i386/t-haiku64 i386/t-crtpic'

gcc/config/haiku.h

@@ -66 +66 @@
 
 
 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!shared:%{!nostart:start_dyn.o%s}} init_term_dyn.o%s"
+#define STARTFILE_SPEC "crti.o%s %{shared|nostart:crtbeginS.o%s;:crtbegin.o%s} %{!shared:%{!nostart:start_dyn.o%s}} init_term_dyn.o%s"
 
 #undef  ENDFILE_SPEC
-#define ENDFILE_SPEC "crtend.o%s crtn.o%s"
+#define ENDFILE_SPEC "%{shared|nostart:crtendS.o%s;:crtend.o%s} crtn.o%s"
 
 /* For native compiler, use standard Haiku include file search paths
    rooted in /boot/develop/headers.  For a cross compiler, don't