Index: gcc/ChangeLog.apple-ppc

2006-03-15  Geoffrey Keating  <geoffk@apple.com>

	Radar 3992198
	* config/i386/darwin.h (C_COMMON_OVERRIDE_OPTIONS): New.
	* config/rs6000/darwin.h  (C_COMMON_OVERRIDE_OPTIONS): Call
	SUBTARGET_C_COMMON_OVERRIDE_OPTIONS.
	* config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): NEw.
	* config/darwin-crt3.c: Be empty if __PIC__ is not defined.

Index: gcc/ChangeLog
2006-03-15  Geoffrey Keating  <geoffk@apple.com>

	Radar 3992198
	* config.gcc (*-*-darwin*): Don't build crt2.o for all Darwin ports.
	Do switch on default_use_cxa_atexit.
	(powerpc*-*-darwin*): Build crt2.o on powerpc.
	* config/darwin-crt3.o: New.
	* config/darwin.h (LINK_SPEC): If -shared-libgcc, make linker default
	to 10.3.  Pass '-multiply_defined suppress' if crt3.o is in use.
	(STARTFILE_SPEC): Add crt3.o when -shared-libgcc and appropriate
	OS version.
	* config/rs6000/t-darwin: Move crt2.o building to here.
	* config/rs6000/darwin.h (C_COMMON_OVERRIDE_OPTIONS): Update
	Mac OS version for using __cxa_get_exception_ptr.  Don't test versions
	of __cxa_atexit.

Index: gcc/testsuite/ChangeLog
2006-03-15  Geoffrey Keating  <geoffk@apple.com>

	Radar 3992198
	* g++.old-deja/g++.other/init18.C: New.
	* g++.old-deja/g++.other/init5.C: Remove xfail.



git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple-local-200502-branch@112151 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 367 insertions, 28 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3aa0c230457..b38d73ee712 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2006-03-15  Geoffrey Keating  <geoffk@apple.com>
+
+	Radar 3992198
+	* config.gcc (*-*-darwin*): Don't build crt2.o for all Darwin ports.
+	Do switch on default_use_cxa_atexit.
+	(powerpc*-*-darwin*): Build crt2.o on powerpc.
+	* config/darwin-crt3.o: New.
+	* config/darwin.h (LINK_SPEC): If -shared-libgcc, make linker default
+	to 10.3.  Pass '-multiply_defined suppress' if crt3.o is in use.
+	(STARTFILE_SPEC): Add crt3.o when -shared-libgcc and appropriate
+	OS version.
+	* config/rs6000/t-darwin: Move crt2.o building to here.
+	* config/rs6000/darwin.h (C_COMMON_OVERRIDE_OPTIONS): Update
+	Mac OS version for using __cxa_get_exception_ptr.  Don't test versions
+	of __cxa_atexit.
+
 2006-03-07  Geoffrey Keating  <geoffk@apple.com>
 
 	Radar 4466819
diff --git a/gcc/ChangeLog.apple-ppc b/gcc/ChangeLog.apple-ppc
index 2398d3d3f40..824cb3d23f9 100644
--- a/gcc/ChangeLog.apple-ppc
+++ b/gcc/ChangeLog.apple-ppc
@@ -1,3 +1,12 @@
+2006-03-15  Geoffrey Keating  <geoffk@apple.com>
+
+	Radar 3992198
+	* config/i386/darwin.h (C_COMMON_OVERRIDE_OPTIONS): New.
+	* config/rs6000/darwin.h  (C_COMMON_OVERRIDE_OPTIONS): Call
+	SUBTARGET_C_COMMON_OVERRIDE_OPTIONS.
+	* config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): NEw.
+	* config/darwin-crt3.c: Be empty if __PIC__ is not defined.
+
 2006-03-15  Devang Patel  <dpatel@apple.com>
 
 	Radar 4479522
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 3366ad328f6..1d1441c04e0 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -363,8 +363,12 @@ case ${target} in
   target_gtfiles="\$(srcdir)/config/darwin.c"
   c_target_objs="darwin-c.o"
   cxx_target_objs="darwin-c.o"
-  extra_parts="crt2.o"
+ # APPLE LOCAL begin mainline 2006-03-15 3992198
+ # APPLE LOCAL end mainline 2006-03-15 3992198
   extra_objs="darwin.o"
+ # APPLE LOCAL begin mainline 2006-03-15 3992198
+  default_use_cxa_atexit=yes
+ # APPLE LOCAL end mainline 2006-03-15 3992198
   case ${enable_threads} in
     "" | yes | posix) thread_file='posix' ;;
   esac
@@ -1579,6 +1583,9 @@ powerpc-*-beos*)
 powerpc-*-darwin*)
  # APPLE LOCAL begin mainline 2005-10-02 4218570
  # APPLE LOCAL end mainline 2005-10-02 4218570
+ # APPLE LOCAL begin mainline 2006-03-15 3992198
+	extra_parts="crt2.o"
+ # APPLE LOCAL end mainline 2006-03-15 3992198
 	case ${target} in
  # APPLE LOCAL begin mainline 2005-09-01 3449986
 	  *-darwin1[0-9]* | *-darwin[8-9]*)
diff --git a/gcc/config/darwin-crt3.c b/gcc/config/darwin-crt3.c
new file mode 100644
index 00000000000..a8152dfcf77
--- /dev/null
+++ b/gcc/config/darwin-crt3.c
@@ -0,0 +1,233 @@
+/* APPLE LOCAL file mainline 2006-03-15 3992198 */
+/* __cxa_atexit backwards-compatibility support for Darwin.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+In addition to the permissions in the GNU General Public License, the
+Free Software Foundation gives you unlimited permission to link the
+compiled version of this file into combinations with other programs,
+and to distribute those combinations without any restriction coming
+from the use of this file.  (The General Public License restrictions
+do apply in other respects; for example, they cover modification of
+the file, and distribution when not linked into a combine
+executable.)
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
+
+/* APPLE LOCAL kext */
+#ifdef __PIC__
+/* It is incorrect to include config.h here, because this file is being
+   compiled for the target, and hence definitions concerning only the host
+   do not apply.  */
+
+#include "tconfig.h"
+#include "tsystem.h"
+
+#include <dlfcn.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+/* This file works around two different problems.
+
+   The first problem is that there is no __cxa_atexit on Mac OS versions
+   before 10.4.  It fixes this by providing one, and having it called from
+   a destructor.  This is not quite as good as having a real __cxa_atexit,
+   but it's good enough to imitate the behaviour that you'd get if
+   you didn't have one.
+
+   The second problem is that on 10.4 Mac OS versions, __cxa_finalize
+   doesn't work right: it doesn't run routines that were registered
+   while other atexit routines are running.  This is worked around by
+   installing our own handler so that it runs last, and repeatedly
+   running __cxa_finalize until no new calls to __cxa_atexit are made.  */
+
+typedef int (*cxa_atexit_p)(void (*func) (void*), void* arg, void* dso);
+
+#ifdef __ppc__
+void __cxa_finalize (void* dso) __attribute__((weak));
+#else
+void __cxa_finalize (void* dso);
+#endif
+
+/* new_atexit_routines is set if __cxa_finalize exists in the system C
+   library and our copy of __cxa_atexit has been called.  */
+
+static bool new_atexit_routines;
+
+/* first_atexit_handler is called after all other atexit routines
+   that were registered before __cxa_finalize is called.
+   It may be called more than once, but is not re-entered.  */
+
+static void
+first_atexit_handler(void* dso)
+{
+  /* Keep running __cxa_finalize until no new atexit routines are
+     registered.  
+     Note that this means __cxa_finalize will be called at least twice,
+     even if the first call didn't register any new routines.  */
+  while (new_atexit_routines) {
+    new_atexit_routines = false;
+    __cxa_finalize (dso);
+  };
+}
+
+/* This is our wrapper around __cxa_atexit that's called if __cxa_finalize
+   exists in the system library.  All it does is, on its first call,
+   install first_atexit_handler; and on every call, set new_atexit_routines
+   and pass control to the system __cxa_atexit.
+   This proves to be somewhat more complicated than you might expect,
+   because it may be called in a multithreaded environment.  Fortunately
+   it turns out to be possible to do what's needed without resorting
+   to locking.  */
+
+static int
+cxa_atexit_wrapper (void (*func) (void*), void* arg, void* dso)
+{
+  static volatile cxa_atexit_p real_cxa_atexit;
+  cxa_atexit_p auto_cxa_atexit = real_cxa_atexit;
+  if (! auto_cxa_atexit)
+    {
+      void* handle = dlopen ("/usr/lib/libSystem.B.dylib", RTLD_NOLOAD);
+      if (! handle)
+	return -1;
+      
+      auto_cxa_atexit = (cxa_atexit_p)dlsym (handle, "__cxa_atexit");
+      if (! auto_cxa_atexit)
+	return -1;
+    }
+  /* At this point, auto_cxa_atexit contains the address of
+     the system __cxa_atexit.  */
+  if (! real_cxa_atexit)
+    {
+      /* Install our handler above before any other handlers
+	 for this image, so it will be called last.  */
+      int result = (*auto_cxa_atexit)(first_atexit_handler, dso, dso);
+      if (result != 0)
+	return result;
+      /* Now set the global real_cxa_atexit to prevent further
+	 installations of first_atexit_handler.  Do this after
+	 the installation so that if another thread sees it is set,
+	 it can be sure that first_atexit_handler really has been
+	 installed.  */
+      real_cxa_atexit = auto_cxa_atexit;
+    }
+  /* At this point, we know that first_atexit_handler has been
+     installed at least once, and real_cxa_atexit is not NULL.  */
+  /* It's not necessary to mark new_atexit_routines as volatile, so long
+     as this write eventually happens before this shared object is
+     unloaded.  */
+  new_atexit_routines = true;
+  /* Call the original __cxa_atexit for this function.  */
+  return (*auto_cxa_atexit)(func, arg, dso);
+}
+
+#ifdef __ppc__
+/* This code is used while running on 10.3.9, when __cxa_atexit doesn't
+   exist in the system library.  10.3.9 only supported regular PowerPC,
+   so this code isn't necessary on x86 or ppc64.  */
+
+/* This structure holds a routine to call.  */
+struct atexit_routine
+{
+  struct atexit_routine * next;
+  void (*func)(void *);
+  void * arg;
+};
+
+static struct atexit_routine * volatile atexit_routines_list;
+
+/* This is a builtin on GCC 4.2.  */
+static inline struct atexit_routine *
+__sync_val_compare_and_swap (struct atexit_routine * volatile * p,
+			     struct atexit_routine *old,
+			     struct atexit_routine *new) 
+{
+  struct atexit_routine *result;
+  asm ("	sync\n"
+       "0:	lwarx %0,0,%2\n"
+       "	cmpw%I3 %0,%3\n"
+       "	bne 1f\n"
+       "	stwcx. %4,0,%2\n"
+       "	bne- 0b\n"
+       "1:	isync"
+       : "=&r" (result), "+m"(*p)
+       : "b" (p), "rI" (old), "r" (new)
+       : "cr0");
+  return result;
+}
+
+/* If __cxa_atexit doesn't exist at all in the system library, this
+   routine is used; it completely emulates __cxa_atexit.  
+
+   This routine has to be thread-safe, but fortunately this just means
+   that it has to do atomic list insertion.  */
+
+static int
+cxa_atexit_substitute (void (*func) (void*), void* arg,
+		       /* The 'dso' value will always be equal to this
+			  object's __dso_handle.  */
+		       void* dso __attribute__((unused)))
+{
+  struct atexit_routine * s = malloc (sizeof (struct atexit_routine));
+  struct atexit_routine * next, * old_next;
+  if (!s)
+    return -1;
+  s->func = func;
+  s->arg = arg;
+  next = atexit_routines_list;
+  do {
+    s->next = old_next = next;
+    next = __sync_val_compare_and_swap (&atexit_routines_list, old_next, s);
+  } while (next != old_next);
+  return 0;
+}
+
+/* The routines added in cxa_atexit_substitute get run here, in a destructor.
+   This routine doesn't have to be thread-safe.  */
+
+static void cxa_dtor (void) __attribute__((destructor));
+static void
+cxa_dtor (void)
+{
+  while (atexit_routines_list)
+    {
+      struct atexit_routine * working_list = atexit_routines_list;
+      atexit_routines_list = NULL;
+      while (working_list)
+	{
+	  struct atexit_routine * called_routine = working_list;
+	  working_list->func (working_list->arg);
+	  working_list = working_list->next;
+	  free (called_routine);
+	}
+    }
+}
+#endif
+
+int __cxa_atexit (void (*func) (void*), void* arg, 
+		  void* dso) __attribute__((visibility("hidden")));
+int
+__cxa_atexit (void (*func) (void*), void* arg, void* dso)
+{
+#ifdef __ppc__
+  if (! __cxa_finalize)
+    return cxa_atexit_substitute (func, arg, dso);
+#endif
+  return cxa_atexit_wrapper (func, arg, dso);
+}
+/* APPLE LOCAL kext */
+#endif /* __PIC__ */
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index a56f44ecad1..fa42cda0e46 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -270,6 +270,13 @@ do {									\
   /* APPLE LOCAL end kexts */                                           \
 } while(0)
 
+/* APPLE LOCAL begin kexts */
+#define SUBTARGET_C_COMMON_OVERRIDE_OPTIONS do {	\
+  if (flag_apple_kext && flag_use_cxa_atexit == 2)	\
+    flag_use_cxa_atexit = 0;				\
+} while (0)
+/* APPLE LOCAL end kexts */
+
 #define SUBTARGET_INIT_BUILTINS		\
 do {					\
   darwin_init_cfstring_builtins ();	\
@@ -420,9 +427,16 @@ do {					\
    %{Zinit*:-init %*} \
 "/* APPLE LOCAL mainline 2005-09-01 3449986 */"\
    %{mmacosx-version-min=*:-macosx_version_min %*} \
+"/* APPLE LOCAL mainline 2006-03-15 3992198 */"\
+   %{!mmacosx-version-min=*:%{shared-libgcc:-macosx_version_min 10.3}} \
    %{nomultidefs} \
    %{Zmulti_module:-multi_module} %{Zsingle_module:-single_module} \
    %{Zmultiply_defined*:-multiply_defined %*} \
+"/* APPLE LOCAL begin mainline 2006-03-15 3992198 */"\
+   %{!Zmultiply_defined*:%{shared-libgcc: \
+     %:version-compare(< 10.5 mmacosx-version-min= -multiply_defined) \
+     %:version-compare(< 10.5 mmacosx-version-min= suppress)}} \
+"/* APPLE LOCAL end mainline 2006-03-15 3992198 */"\
    %{Zmultiplydefinedunused*:-multiply_defined_unused %*} \
    %{prebind} %{noprebind} %{nofixprebinding} %{prebind_all_twolevel_modules} \
    %{read_only_relocs} \
@@ -486,22 +500,28 @@ do {					\
        -lgcc}"
 
 /* APPLE LOCAL end mainline 2005-11-15 4276161 */
-/* We specify crt0.o as -lcrt0.o so that ld will search the library path.  */
-/* APPLE LOCAL begin mainline 2005-11-15 4271575 */
+/* APPLE LOCAL begin mainline 2006-03-15 3992198 */
+/* We specify crt0.o as -lcrt0.o so that ld will search the library path.
 
-#undef  STARTFILE_SPEC
-#define STARTFILE_SPEC  \
-  "%{!Zdynamiclib:%{Zbundle:%{!static:-lbundle1.o}} \
-     %{!Zbundle:%{pg:%{static:-lgcrt0.o} \
-                     %{!static:%{object:-lgcrt0.o} \
-                               %{!object:%{preload:-lgcrt0.o} \
-                                 %{!preload:-lgcrt1.o %(darwin_crt2)}}}} \
-                %{!pg:%{static:-lcrt0.o} \
-                      %{!static:%{object:-lcrt0.o} \
-                                %{!object:%{preload:-lcrt0.o} \
-                                  %{!preload:-lcrt1.o %(darwin_crt2)}}}}}}"
-/* APPLE LOCAL end mainline 2005-11-15 4271575 */
+   crt3.o provides __cxa_atexit on systems that don't have it.  Since
+   it's only used with C++, which requires passing -shared-libgcc, key
+   off that to avoid unnecessarily adding a destructor to every
+   powerpc program built.  */
 
+#undef  STARTFILE_SPEC
+#define STARTFILE_SPEC							    \
+  "%{!Zdynamiclib:%{Zbundle:%{!static:-lbundle1.o}}			    \
+     %{!Zbundle:%{pg:%{static:-lgcrt0.o}				    \
+                     %{!static:%{object:-lgcrt0.o}			    \
+                               %{!object:%{preload:-lgcrt0.o}		    \
+                                 %{!preload:-lgcrt1.o %(darwin_crt2)}}}}    \
+                %{!pg:%{static:-lcrt0.o}				    \
+                      %{!static:%{object:-lcrt0.o}			    \
+                                %{!object:%{preload:-lcrt0.o}		    \
+                                  %{!preload:-lcrt1.o %(darwin_crt2)}}}}}}  \
+  %{shared-libgcc:%:version-compare(< 10.5 mmacosx-version-min= -lcrt3.o)}"
+
+/* APPLE LOCAL end mainline 2006-03-15 3992198 */
 /* The native Darwin linker doesn't necessarily place files in the order
    that they're specified on the link line.  Thus, it is pointless
    to put anything in ENDFILE_SPEC.  */
diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index e984584c0a6..75c6f895c0c 100644
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -239,6 +239,12 @@ extern int flag_cw_asm_blocks;
     /* APPLE LOCAL end CW asm blocks */				\
   } while (0)
 
+/* APPLE LOCAL begin kexts */
+#define C_COMMON_OVERRIDE_OPTIONS do {		\
+  SUBTARGET_C_COMMON_OVERRIDE_OPTIONS;		\
+} while (0)
+/* APPLE LOCAL end kexts */
+
 /* True, iff we're generating fast turn around debugging code.  When
    true, we arrange for function prologues to start with 6 nops so
    that gdb may insert code to redirect them, and for data to be
diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
index 6c1925ead1b..7ca99c45e7a 100644
--- a/gcc/config/rs6000/darwin.h
+++ b/gcc/config/rs6000/darwin.h
@@ -132,12 +132,8 @@ do {									\
        || strverscmp (darwin_macosx_version_min, "10.4.6") < 0)		\
       && flag_use_cxa_get_exception_ptr == 2)				\
     flag_use_cxa_get_exception_ptr = 0;					\
-  /* On powerpc, __cxa_atexit is available starting in the 10.4		\
-     libSystem.dylib.  */						\
-  if ((! darwin_macosx_version_min					\
-       || strverscmp (darwin_macosx_version_min, "10.4") < 0)		\
-      && flag_use_cxa_atexit == 2)					\
-    flag_use_cxa_atexit = 0;						\
+  /* APPLE LOCAL kexts */						\
+  SUBTARGET_C_COMMON_OVERRIDE_OPTIONS;					\
 } while (0)
 /* APPLE LOCAL end mainline 2006-02-24 4086777 */
 
diff --git a/gcc/config/rs6000/t-darwin b/gcc/config/rs6000/t-darwin
index 9aa737587ef..973bb321d05 100644
--- a/gcc/config/rs6000/t-darwin
+++ b/gcc/config/rs6000/t-darwin
@@ -29,3 +29,12 @@ LIB2ADDEH += $(srcdir)/config/rs6000/darwin-fallback.c
 
 darwin-fpsave.o:	$(srcdir)/config/rs6000/darwin-asm.h
 darwin-tramp.o:		$(srcdir)/config/rs6000/darwin-asm.h
+ # APPLE LOCAL begin mainline 2006-03-15 3992198
+
+# Explain how to build crt2.o
+$(T)crt2$(objext): $(srcdir)/config/darwin-crt2.c $(GCC_PASSES) \
+	$(TCONFIG_H) stmp-int-hdrs tsystem.h
+	# APPLE LOCAL use -mlongcall for large text support
+	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -mlongcall \
+	  -c $(srcdir)/config/darwin-crt2.c -o $(T)crt2$(objext)
+ # APPLE LOCAL end mainline 2006-03-15 3992198
diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin
index be0575bec30..bb5c31c84d6 100644
--- a/gcc/config/t-darwin
+++ b/gcc/config/t-darwin
@@ -17,13 +17,15 @@ darwin-c.o: $(srcdir)/config/darwin-c.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 
 gt-darwin.h : s-gtype ; @true
 
-# Explain how to build crt2.o
-$(T)crt2$(objext): $(srcdir)/config/darwin-crt2.c $(GCC_PASSES) \
+ # APPLE LOCAL begin mainline 2006-03-15 3992198
+# How to build crt3.o
+EXTRA_MULTILIB_PARTS=crt3.o
+$(T)crt3$(objext): $(srcdir)/config/darwin-crt3.c $(GCC_PASSES) \
 	$(TCONFIG_H) stmp-int-hdrs tsystem.h
-	# APPLE LOCAL use -mlongcall for large text support
-	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -mlongcall \
-	  -c $(srcdir)/config/darwin-crt2.c -o $(T)crt2$(objext)
-
+	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) \
+	  -c $(srcdir)/config/darwin-crt3.c -o $(T)crt3$(objext)
+  
+ # APPLE LOCAL end mainline 2006-03-15 3992198
 # Use unwind-dw2-fde-darwin
 LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-darwin.c \
   $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a7ac266052..c338cb1345c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-15  Geoffrey Keating  <geoffk@apple.com>
+
+	Radar 3992198
+	* g++.old-deja/g++.other/init18.C: New.
+	* g++.old-deja/g++.other/init5.C: Remove xfail.
+
 2006-03-09  Eric Christopher  <echristo@apple.com>
 
 	Radar 4461050
diff --git a/gcc/testsuite/g++.old-deja/g++.other/init18.C b/gcc/testsuite/g++.old-deja/g++.other/init18.C
new file mode 100644
index 00000000000..9cb76363e7f
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.other/init18.C
@@ -0,0 +1,34 @@
+// APPLE LOCAL file mainline 2006-03-15 3992198
+// { dg-do run }
+
+#include <stdlib.h>
+
+static int cnt = 0;
+
+class Foo2
+{
+	public:
+		Foo2() {};
+		~Foo2() { if (++cnt == 2) _Exit (0); };
+};
+
+static Foo2& GetFoo2()
+{
+	static Foo2 foo2;
+	return foo2;
+}
+
+class Foo1
+{
+	public:
+		Foo1() {}
+		~Foo1() { if (++cnt != 1) abort(); GetFoo2(); };
+};
+
+int main( int argc, const char* argv[] )
+{
+	static Foo1 anotherFoo;
+	exit (1);
+}
+
+
diff --git a/gcc/testsuite/g++.old-deja/g++.other/init5.C b/gcc/testsuite/g++.old-deja/g++.other/init5.C
index 89b8cd3fc0e..8c79f1dcea7 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/init5.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/init5.C
@@ -1,4 +1,5 @@
-// { dg-do run { xfail { ! "powerpc*-*-linux*" } } }
+// APPLE LOCAL mainline 2006-03-15 3992198
+// { dg-do run }
 // Objects must be destructed in decreasing cnt order
 // Original test attributed to James Kanze <jkanze@otelo.ibmmail.com>