PR testsuite/37241

[pf3gnuchains/gcc-fork.git] / gcc / unwind-dw2-fde-darwin.c

diff --git a/gcc/unwind-dw2-fde-darwin.c b/gcc/unwind-dw2-fde-darwin.c
index 12c9ed3..6a49f45 100644 (file)
--- a/gcc/unwind-dw2-fde-darwin.c
+++ b/gcc/unwind-dw2-fde-darwin.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -14,8 +14,8 @@
 
    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, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, if you link this library with other files,
    some of which are compiled with GCC, to produce an executable,
@@ -27,6 +27,7 @@
 /* Locate the FDE entry for a given address, using Darwin's keymgr support.  */
 
 #include "tconfig.h"
+#include "tsystem.h"
 #include <string.h>
 #include <stdlib.h>
 #include "dwarf2.h"
@@ -59,9 +60,9 @@ extern void _keymgr_unlock_processwide_ptr (int);
 struct mach_header;
 struct mach_header_64;
 extern char *getsectdatafromheader (struct mach_header*, const char*,
-                       const char *, unsigned long *);
-extern char *getsectdatafromheader_64 (struct mach_header*, const char*,
-                       const char *, unsigned long *);
+                                   const char *, unsigned long *);
+extern char *getsectdatafromheader_64 (struct mach_header_64*, const char*,
+                                      const char *, unsigned long *);
 
 /* This is referenced from KEYMGR_GCC3_DW2_OBJ_LIST.  */
 struct km_object_info {
@@ -151,20 +152,19 @@ examine_objects (void *pc, struct dwarf_eh_bases *bases, int dont_alloc)
   for (; image != NULL; image = image->next)
     if ((image->examined_p & EXAMINED_IMAGE_MASK) == 0)
       {
-       char *fde;
+       char *fde = NULL;
        unsigned long sz;
 
-#ifdef __ppc64__
-       fde = getsectdatafromheader_64 ((struct mach_header_64 *) image->mh,
-                                    "__DATA", "__eh_frame", &sz);
-#else
+       /* For ppc only check whether or not we have __DATA eh frames.  */
+#ifdef __ppc__
        fde = getsectdatafromheader (image->mh, "__DATA", "__eh_frame", &sz);
 #endif
+
        if (fde == NULL)
          {
-#ifdef __ppc64__
+#if __LP64__
            fde = getsectdatafromheader_64 ((struct mach_header_64 *) image->mh,
-                                        "__TEXT", "__eh_frame", &sz);
+                                           "__TEXT", "__eh_frame", &sz);
 #else
            fde = getsectdatafromheader (image->mh, "__TEXT",
                                         "__eh_frame", &sz);
@@ -219,6 +219,7 @@ examine_objects (void *pc, struct dwarf_eh_bases *bases, int dont_alloc)
            if (result)
              {
                int encoding;
+               _Unwind_Ptr func;
 
                bases->tbase = ob->tbase;
                bases->dbase = ob->dbase;
@@ -228,8 +229,8 @@ examine_objects (void *pc, struct dwarf_eh_bases *bases, int dont_alloc)
                  encoding = get_fde_encoding (result);
                read_encoded_value_with_base (encoding,
                                              base_from_object (encoding, ob),
-                                             result->pc_begin,
-                                             (_Unwind_Ptr *)&bases->func);
+                                             result->pc_begin, &func);
+               bases->func = (void *) func;
                break;
              }
          }