diff options
Diffstat (limited to 'contrib/gcc/unwind-dw2-fde-glibc.c')
-rw-r--r-- | contrib/gcc/unwind-dw2-fde-glibc.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/contrib/gcc/unwind-dw2-fde-glibc.c b/contrib/gcc/unwind-dw2-fde-glibc.c index 21b3321..71fbf61 100644 --- a/contrib/gcc/unwind-dw2-fde-glibc.c +++ b/contrib/gcc/unwind-dw2-fde-glibc.c @@ -1,20 +1,20 @@ -/* Copyright (C) 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Jakub Jelinek <jakub@redhat.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 + 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. - GNU CC is distributed in the hope that it will be useful, + 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 GNU CC; see the file COPYING. If not, write to + 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. */ @@ -35,12 +35,12 @@ #include "auto-host.h" /* For HAVE_LD_EH_FRAME_HDR. */ #include "tconfig.h" +#include "tsystem.h" #ifndef inhibit_libc -#include <stddef.h> -#include <stdlib.h> #include <link.h> #endif -#include "tsystem.h" +#include "coretypes.h" +#include "tm.h" #include "dwarf2.h" #include "unwind.h" #define NO_BASE_OF_ENCODED_VALUE @@ -52,7 +52,7 @@ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) -static fde * _Unwind_Find_registered_FDE (void *pc, struct dwarf_eh_bases *bases); +static const fde * _Unwind_Find_registered_FDE (void *pc, struct dwarf_eh_bases *bases); #define _Unwind_Find_FDE _Unwind_Find_registered_FDE #include "unwind-dw2-fde.c" @@ -68,7 +68,7 @@ struct unw_eh_callback_data void *tbase; void *dbase; void *func; - fde *ret; + const fde *ret; }; struct unw_eh_frame_hdr @@ -155,7 +155,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) data->dbase = NULL; if (p_dynamic) { - /* For dynamicly linked executables and shared libraries, + /* For dynamically linked executables and shared libraries, DT_PLTGOT is the gp value for that object. */ ElfW(Dyn) *dyn = (ElfW(Dyn) *) (p_dynamic->p_vaddr + load_base); for (; dyn->d_tag != DT_NULL ; dyn++) @@ -170,9 +170,6 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) # error What is DW_EH_PE_datarel base on this platform? # endif #endif -#ifdef CRT_GET_RFIB_TEXT -# error What is DW_EH_PE_textrel base on this platform? -#endif p = read_encoded_value_with_base (hdr->eh_frame_ptr_enc, base_from_cb_data (hdr->eh_frame_ptr_enc, @@ -264,11 +261,11 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) return 1; } -fde * +const fde * _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases) { struct unw_eh_callback_data data; - fde *ret; + const fde *ret; ret = _Unwind_Find_registered_FDE (pc, bases); if (ret != NULL) |