PR middle-end/20491

[pf3gnuchains/gcc-fork.git] / gcc / crtstuff.c

diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c
index d5f23cb..8fdc021 100644 (file)
--- a/gcc/crtstuff.c
+++ b/gcc/crtstuff.c
@@ -1,15 +1,15 @@
 /* Specialized bits of code needed to support construction and
    destruction of file-scope objects in C++ code.
    Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998,
 /* Specialized bits of code needed to support construction and
    destruction of file-scope objects in C++ code.
    Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998,

-   1999, 2000 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

    Contributed by Ron Guilmette (rfg@monkeys.com).
 
    Contributed by Ron Guilmette (rfg@monkeys.com).
 

-This file is part of GNU CC.
+This file is part of GCC.

 
 

-GNU CC 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.
+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
 
 In addition to the permissions in the GNU General Public License, the
 Free Software Foundation gives you unlimited permission to link the


@@ -20,17 +20,17 @@ do apply in other respects; for example, they cover modification of
 the file, and distribution when not linked into a combine
 executable.)
 
 the file, and distribution when not linked into a combine
 executable.)
 

-GNU CC 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.
+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
 
 You should have received a copy of the GNU General Public License

-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+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.  */

 
 

-/* This file is a bit like libgcc1.c/libgcc2.c in that it is compiled
+/* This file is a bit like libgcc2.c in that it is compiled

    multiple times and yields multiple .o files.
 
    This file is useful on target machines where the object file format
    multiple times and yields multiple .o files.
 
    This file is useful on target machines where the object file format


@@ -51,24 +51,62 @@ Boston, MA 02111-1307, USA.  */
 
    This file must be compiled with gcc.  */
 
 
    This file must be compiled with gcc.  */
 

-/* 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.  */
+/* Target machine header files require this define. */
+#define IN_LIBGCC2

 
 

+/* FIXME: Including auto-host is incorrect, but until we have
+   identified the set of defines that need to go into auto-target.h,
+   this will have to do.  */

 #include "auto-host.h"
 #include "auto-host.h"

-#include "tm.h"
+#undef gid_t
+#undef pid_t
+#undef rlim_t
+#undef ssize_t
+#undef uid_t
+#undef vfork
+#include "tconfig.h"

 #include "tsystem.h"
 #include "tsystem.h"

+#include "coretypes.h"
+#include "tm.h"
+#include "unwind-dw2-fde.h"

 
 

-#include "defaults.h"
-#include "frame.h"
+#ifndef FORCE_CODE_SECTION_ALIGN
+# define FORCE_CODE_SECTION_ALIGN
+#endif

 
 #ifndef CRT_CALL_STATIC_FUNCTION
 
 #ifndef CRT_CALL_STATIC_FUNCTION

-# define CRT_CALL_STATIC_FUNCTION(func) func ()
+# define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC)    \
+static void __attribute__((__used__))                  \
+call_ ## FUNC (void)                                   \
+{                                                      \
+  asm (SECTION_OP);                                    \
+  FUNC ();                                             \
+  FORCE_CODE_SECTION_ALIGN                             \
+  asm (TEXT_SECTION_ASM_OP);                           \
+}
+#endif
+
+#if defined(OBJECT_FORMAT_ELF) && defined(HAVE_LD_EH_FRAME_HDR) \
+    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
+    && defined(__GLIBC__) && __GLIBC__ >= 2
+#include <link.h>
+# if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+#  define USE_PT_GNU_EH_FRAME
+# endif
+#endif
+#if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME)
+# define USE_EH_FRAME_REGISTRY
+#endif
+#if defined(EH_FRAME_SECTION_NAME) && EH_TABLES_CAN_BE_READ_ONLY
+# define EH_FRAME_SECTION_CONST const
+#else
+# define EH_FRAME_SECTION_CONST

 #endif
 
 /* We do not want to add the weak attribute to the declarations of these
 #endif
 
 /* We do not want to add the weak attribute to the declarations of these

-   routines in frame.h because that will cause the definition of these
-   symbols to be weak as well.
+   routines in unwind-dw2-fde.h because that will cause the definition of
+   these symbols to be weak as well.

 
    This exposes a core issue, how to handle creating weak references vs
    how to create weak definitions.  Either we have to have the definition
 
    This exposes a core issue, how to handle creating weak references vs
    how to create weak definitions.  Either we have to have the definition


@@ -77,7 +115,7 @@ Boston, MA 02111-1307, USA.  */
    but not its definition.
 
    Making TARGET_WEAK_ATTRIBUTE conditional seems like a good solution until
    but not its definition.
 
    Making TARGET_WEAK_ATTRIBUTE conditional seems like a good solution until

-   one thinks about scaling to larger problems -- ie, the condition under
+   one thinks about scaling to larger problems -- i.e., the condition under

    which TARGET_WEAK_ATTRIBUTE is active will eventually get far too
    complicated.
 
    which TARGET_WEAK_ATTRIBUTE is active will eventually get far too
    complicated.
 


@@ -88,39 +126,19 @@ Boston, MA 02111-1307, USA.  */
    
 /* References to __register_frame_info and __deregister_frame_info should
    be weak in this file if at all possible.  */
    
 /* References to __register_frame_info and __deregister_frame_info should
    be weak in this file if at all possible.  */

-extern void __register_frame_info (void *, struct object *)
+extern void __register_frame_info (const void *, struct object *)

                                  TARGET_ATTRIBUTE_WEAK;
                                  TARGET_ATTRIBUTE_WEAK;

-
-extern void *__deregister_frame_info (void *)
+extern void __register_frame_info_bases (const void *, struct object *,
+                                        void *, void *)
+                                 TARGET_ATTRIBUTE_WEAK;
+extern void *__deregister_frame_info (const void *)

                                     TARGET_ATTRIBUTE_WEAK;
                                     TARGET_ATTRIBUTE_WEAK;

+extern void *__deregister_frame_info_bases (const void *)
+                                    TARGET_ATTRIBUTE_WEAK;
+extern void __do_global_ctors_1 (void);

 
 

-#ifndef OBJECT_FORMAT_MACHO
-
-/* Provide default definitions for the pseudo-ops used to switch to the
-   .ctors and .dtors sections.
- 
-   Note that we want to give these sections the SHF_WRITE attribute
-   because these sections will actually contain data (i.e. tables of
-   addresses of functions in the current root executable or shared library
-   file) and, in the case of a shared library, the relocatable addresses
-   will have to be properly resolved/relocated (and then written into) by
-   the dynamic linker when it actually attaches the given shared library
-   to the executing process.  (Note that on SVR4, you may wish to use the
-   `-z text' option to the ELF linker, when building a shared library, as
-   an additional check that you are doing everything right.  But if you do
-   use the `-z text' option when building a shared library, you will get
-   errors unless the .ctors and .dtors sections are marked as writable
-   via the SHF_WRITE attribute.)
-
-   These defaults do not include leading spacing, as they will only be
-   used in asm:s here.  */
-
-#ifndef CTORS_SECTION_ASM_OP
-#define CTORS_SECTION_ASM_OP   ".section\t.ctors,\"aw\""
-#endif
-#ifndef DTORS_SECTION_ASM_OP
-#define DTORS_SECTION_ASM_OP   ".section\t.dtors,\"aw\""
-#endif
+/* Likewise for _Jv_RegisterClasses.  */
+extern void _Jv_RegisterClasses (void *) TARGET_ATTRIBUTE_WEAK;

 
 #ifdef OBJECT_FORMAT_ELF
 
 
 #ifdef OBJECT_FORMAT_ELF
 


@@ -138,7 +156,66 @@ typedef void (*func_ptr) (void);
 
 #ifdef CRT_BEGIN
 
 
 #ifdef CRT_BEGIN
 

-#ifdef INIT_SECTION_ASM_OP
+/* NOTE:  In order to be able to support SVR4 shared libraries, we arrange
+   to have one set of symbols { __CTOR_LIST__, __DTOR_LIST__, __CTOR_END__,
+   __DTOR_END__ } per root executable and also one set of these symbols
+   per shared library.  So in any given whole process image, we may have
+   multiple definitions of each of these symbols.  In order to prevent
+   these definitions from conflicting with one another, and in order to
+   ensure that the proper lists are used for the initialization/finalization
+   of each individual shared library (respectively), we give these symbols
+   only internal (i.e. `static') linkage, and we also make it a point to
+   refer to only the __CTOR_END__ symbol in crtend.o and the __DTOR_LIST__
+   symbol in crtbegin.o, where they are defined.  */
+
+/* The -1 is a flag to __do_global_[cd]tors indicating that this table
+   does not start with a count of elements.  */
+#ifdef CTOR_LIST_BEGIN
+CTOR_LIST_BEGIN;
+#elif defined(CTORS_SECTION_ASM_OP)
+/* Hack: force cc1 to switch to .data section early, so that assembling
+   __CTOR_LIST__ does not undo our behind-the-back change to .ctors.  */
+static func_ptr force_to_data[1] __attribute__ ((__unused__)) = { };
+asm (CTORS_SECTION_ASM_OP);
+STATIC func_ptr __CTOR_LIST__[1]
+  __attribute__ ((__unused__, aligned(sizeof(func_ptr))))
+  = { (func_ptr) (-1) };
+#else
+STATIC func_ptr __CTOR_LIST__[1]
+  __attribute__ ((__unused__, section(".ctors"), aligned(sizeof(func_ptr))))
+  = { (func_ptr) (-1) };
+#endif /* __CTOR_LIST__ alternatives */
+
+#ifdef DTOR_LIST_BEGIN
+DTOR_LIST_BEGIN;
+#elif defined(DTORS_SECTION_ASM_OP)
+asm (DTORS_SECTION_ASM_OP);
+STATIC func_ptr __DTOR_LIST__[1]
+  __attribute__ ((aligned(sizeof(func_ptr))))
+  = { (func_ptr) (-1) };
+#else
+STATIC func_ptr __DTOR_LIST__[1]
+  __attribute__((section(".dtors"), aligned(sizeof(func_ptr))))
+  = { (func_ptr) (-1) };
+#endif /* __DTOR_LIST__ alternatives */
+
+#ifdef USE_EH_FRAME_REGISTRY
+/* Stick a label at the beginning of the frame unwind info so we can register
+   and deregister it with the exception handling library code.  */
+STATIC EH_FRAME_SECTION_CONST char __EH_FRAME_BEGIN__[]
+     __attribute__((section(EH_FRAME_SECTION_NAME), aligned(4)))
+     = { };
+#endif /* USE_EH_FRAME_REGISTRY */
+
+#ifdef JCR_SECTION_NAME
+/* Stick a label at the beginning of the java class registration info
+   so we can register them properly.  */
+STATIC void *__JCR_LIST__[]
+  __attribute__ ((unused, section(JCR_SECTION_NAME), aligned(sizeof(void*))))
+  = { };
+#endif /* JCR_SECTION_NAME */
+
+#if defined(INIT_SECTION_ASM_OP) || defined(INIT_ARRAY_SECTION_ASM_OP)

 
 #ifdef OBJECT_FORMAT_ELF
 
 
 #ifdef OBJECT_FORMAT_ELF
 


@@ -148,13 +225,12 @@ typedef void (*func_ptr) (void);
    in one DSO or the main program is not used in another object.  The
    dynamic linker takes care of this.  */
 
    in one DSO or the main program is not used in another object.  The
    dynamic linker takes care of this.  */
 

-/* XXX Ideally the following should be implemented using
-       __attribute__ ((__visibility__ ("hidden")))
-   but the __attribute__ support is not yet there.  */
+#ifdef TARGET_LIBGCC_SDATA_SECTION
+extern void *__dso_handle __attribute__ ((__section__ (TARGET_LIBGCC_SDATA_SECTION)));
+#endif

 #ifdef HAVE_GAS_HIDDEN
 #ifdef HAVE_GAS_HIDDEN

-asm (".hidden\t__dso_handle");
+extern void *__dso_handle __attribute__ ((__visibility__ ("hidden")));

 #endif
 #endif

-

 #ifdef CRTSTUFFS_O
 void *__dso_handle = &__dso_handle;
 #else
 #ifdef CRTSTUFFS_O
 void *__dso_handle = &__dso_handle;
 #else


@@ -184,15 +260,16 @@ extern void __cxa_finalize (void *) TARGET_ATTRIBUTE_WEAK;
    the list we left off processing, and we resume at that point,
    should we be re-invoked.  */
 
    the list we left off processing, and we resume at that point,
    should we be re-invoked.  */
 

-static char __EH_FRAME_BEGIN__[];
-static func_ptr __DTOR_LIST__[];
-static void
+static void __attribute__((used))

 __do_global_dtors_aux (void)
 {
 __do_global_dtors_aux (void)
 {

+#ifndef FINI_ARRAY_SECTION_ASM_OP

   static func_ptr *p = __DTOR_LIST__ + 1;
   static func_ptr *p = __DTOR_LIST__ + 1;

-  static int completed = 0;
+  func_ptr f;
+#endif /* !defined(FINI_ARRAY_SECTION_ASM_OP)  */
+  static _Bool completed;

 
 

-  if (completed)
+  if (__builtin_expect (completed, 0))

     return;
 
 #ifdef CRTSTUFFS_O
     return;
 
 #ifdef CRTSTUFFS_O


@@ -200,57 +277,81 @@ __do_global_dtors_aux (void)
     __cxa_finalize (__dso_handle);
 #endif
 
     __cxa_finalize (__dso_handle);
 #endif
 

-  while (*p)
+#ifdef FINI_ARRAY_SECTION_ASM_OP
+  /* If we are using .fini_array then destructors will be run via that
+     mechanism.  */
+#else /* !defined (FINI_ARRAY_SECTION_ASM_OP) */
+  while ((f = *p))

     {
       p++;
     {
       p++;

-      (*(p-1)) ();
+      f ();

     }
     }

-
-#ifdef EH_FRAME_SECTION_ASM_OP
+#endif /* !defined(FINI_ARRAY_SECTION_ASM_OP) */
+
+#ifdef USE_EH_FRAME_REGISTRY
+#ifdef CRT_GET_RFIB_DATA
+  /* If we used the new __register_frame_info_bases interface,
+     make sure that we deregister from the same place.  */
+  if (__deregister_frame_info_bases)
+    __deregister_frame_info_bases (__EH_FRAME_BEGIN__);
+#else

   if (__deregister_frame_info)
     __deregister_frame_info (__EH_FRAME_BEGIN__);
 #endif
   if (__deregister_frame_info)
     __deregister_frame_info (__EH_FRAME_BEGIN__);
 #endif

+#endif
+

   completed = 1;
 }
 
   completed = 1;
 }
 

-

 /* Stick a call to __do_global_dtors_aux into the .fini section.  */
 /* Stick a call to __do_global_dtors_aux into the .fini section.  */

-
-static void __attribute__ ((__unused__))
-fini_dummy (void)
-{
-  asm (FINI_SECTION_ASM_OP);
-  CRT_CALL_STATIC_FUNCTION (__do_global_dtors_aux);
-#ifdef FORCE_FINI_SECTION_ALIGN
-  FORCE_FINI_SECTION_ALIGN;
-#endif
-  asm (TEXT_SECTION_ASM_OP);
-}
-
-#ifdef EH_FRAME_SECTION_ASM_OP
+#ifdef FINI_SECTION_ASM_OP
+CRT_CALL_STATIC_FUNCTION (FINI_SECTION_ASM_OP, __do_global_dtors_aux)
+#else /* !defined(FINI_SECTION_ASM_OP) */
+static func_ptr __do_global_dtors_aux_fini_array_entry[]
+  __attribute__ ((__unused__, section(".fini_array")))
+  = { __do_global_dtors_aux };
+#endif /* !defined(FINI_SECTION_ASM_OP) */
+
+#if defined(USE_EH_FRAME_REGISTRY) || defined(JCR_SECTION_NAME)

 /* Stick a call to __register_frame_info into the .init section.  For some
    reason calls with no arguments work more reliably in .init, so stick the
    call in another function.  */
 
 /* Stick a call to __register_frame_info into the .init section.  For some
    reason calls with no arguments work more reliably in .init, so stick the
    call in another function.  */
 

-static void
+static void __attribute__((used))

 frame_dummy (void)
 {
 frame_dummy (void)
 {

+#ifdef USE_EH_FRAME_REGISTRY

   static struct object object;
   static struct object object;

+#ifdef CRT_GET_RFIB_DATA
+  void *tbase, *dbase;
+  tbase = 0;
+  CRT_GET_RFIB_DATA (dbase);
+  if (__register_frame_info_bases)
+    __register_frame_info_bases (__EH_FRAME_BEGIN__, &object, tbase, dbase);
+#else

   if (__register_frame_info)
     __register_frame_info (__EH_FRAME_BEGIN__, &object);
   if (__register_frame_info)
     __register_frame_info (__EH_FRAME_BEGIN__, &object);

+#endif /* CRT_GET_RFIB_DATA */
+#endif /* USE_EH_FRAME_REGISTRY */
+#ifdef JCR_SECTION_NAME
+  if (__JCR_LIST__[0])
+    {
+      void (*register_classes) (void *) = _Jv_RegisterClasses;
+      __asm ("" : "+r" (register_classes));
+      if (register_classes)
+       register_classes (__JCR_LIST__);
+    }
+#endif /* JCR_SECTION_NAME */

 }
 
 }
 

-static void __attribute__ ((__unused__))
-init_dummy (void)
-{
-  asm (INIT_SECTION_ASM_OP);
-  CRT_CALL_STATIC_FUNCTION (frame_dummy);
-#ifdef FORCE_INIT_SECTION_ALIGN
-  FORCE_INIT_SECTION_ALIGN;
-#endif
-  asm (TEXT_SECTION_ASM_OP);
-}
-#endif /* EH_FRAME_SECTION_ASM_OP */
+#ifdef INIT_SECTION_ASM_OP
+CRT_CALL_STATIC_FUNCTION (INIT_SECTION_ASM_OP, frame_dummy)
+#else /* defined(INIT_SECTION_ASM_OP) */
+static func_ptr __frame_dummy_init_array_entry[]
+  __attribute__ ((__unused__, section(".init_array")))
+  = { frame_dummy };
+#endif /* !defined(INIT_SECTION_ASM_OP) */
+#endif /* USE_EH_FRAME_REGISTRY || JCR_SECTION_NAME */

 
 #else  /* OBJECT_FORMAT_ELF */
 
 
 #else  /* OBJECT_FORMAT_ELF */
 


@@ -265,39 +366,26 @@ static void __do_global_ctors_aux (void);
 void
 __do_global_ctors (void)
 {
 void
 __do_global_ctors (void)
 {

-#ifdef INVOKE__main  /* If __main won't actually call __do_global_ctors
-                       then it doesn't matter what's inside the function.
-                       The inside of __do_global_ctors_aux is called
-                       automatically in that case.
-                       And the Alliant fx2800 linker crashes
-                       on this reference.  So prevent the crash.  */
+#ifdef INVOKE__main
+  /* If __main won't actually call __do_global_ctors then it doesn't matter
+     what's inside the function.  The inside of __do_global_ctors_aux is
+     called automatically in that case.  And the Alliant fx2800 linker
+     crashes on this reference.  So prevent the crash.  */

   __do_global_ctors_aux ();
 #endif
 }
 
 asm (INIT_SECTION_ASM_OP);     /* cc1 doesn't know that we are switching! */
 
   __do_global_ctors_aux ();
 #endif
 }
 
 asm (INIT_SECTION_ASM_OP);     /* cc1 doesn't know that we are switching! */
 

-/* On some svr4 systems, the initial .init section preamble code provided in
-   crti.o may do something, such as bump the stack, which we have to 
-   undo before we reach the function prologue code for __do_global_ctors 
-   (directly below).  For such systems, define the macro INIT_SECTION_PREAMBLE
-   to expand into the code needed to undo the actions of the crti.o file.  */
-
-#ifdef INIT_SECTION_PREAMBLE
-  INIT_SECTION_PREAMBLE;
-#endif
-

 /* A routine to invoke all of the global constructors upon entry to the
    program.  We put this into the .init section (for systems that have
    such a thing) so that we can properly perform the construction of
 /* A routine to invoke all of the global constructors upon entry to the
    program.  We put this into the .init section (for systems that have
    such a thing) so that we can properly perform the construction of

-   file-scope static-storage C++ objects within shared libraries.   */
+   file-scope static-storage C++ objects within shared libraries.  */

 
 

-static void
+static void __attribute__((used))

 __do_global_ctors_aux (void)   /* prologue goes in .init section */
 {
 __do_global_ctors_aux (void)   /* prologue goes in .init section */
 {

-#ifdef FORCE_INIT_SECTION_ALIGN
-  FORCE_INIT_SECTION_ALIGN;    /* Explicit align before switch to .text */
-#endif
+  FORCE_CODE_SECTION_ALIGN     /* explicit align before switch to .text */

   asm (TEXT_SECTION_ASM_OP);   /* don't put epilogue and body in .init */
   DO_GLOBAL_CTORS_BODY;
   atexit (__do_global_dtors);
   asm (TEXT_SECTION_ASM_OP);   /* don't put epilogue and body in .init */
   DO_GLOBAL_CTORS_BODY;
   atexit (__do_global_dtors);


@@ -305,97 +393,127 @@ __do_global_ctors_aux (void)     /* prologue goes in .init section */
 
 #endif /* OBJECT_FORMAT_ELF */
 
 
 #endif /* OBJECT_FORMAT_ELF */
 

-#else /* defined(INIT_SECTION_ASM_OP) */
+#elif defined(HAS_INIT_SECTION) /* ! INIT_SECTION_ASM_OP */
+
+extern void __do_global_dtors (void);

 
 

-#ifdef HAS_INIT_SECTION

 /* This case is used by the Irix 6 port, which supports named sections but
    not an SVR4-style .fini section.  __do_global_dtors can be non-static
    in this case because we protect it with -hidden_symbol.  */
 
 /* This case is used by the Irix 6 port, which supports named sections but
    not an SVR4-style .fini section.  __do_global_dtors can be non-static
    in this case because we protect it with -hidden_symbol.  */
 

-static char __EH_FRAME_BEGIN__[];
-static func_ptr __DTOR_LIST__[];

 void
 __do_global_dtors (void)
 {
 void
 __do_global_dtors (void)
 {

-  func_ptr *p;
-  for (p = __DTOR_LIST__ + 1; *p; p++)
-    (*p) ();
+  func_ptr *p, f;
+  for (p = __DTOR_LIST__ + 1; (f = *p); p++)
+    f ();

 
 

-#ifdef EH_FRAME_SECTION_ASM_OP
+#ifdef USE_EH_FRAME_REGISTRY

   if (__deregister_frame_info)
     __deregister_frame_info (__EH_FRAME_BEGIN__);
 #endif
 }
 
   if (__deregister_frame_info)
     __deregister_frame_info (__EH_FRAME_BEGIN__);
 #endif
 }
 

-#ifdef EH_FRAME_SECTION_ASM_OP
-/* Define a function here to call __register_frame.  crtend.o is linked in
-   after libgcc.a, and hence can't call libgcc.a functions directly.  That
-   can lead to unresolved function references.  */
+#if defined(USE_EH_FRAME_REGISTRY) || defined(JCR_SECTION_NAME)
+/* A helper function for __do_global_ctors, which is in crtend.o.  Here
+   in crtbegin.o, we can reference a couple of symbols not visible there.
+   Plus, since we're before libgcc.a, we have no problems referencing
+   functions from there.  */

 void
 void

-__frame_dummy (void)
+__do_global_ctors_1(void)

 {
 {

+#ifdef USE_EH_FRAME_REGISTRY

   static struct object object;
   if (__register_frame_info)
     __register_frame_info (__EH_FRAME_BEGIN__, &object);
   static struct object object;
   if (__register_frame_info)
     __register_frame_info (__EH_FRAME_BEGIN__, &object);

-}

 #endif
 #endif

+#ifdef JCR_SECTION_NAME
+  if (__JCR_LIST__[0])
+    {
+      void (*register_classes) (void *) = _Jv_RegisterClasses;
+      __asm ("" : "+r" (register_classes));
+      if (register_classes)
+       register_classes (__JCR_LIST__);
+    }

 #endif
 #endif

+}
+#endif /* USE_EH_FRAME_REGISTRY || JCR_SECTION_NAME */

 
 

-#endif /* defined(INIT_SECTION_ASM_OP) */
+#else /* ! INIT_SECTION_ASM_OP && ! HAS_INIT_SECTION */
+#error "What are you doing with crtstuff.c, then?"
+#endif

 
 

-/* Force cc1 to switch to .data section.  */
-static func_ptr force_to_data[0] __attribute__ ((__unused__)) = { };
+#elif defined(CRT_END) /* ! CRT_BEGIN */

 
 

-/* NOTE:  In order to be able to support SVR4 shared libraries, we arrange
-   to have one set of symbols { __CTOR_LIST__, __DTOR_LIST__, __CTOR_END__,
-   __DTOR_END__ } per root executable and also one set of these symbols
-   per shared library.  So in any given whole process image, we may have
-   multiple definitions of each of these symbols.  In order to prevent
-   these definitions from conflicting with one another, and in order to
-   ensure that the proper lists are used for the initialization/finalization
-   of each individual shared library (respectively), we give these symbols
-   only internal (i.e. `static') linkage, and we also make it a point to
-   refer to only the __CTOR_END__ symbol in crtend.o and the __DTOR_LIST__
-   symbol in crtbegin.o, where they are defined.  */
+/* Put a word containing zero at the end of each of our two lists of function
+   addresses.  Note that the words defined here go into the .ctors and .dtors
+   sections of the crtend.o file, and since that file is always linked in
+   last, these words naturally end up at the very ends of the two lists
+   contained in these two sections.  */

 
 

-/* The -1 is a flag to __do_global_[cd]tors
-   indicating that this table does not start with a count of elements.  */
-#ifdef CTOR_LIST_BEGIN
-CTOR_LIST_BEGIN;
+#ifdef CTOR_LIST_END
+CTOR_LIST_END;
+#elif defined(CTORS_SECTION_ASM_OP)
+/* Hack: force cc1 to switch to .data section early, so that assembling
+   __CTOR_LIST__ does not undo our behind-the-back change to .ctors.  */
+static func_ptr force_to_data[1] __attribute__ ((__unused__)) = { };
+asm (CTORS_SECTION_ASM_OP);
+STATIC func_ptr __CTOR_END__[1]
+  __attribute__((aligned(sizeof(func_ptr))))
+  = { (func_ptr) 0 };

 #else
 #else

-asm (CTORS_SECTION_ASM_OP);    /* cc1 doesn't know that we are switching! */
-STATIC func_ptr __CTOR_LIST__[1] __attribute__ ((__unused__))
-  = { (func_ptr) (-1) };
+STATIC func_ptr __CTOR_END__[1]
+  __attribute__((section(".ctors"), aligned(sizeof(func_ptr))))
+  = { (func_ptr) 0 };

 #endif
 
 #endif
 

-#ifdef DTOR_LIST_BEGIN
-DTOR_LIST_BEGIN;
+#ifdef DTOR_LIST_END
+DTOR_LIST_END;
+#elif defined(DTORS_SECTION_ASM_OP)
+asm (DTORS_SECTION_ASM_OP);
+STATIC func_ptr __DTOR_END__[1]
+  __attribute__ ((unused, aligned(sizeof(func_ptr))))
+  = { (func_ptr) 0 };

 #else
 #else

-asm (DTORS_SECTION_ASM_OP);    /* cc1 doesn't know that we are switching! */
-STATIC func_ptr __DTOR_LIST__[1] = { (func_ptr) (-1) };
-#endif
-
-#ifdef EH_FRAME_SECTION_ASM_OP
-/* Stick a label at the beginning of the frame unwind info so we can register
-   and deregister it with the exception handling library code.  */
-
-asm (EH_FRAME_SECTION_ASM_OP);
-#ifdef INIT_SECTION_ASM_OP
-STATIC
+STATIC func_ptr __DTOR_END__[1]
+  __attribute__((unused, section(".dtors"), aligned(sizeof(func_ptr))))
+  = { (func_ptr) 0 };

 #endif
 #endif

-char __EH_FRAME_BEGIN__[] = { };
-#endif /* EH_FRAME_SECTION_ASM_OP */
-
-#endif /* defined(CRT_BEGIN) */

 
 

-#ifdef CRT_END
-
-#ifdef INIT_SECTION_ASM_OP
+#ifdef EH_FRAME_SECTION_NAME
+/* Terminate the frame unwind info section with a 4byte 0 as a sentinel;
+   this would be the 'length' field in a real FDE.  */
+# if __INT_MAX__ == 2147483647
+typedef int int32;
+# elif __LONG_MAX__ == 2147483647
+typedef long int32;
+# elif __SHRT_MAX__ == 2147483647
+typedef short int32;
+# else
+#  error "Missing a 4 byte integer"
+# endif
+STATIC EH_FRAME_SECTION_CONST int32 __FRAME_END__[]
+     __attribute__ ((unused, section(EH_FRAME_SECTION_NAME),
+                    aligned(sizeof(int32))))
+     = { 0 };
+#endif /* EH_FRAME_SECTION_NAME */
+
+#ifdef JCR_SECTION_NAME
+/* Null terminate the .jcr section array.  */
+STATIC void *__JCR_END__[1] 
+   __attribute__ ((unused, section(JCR_SECTION_NAME),
+                  aligned(sizeof(void *))))
+   = { 0 };
+#endif /* JCR_SECTION_NAME */
+
+#ifdef INIT_ARRAY_SECTION_ASM_OP
+
+/* If we are using .init_array, there is nothing to do.  */
+
+#elif defined(INIT_SECTION_ASM_OP)

 
 #ifdef OBJECT_FORMAT_ELF
 
 #ifdef OBJECT_FORMAT_ELF

-
-static func_ptr __CTOR_END__[];
-static void
+static void __attribute__((used))

 __do_global_ctors_aux (void)
 {
   func_ptr *p;
 __do_global_ctors_aux (void)
 {
   func_ptr *p;


@@ -404,33 +522,7 @@ __do_global_ctors_aux (void)
 }
 
 /* Stick a call to __do_global_ctors_aux into the .init section.  */
 }
 
 /* Stick a call to __do_global_ctors_aux into the .init section.  */

-
-static void __attribute__ ((__unused__))
-init_dummy (void)
-{
-  asm (INIT_SECTION_ASM_OP);
-  CRT_CALL_STATIC_FUNCTION (__do_global_ctors_aux);
-#ifdef FORCE_INIT_SECTION_ALIGN
-  FORCE_INIT_SECTION_ALIGN;
-#endif
-  asm (TEXT_SECTION_ASM_OP);
-
-/* This is a kludge. The i386 GNU/Linux dynamic linker needs ___brk_addr,
-   __environ and atexit (). We have to make sure they are in the .dynsym
-   section. We accomplish it by making a dummy call here. This
-   code is never reached.  */
- 
-#if defined(__linux__) && defined(__PIC__) && defined(__i386__)
-  {
-    extern void *___brk_addr;
-    extern char **__environ;
-
-    ___brk_addr = __environ;
-    atexit (0);
-  }
-#endif
-}
-
+CRT_CALL_STATIC_FUNCTION (INIT_SECTION_ASM_OP, __do_global_ctors_aux)

 #else  /* OBJECT_FORMAT_ELF */
 
 /* Stick the real initialization code, followed by a normal sort of
 #else  /* OBJECT_FORMAT_ELF */
 
 /* Stick the real initialization code, followed by a normal sort of


@@ -462,137 +554,33 @@ __do_global_ctors_aux (void)     /* prologue goes in .text section */
   atexit (__do_global_dtors);
 }                              /* epilogue and body go in .init section */
 
   atexit (__do_global_dtors);
 }                              /* epilogue and body go in .init section */
 

-#ifdef FORCE_INIT_SECTION_ALIGN
-FORCE_INIT_SECTION_ALIGN;
-#endif
-
+FORCE_CODE_SECTION_ALIGN

 asm (TEXT_SECTION_ASM_OP);
 
 #endif /* OBJECT_FORMAT_ELF */
 
 asm (TEXT_SECTION_ASM_OP);
 
 #endif /* OBJECT_FORMAT_ELF */
 

-#else /* defined(INIT_SECTION_ASM_OP) */
+#elif defined(HAS_INIT_SECTION) /* ! INIT_SECTION_ASM_OP */
+
+extern void __do_global_ctors (void);

 
 

-#ifdef HAS_INIT_SECTION

 /* This case is used by the Irix 6 port, which supports named sections but
    not an SVR4-style .init section.  __do_global_ctors can be non-static
    in this case because we protect it with -hidden_symbol.  */
 /* This case is used by the Irix 6 port, which supports named sections but
    not an SVR4-style .init section.  __do_global_ctors can be non-static
    in this case because we protect it with -hidden_symbol.  */

-static func_ptr __CTOR_END__[];
-#ifdef EH_FRAME_SECTION_ASM_OP
-extern void __frame_dummy (void);
-#endif

 void
 __do_global_ctors (void)
 {
   func_ptr *p;
 void
 __do_global_ctors (void)
 {
   func_ptr *p;

-#ifdef EH_FRAME_SECTION_ASM_OP
-  __frame_dummy ();
+#if defined(USE_EH_FRAME_REGISTRY) || defined(JCR_SECTION_NAME)
+  __do_global_ctors_1();

 #endif
   for (p = __CTOR_END__ - 1; *p != (func_ptr) -1; p--)
     (*p) ();
 }
 #endif
   for (p = __CTOR_END__ - 1; *p != (func_ptr) -1; p--)
     (*p) ();
 }

-#endif
-
-#endif /* defined(INIT_SECTION_ASM_OP) */
-
-/* Force cc1 to switch to .data section.  */
-static func_ptr force_to_data[0] __attribute__ ((__unused__)) = { };

 
 

-/* Put a word containing zero at the end of each of our two lists of function
-   addresses.  Note that the words defined here go into the .ctors and .dtors
-   sections of the crtend.o file, and since that file is always linked in
-   last, these words naturally end up at the very ends of the two lists
-   contained in these two sections.  */
-
-#ifdef CTOR_LIST_END
-CTOR_LIST_END;
-#else
-asm (CTORS_SECTION_ASM_OP);    /* cc1 doesn't know that we are switching! */
-STATIC func_ptr __CTOR_END__[1] = { (func_ptr) 0 };
+#else /* ! INIT_SECTION_ASM_OP && ! HAS_INIT_SECTION */
+#error "What are you doing with crtstuff.c, then?"

 #endif
 
 #endif
 

-#ifdef DTOR_LIST_END
-DTOR_LIST_END;
-#else
-asm (DTORS_SECTION_ASM_OP);    /* cc1 doesn't know that we are switching! */
-STATIC func_ptr __DTOR_END__[1] __attribute__ ((__unused__))
-  = { (func_ptr) 0 };
+#else /* ! CRT_BEGIN && ! CRT_END */
+#error "One of CRT_BEGIN or CRT_END must be defined."

 #endif
 #endif

-
-#ifdef EH_FRAME_SECTION_ASM_OP
-/* Terminate the frame unwind info section with a 4byte 0 as a sentinel;
-   this would be the 'length' field in a real FDE.  */
-
-typedef unsigned int ui32 __attribute__ ((mode (SI)));
-asm (EH_FRAME_SECTION_ASM_OP);
-STATIC ui32 __FRAME_END__[] __attribute__ ((__unused__)) = { 0 };
-#endif /* EH_FRAME_SECTION */
-
-#endif /* defined(CRT_END) */
-
-#else  /* OBJECT_FORMAT_MACHO */
-
-/* For Mach-O format executables, we assume that the system's runtime is
-   smart enough to handle constructors and destructors, but doesn't have
-   an init section (if it can't even handle constructors/destructors
-   you should be using INVOKE__main, not crtstuff). All we need to do
-   is install/deinstall the frame information for exceptions. We do this
-   by putting a constructor in crtbegin.o and a destructor in crtend.o.
-
-   crtend.o also puts in the terminating zero in the frame information
-   segment. */
-
-/* The crtstuff for other object formats use the symbol __EH_FRAME_BEGIN__
-   to figure out the start of the exception frame, but here we use
-   getsectbynamefromheader to find this value. Either method would work,
-   but this method avoids creating any global symbols, which seems
-   cleaner. */
-
-#include <mach-o/ldsyms.h>
-extern const struct section *
-  getsectbynamefromheader (const struct mach_header *,
-                          const char *, const char *);
-
-#ifdef CRT_BEGIN
-
-static void __reg_frame_ctor (void) __attribute__ ((constructor));
-
-static void
-__reg_frame_ctor (void)
-{
-  static struct object object;
-  const struct section *eh_frame;
-
-  eh_frame = getsectbynamefromheader (&_mh_execute_header,
-                                     "__TEXT", "__eh_frame");
-  __register_frame_info ((void *) eh_frame->addr, &object);
-}
-
-#endif /* CRT_BEGIN */
-
-#ifdef CRT_END
-
-static void __dereg_frame_dtor (void) __attribute__ ((destructor));
-
-static void
-__dereg_frame_dtor (void)
-{
-  const struct section *eh_frame;
-
-  eh_frame = getsectbynamefromheader (&_mh_execute_header,
-                                     "__TEXT", "__eh_frame");
-  __deregister_frame_info ((void *) eh_frame->addr);
-}
-
-/* Terminate the frame section with a final zero. */
-
-/* Force cc1 to switch to .data section.  */
-static void * force_to_data[0] __attribute__ ((__unused__)) = { };
-
-typedef unsigned int ui32 __attribute__ ((mode (SI)));
-asm (EH_FRAME_SECTION_ASM_OP);
-static ui32 __FRAME_END__[] __attribute__ ((__unused__)) = { 0 };
-
-#endif /* CRT_END */
-
-#endif /* OBJECT_FORMAT_MACHO */
-