From b54a8fd70210fd1fc7b4f41c4679737066951033 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 21 Feb 2012 19:39:32 +0000 Subject: [PATCH] 2012-02-21 Tristan Gingold Pedro Alves * ia64-tdep.c: Do not include libunwind-ia64.h. * libunwind-frame.h: Remove #ifdef HAVE_LIBUNWIND_H guard. Include libunwind-ia64.h instead of libunwind.h. * configure.ac (--with-libunwind, $enable_libunwind): Don't check for libunwind.h existence. * configure, config.in: Regenerate. --- gdb/ChangeLog | 10 ++++++++++ gdb/config.in | 3 --- gdb/configure | 22 +++++++++------------- gdb/configure.ac | 6 +++--- gdb/ia64-tdep.c | 1 - gdb/libunwind-frame.c | 8 ++++++++ gdb/libunwind-frame.h | 12 +++++++----- 7 files changed, 37 insertions(+), 25 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0b29feb..0018193 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2012-02-21 Tristan Gingold + Pedro Alves + + * ia64-tdep.c: Do not include libunwind-ia64.h. + * libunwind-frame.h: Remove #ifdef HAVE_LIBUNWIND_H guard. + Include libunwind-ia64.h instead of libunwind.h. + * configure.ac (--with-libunwind, $enable_libunwind): Don't check + for libunwind.h existence. + * configure, config.in: Regenerate. + 2012-02-21 Anton Gorenkov * c-valprint.c (c_value_print): Use value_rtti_indirect_type diff --git a/gdb/config.in b/gdb/config.in index bae1763..194cc7d 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -242,9 +242,6 @@ /* Define if libunwind library is being used. */ #undef HAVE_LIBUNWIND -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBUNWIND_H - /* Define to 1 if you have the header file. */ #undef HAVE_LIBUNWIND_IA64_H diff --git a/gdb/configure b/gdb/configure index 2566410..9cb3742 100755 --- a/gdb/configure +++ b/gdb/configure @@ -8252,21 +8252,19 @@ if test "${with_libunwind+set}" = set; then : esac else - for ac_header in libunwind.h libunwind-ia64.h + for ac_header in libunwind-ia64.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : + ac_fn_c_check_header_mongrel "$LINENO" "libunwind-ia64.h" "ac_cv_header_libunwind_ia64_h" "$ac_includes_default" +if test "x$ac_cv_header_libunwind_ia64_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LIBUNWIND_IA64_H 1 _ACEOF fi done - if test x"$ac_cv_header_libunwind_h" = xyes -a x"$ac_cv_header_libunwind_ia64_h" = xyes; then + if test x"$ac_cv_header_libunwind_ia64_h" = xyes; then enable_libunwind=yes; fi @@ -8274,14 +8272,12 @@ fi if test x"$enable_libunwind" = xyes; then - for ac_header in libunwind.h libunwind-ia64.h + for ac_header in libunwind-ia64.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : + ac_fn_c_check_header_mongrel "$LINENO" "libunwind-ia64.h" "ac_cv_header_libunwind_ia64_h" "$ac_includes_default" +if test "x$ac_cv_header_libunwind_ia64_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LIBUNWIND_IA64_H 1 _ACEOF fi diff --git a/gdb/configure.ac b/gdb/configure.ac index 1b11adb..c4c84a0 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -348,14 +348,14 @@ AS_HELP_STRING([--with-libunwind], [use libunwind frame unwinding support]), no) enable_libunwind=no ;; *) AC_MSG_ERROR(bad value ${withval} for GDB with-libunwind option) ;; esac],[ - AC_CHECK_HEADERS(libunwind.h libunwind-ia64.h) - if test x"$ac_cv_header_libunwind_h" = xyes -a x"$ac_cv_header_libunwind_ia64_h" = xyes; then + AC_CHECK_HEADERS(libunwind-ia64.h) + if test x"$ac_cv_header_libunwind_ia64_h" = xyes; then enable_libunwind=yes; fi ]) if test x"$enable_libunwind" = xyes; then - AC_CHECK_HEADERS(libunwind.h libunwind-ia64.h) + AC_CHECK_HEADERS(libunwind-ia64.h) AC_DEFINE(HAVE_LIBUNWIND, 1, [Define if libunwind library is being used.]) CONFIG_OBS="$CONFIG_OBS libunwind-frame.o" CONFIG_DEPS="$CONFIG_DEPS libunwind-frame.o" diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index a297ecc..a36dc22 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -43,7 +43,6 @@ #ifdef HAVE_LIBUNWIND_IA64_H #include "elf/ia64.h" /* for PT_IA_64_UNWIND value */ #include "libunwind-frame.h" -#include "libunwind-ia64.h" /* Note: KERNEL_START is supposed to be an address which is not going to ever contain any valid unwind info. For ia64 linux, the choice diff --git a/gdb/libunwind-frame.c b/gdb/libunwind-frame.c index 893fe1e..f8f5289 100644 --- a/gdb/libunwind-frame.c +++ b/gdb/libunwind-frame.c @@ -40,6 +40,14 @@ #include "complaints.h" +/* IA-64 is the only target that currently uses libunwind-frame. Note + how UNW_TARGET, UNW_OBJ, etc. are compile time constants below. + Those come from libunwind's headers, and are target dependent. + Also, some of libunwind's typedefs are target dependent, as e.g., + unw_word_t. If some other target wants to use this, we will need + to do some abstracting in order to make it possible to select which + libunwind we're talking to at runtime (and have one per arch). */ + /* The following two macros are normally defined in . But systems such as ia64-hpux do not provide such header, so we just define them here if not already defined. */ diff --git a/gdb/libunwind-frame.h b/gdb/libunwind-frame.h index 0251819..ef98177 100644 --- a/gdb/libunwind-frame.h +++ b/gdb/libunwind-frame.h @@ -19,8 +19,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_LIBUNWIND_H - struct frame_info; struct frame_id; struct regcache; @@ -29,7 +27,13 @@ struct gdbarch; #ifndef LIBUNWIND_FRAME_H #define LIBUNWIND_FRAME_H 1 -#include "libunwind.h" +/* IA-64 is the only target that currently uses libunwind. If some + other target wants to use it, we will need to do some abstracting + in order to make it possible to have more than one libunwind-frame + instance. Including "libunwind.h" is wrong as that ends up + including the libunwind-$(arch).h for the host gdb is running + on. */ +#include "libunwind-ia64.h" struct libunwind_descr { @@ -72,5 +76,3 @@ int libunwind_get_reg_special (struct gdbarch *gdbarch, int regnum, void *buf); #endif /* libunwind-frame.h */ - -#endif /* HAVE_LIBUNWIND_H */ -- 2.7.4