diff mbox

cygwin: __cxa_atexit support

Message ID 53ED21AB.3050905@redhat.com
State New
Headers show

Commit Message

Yaakov Selkowitz Aug. 14, 2014, 8:52 p.m. UTC 
This patch implements __cxa_atexit support for Cygwin targets.  This 
requires Cygwin 1.7.32 and binutils master.

Net difference in check-c++ results on i686-pc-cygwin:
# of unexpected failures        -11
# of unexpected successes       -3
# of expected failures          -61
# of unsupported tests          -46

Comments

Kai Tietz Aug. 19, 2014, 3:27 p.m. UTC | #1 
Patch is ok. Applied this patch at revision 214162 together with your
followup-patch at revision 214161.

Thanks,
Kai
diff mbox

Patch

Index: gcc/config/i386/cygwin.h
===================================================================
--- gcc/config/i386/cygwin.h	(revision 213759)
+++ gcc/config/i386/cygwin.h	(working copy)
@@ -40,7 +40,7 @@ 
 #define STARTFILE_SPEC "\
   %{!shared: %{!mdll: crt0%O%s \
   %{pg:gcrt0%O%s}}}\
-  crtbegin.o%s"
+  %{shared:crtbeginS.o%s;:crtbegin.o%s}"
 
 #undef ENDFILE_SPEC
 #define ENDFILE_SPEC \
Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc	(revision 213759)
+++ gcc/config.gcc	(working copy)
@@ -1575,6 +1575,7 @@ 
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
 	fi
+	default_use_cxa_atexit=yes
 	use_gcc_stdint=wrap
 	;;
 x86_64-*-cygwin*)
@@ -1590,6 +1591,7 @@ 
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
 	fi
+	default_use_cxa_atexit=yes
 	use_gcc_stdint=wrap
 	tm_defines="${tm_defines} TARGET_CYGWIN64=1"
 	;;
Index: libgcc/config/i386/cygming-crtbegin.c
===================================================================
--- libgcc/config/i386/cygming-crtbegin.c	(revision 213759)
+++ libgcc/config/i386/cygming-crtbegin.c	(working copy)
@@ -111,6 +111,23 @@ 
   = { };
 #endif
 
+#ifdef __CYGWIN__
+/* Declare the __dso_handle variable.  It should have a unique value
+   in every shared-object; in a main program its value is zero.  The
+   object should in any case be protected.  This means the instance
+   in one DSO or the main program is not used in another object.  The
+   dynamic linker takes care of this.  */
+
+#ifdef CRTSTUFFS_O
+extern void *__ImageBase;
+void *__dso_handle = &__ImageBase;
+#else
+void *__dso_handle = 0;
+#endif
+
+#endif /* __CYGWIN__ */
+
+
 /* Pull in references from libgcc.a(unwind-dw2-fde.o) in the
    startfile. These are referenced by a ctor and dtor in crtend.o.  */
 extern void __gcc_register_frame (void);
@@ -161,6 +178,13 @@ 
 	register_class_fn (__JCR_LIST__);
     }
 #endif
+
+#if DEFAULT_USE_CXA_ATEXIT
+  /* If we use the __cxa_atexit method to register C++ dtors
+     at object construction,  also use atexit to register eh frame
+     info cleanup.  */
+  atexit(__gcc_deregister_frame);
+#endif /* DEFAULT_USE_CXA_ATEXIT */
 }
 
 void
Index: libgcc/config/i386/cygming-crtend.c
===================================================================
--- libgcc/config/i386/cygming-crtend.c	(revision 213759)
+++ libgcc/config/i386/cygming-crtend.c	(working copy)
@@ -70,12 +70,6 @@ 
 register_frame_ctor (void)
 {
   __gcc_register_frame ();
-#if DEFAULT_USE_CXA_ATEXIT
-  /* If we use the __cxa_atexit method to register C++ dtors
-     at object construction,  also use atexit to register eh frame
-     info cleanup.  */
-  atexit (__gcc_deregister_frame);
-#endif
 }
 
 #if !DEFAULT_USE_CXA_ATEXIT
Index: libgcc/config/i386/t-cygming
===================================================================
--- libgcc/config/i386/t-cygming	(revision 213759)
+++ libgcc/config/i386/t-cygming	(working copy)
@@ -8,6 +8,9 @@ 
 crtbegin.o: $(srcdir)/config/i386/cygming-crtbegin.c
 	$(crt_compile) -fno-omit-frame-pointer  -c $<
 
+crtbeginS.o: $(srcdir)/config/i386/cygming-crtbegin.c
+	$(crt_compile) -fno-omit-frame-pointer  -c $< -DCRTSTUFFS_O
+
 # We intentionally use a implementation-reserved init priority of 0,
 # so allow the warning.
 crtend.o: $(srcdir)/config/i386/cygming-crtend.c
Index: libgcc/config.host
===================================================================
--- libgcc/config.host	(revision 213759)
+++ libgcc/config.host	(working copy)
@@ -614,7 +614,7 @@ 
 i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
 	;;
 i[34567]86-*-cygwin*)
-	extra_parts="crtbegin.o crtend.o crtfastmath.o"
+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtfastmath.o"
 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
 	if test x$enable_sjlj_exceptions = xyes; then
 		tmake_eh_file="i386/t-sjlj-eh"
@@ -630,7 +630,7 @@ 
 	tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-cygwin i386/t-crtfm i386/t-chkstk t-dfprules"
 	;;
 x86_64-*-cygwin*)
-	extra_parts="crtbegin.o crtend.o crtfastmath.o"
+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtfastmath.o"
 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
 	if test x$enable_sjlj_exceptions = xyes; then
 		tmake_eh_file="i386/t-sjlj-eh"