From 9ac544cece0ff0ae2782d70049c8c8f0a3924bf7 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 17 Nov 2009 17:58:15 +0000 Subject: [PATCH] 2009-11-17 Nathan Sidwell 2009-11-17 Vladimir Prus * Makefile.in (reg-cf.o, reg-cf.c): New targets. * configure.ac: Check for __mcoldfire__ and set gdb_cv_m68k_is_coldfire. * configure.srv: Use gdb_cv_m68k_is_coldfire to select between reg-cf.o and reg-m68k.o. * configure: Regenerated. 2009-11-17 Nathan Sidwell * regformats/reg-cf.dat: New file. --- gdb/ChangeLog | 4 ++++ gdb/gdbserver/ChangeLog | 10 ++++++++++ gdb/gdbserver/Makefile.in | 3 +++ gdb/gdbserver/configure | 29 +++++++++++++++++++++++++++++ gdb/gdbserver/configure.ac | 12 ++++++++++++ gdb/gdbserver/configure.srv | 12 ++++++++++-- 6 files changed, 68 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 049152c316..e90740bd70 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2009-11-17 Nathan Sidwell + + * regformats/reg-cf.dat: New file. + 2009-11-17 Daniel Jacobowitz * m68k-tdep.c (m68k_register_name): Check fpregs_present. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index c4f8c22a2b..ce62365ec8 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,13 @@ +2009-11-17 Nathan Sidwell +2009-11-17 Vladimir Prus + + * Makefile.in (reg-cf.o, reg-cf.c): New targets. + * configure.ac: Check for __mcoldfire__ and set + gdb_cv_m68k_is_coldfire. + * configure.srv: Use gdb_cv_m68k_is_coldfire to select between + reg-cf.o and reg-m68k.o. + * configure: Regenerated. + 2009-11-16 Pedro Alves * linux-low.c (linux_remove_process): Add `detaching' parameter. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 155094bdeb..cfd9d0fd5a 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -359,6 +359,9 @@ reg-m32r.c : $(srcdir)/../regformats/reg-m32r.dat $(regdat_sh) reg-m68k.o : reg-m68k.c $(regdef_h) reg-m68k.c : $(srcdir)/../regformats/reg-m68k.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-m68k.dat reg-m68k.c +reg-cf.o : reg-cf.c $(regdef_h) +reg-cf.c : $(srcdir)/../regformats/reg-cf.dat $(regdat_sh) + $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-cf.dat reg-cf.c mips-linux.o : mips-linux.c $(regdef_h) mips-linux.c : $(srcdir)/../regformats/mips-linux.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/mips-linux.dat mips-linux.c diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 955f716567..93aeb780d6 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4005,6 +4005,35 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_i386_is_x86_64" >&5 $as_echo "$gdb_cv_i386_is_x86_64" >&6; } ;; + m68k-*-*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if building for Coldfire" >&5 +$as_echo_n "checking if building for Coldfire... " >&6; } +if test "${gdb_cv_m68k_is_coldfire+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef __mcoldfire__ +got it +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "got it" >/dev/null 2>&1; then : + gdb_cv_m68k_is_coldfire=yes +else + gdb_cv_m68k_is_coldfire=no +fi +rm -f conftest* + + CPPFLAGS="$save_CPPFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_m68k_is_coldfire" >&5 +$as_echo "$gdb_cv_m68k_is_coldfire" >&6; } + ;; esac . ${srcdir}/configure.srv diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 57eaf2172d..215387dff4 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -90,6 +90,18 @@ got it [gdb_cv_i386_is_x86_64=no]) CPPFLAGS="$save_CPPFLAGS"]) ;; + m68k-*-*) + AC_CACHE_CHECK([if building for Coldfire], [gdb_cv_m68k_is_coldfire], + [save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $CFLAGS" + AC_EGREP_CPP([got it], [ +#ifdef __mcoldfire__ +got it +#endif + ], [gdb_cv_m68k_is_coldfire=yes], + [gdb_cv_m68k_is_coldfire=no]) + CPPFLAGS="$save_CPPFLAGS"]) + ;; esac . ${srcdir}/configure.srv diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index ea746be1a1..1814b0e69d 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -98,13 +98,21 @@ case "${target}" in srv_linux_usrregs=yes srv_linux_thread_db=yes ;; - m68*-*-linux*) srv_regobj=reg-m68k.o + m68*-*-linux*) if test "$gdb_cv_m68k_is_coldfire" = yes; then + srv_regobj=reg-cf.o + else + src_regobj=reg-m68k.o + fi srv_tgtobj="linux-low.o linux-m68k-low.o" srv_linux_usrregs=yes srv_linux_regsets=yes srv_linux_thread_db=yes ;; - m68*-*-uclinux*) srv_regobj=reg-m68k.o + m68*-*-uclinux*) if test "$gdb_cv_m68k_is_coldfire" = yes; then + srv_regobj=reg-cf.o + else + src_regobj=reg-m68k.o + fi srv_tgtobj="linux-low.o linux-m68k-low.o" srv_linux_usrregs=yes srv_linux_regsets=yes -- 2.34.1