Re: RFA: Try to include libunwind-ia64.h in libunwind-frame.h

Tristan Gingold
2012-02-13T08:41:09Z

On Feb 11, 2012, at 3:09 PM, Jan Kratochvil wrote:

> On Fri, 10 Feb 2012 19:33:34 +0100, Pedro Alves wrote:
>> What about --enable-targets=all, or --target=x86_64-foo --enable-target=ia64-xxx ?
>
> Fixed.

Looks good to me.
[Although I wouldn't have cared about non-ia64 targets, as libunwind is used only by ia64]

Tristan.

>
>
> Thanks,
> Jan
>
>
> 2012-02-11 Jan Kratochvil <jan.kratochvil@redhat.com>
> Tristan Gingold <gingold@adacore.com>
>
> * configure.ac (gdb_target_cpu_has_ia64): New variable. Set it for
> --target and --enable-targets parameters.
> (--with-libunwind=auto): Set enable_libunwind for either of
> libunwind.h or libunwind-ia64.h with $gdb_target_cpu_has_ia64.
> * configure: Regenerate.
> * libunwind-frame.h: Conditionalize the file for HAVE_LIBUNWIND and
> not HAVE_LIBUNWIND_H. Include libunwind-ia64.h instead of libunwind.h
> if possible.
>
> --- a/gdb/configure.ac
> +++ b/gdb/configure.ac
> @@ -184,6 +184,13 @@ fi
> TARGET_OBS=
> all_targets=
>
> +# Set to true if any of the supported targets uses ia64 CPU.
> +# libunwind libraries can be installed for multiple architecture targets but
> +# GDB libunwind-frame.c can support only architecture. If there are multiple
> +# target architectures supported by libunwind prefer ia64 - while GDB can
> +# unwind other architectures on its own GDB can unwind ia64 only with libunwind.
> +gdb_target_cpu_has_ia64=false
> +
> for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
> do
> if test "$targ_alias" = "all"; then
> @@ -216,6 +223,12 @@ do
> if test x${want64} = xfalse; then
> . ${srcdir}/../bfd/config.bfd
> fi
> +
> + case "$targ" in
> + ia64*)
> + gdb_target_cpu_has_ia64=true
> + ;;
> + esac
> fi
> done
>
> @@ -241,6 +254,7 @@ if test x${all_targets} = xtrue; then
> else
> TARGET_OBS='$(ALL_TARGET_OBS)'
> fi
> + gdb_target_cpu_has_ia64=true
> fi
>
> AC_SUBST(TARGET_OBS)
> @@ -349,8 +363,10 @@ AS_HELP_STRING([--with-libunwind], [use libunwind frame unwinding support]),
> *) 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
> - enable_libunwind=yes;
> + if $gdb_target_cpu_has_ia64 && test x"$ac_cv_header_libunwind_ia64_h" = xyes; then
> + enable_libunwind=yes
> + elif test x"$ac_cv_header_libunwind_h" = xyes; then
> + enable_libunwind=yes
> fi
> ])
>
> --- a/gdb/libunwind-frame.h
> +++ b/gdb/libunwind-frame.h
> @@ -19,7 +19,7 @@
> You should have received a copy of the GNU General Public License
> along with this program. If not, see <http://www.gnu.org/licenses/>. */
>
> -#ifdef HAVE_LIBUNWIND_H
> +#ifdef HAVE_LIBUNWIND
>
> struct frame_info;
> struct frame_id;
> @@ -29,7 +29,13 @@ struct gdbarch;
> #ifndef LIBUNWIND_FRAME_H
> #define LIBUNWIND_FRAME_H 1
>
> -#include "libunwind.h"
> +#if defined HAVE_LIBUNWIND_IA64_H
> +# include "libunwind-ia64.h"
> +#elif defined HAVE_LIBUNWIND_H
> +# include "libunwind.h"
> +#else
> +# error "HAVE_LIBUNWIND && !HAVE_LIBUNWIND_IA64_H && !HAVE_LIBUNWIND_H"
> +#endif
>
> struct libunwind_descr
> {
> @@ -73,4 +79,4 @@ int libunwind_get_reg_special (struct gdbarch *gdbarch,
>
> #endif /* libunwind-frame.h */
>
> -#endif /* HAVE_LIBUNWIND_H */
> +#endif /* HAVE_LIBUNWIND */