From 0f475e278d27573b3c0c2f2bac958eed3ae965ef Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 2 Sep 2004 22:14:33 +0000 Subject: [PATCH] 2004-09-02 Andrew Cagney * configure.in: Let TM_FILE, XM_FILE and NAT_FILE specify a path. * configure: Re-generate. * config/arm/nbsd.mt (TM_FILE): Set to "solib.h". * config/arm/tm-nbsd.h: Delete file. --- gdb/ChangeLog | 5 +++++ gdb/config/arm/nbsd.mt | 2 +- gdb/config/arm/tm-nbsd.h | 26 ---------------------- gdb/configure | 47 ++++++++++++++++++++++++---------------- gdb/configure.in | 15 ++++++++++--- 5 files changed, 46 insertions(+), 49 deletions(-) delete mode 100644 gdb/config/arm/tm-nbsd.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 78452867186..06e312d5d92 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2004-09-02 Andrew Cagney + * configure.in: Let TM_FILE, XM_FILE and NAT_FILE specify a path. + * configure: Re-generate. + * config/arm/nbsd.mt (TM_FILE): Set to "solib.h". + * config/arm/tm-nbsd.h: Delete file. + * config/powerpc/tm-ppcle-sim.h: Delete. * config/powerpc/tm-ppcle-eabi.h: Delete. * config/powerpc/tm-nbsd.h: Delete. diff --git a/gdb/config/arm/nbsd.mt b/gdb/config/arm/nbsd.mt index 1e7d4fa3e61..5754292afe7 100644 --- a/gdb/config/arm/nbsd.mt +++ b/gdb/config/arm/nbsd.mt @@ -1,3 +1,3 @@ # Target: ARM running NetBSD TDEPFILES= arm-tdep.o armnbsd-tdep.o solib.o solib-svr4.o nbsd-tdep.o -TM_FILE=tm-nbsd.h +TM_FILE=solib.h diff --git a/gdb/config/arm/tm-nbsd.h b/gdb/config/arm/tm-nbsd.h deleted file mode 100644 index 97bca68bc18..00000000000 --- a/gdb/config/arm/tm-nbsd.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Macro definitions for ARM running under NetBSD. - Copyright 2003 Free Software Foundation, Inc. - - This file is part of GDB. - - This program 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 of the License, or - (at your option) any later version. - - This program 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 this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef TM_NBSD_H -#define TM_NBSD_H - -#include "solib.h" - -#endif /* TM_NBSD_H */ diff --git a/gdb/configure b/gdb/configure index d173c86aaed..c9b639f9fa3 100755 --- a/gdb/configure +++ b/gdb/configure @@ -11032,7 +11032,10 @@ rm -f xm.h xm_h="" if test "${hostfile}" != ""; then xm_h=xm.h - GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" + case "${hostfile}" in + xm-*.h ) GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" ;; + * ) GDB_XM_FILE="${hostfile}" + esac files="${files} ${GDB_XM_FILE}" links="${links} xm.h" cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 -echo "configure:11077: checking for Cygwin environment" >&5 +echo "configure:11086: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -11106,19 +11115,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:11110: checking for mingw32 environment" >&5 +echo "configure:11119: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -11137,7 +11146,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:11141: checking for executable suffix" >&5 +echo "configure:11150: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11147,7 +11156,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:11151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:11160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; @@ -11189,7 +11198,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:11193: checking for iconv" >&5 +echo "configure:11202: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11197,7 +11206,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -11207,7 +11216,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:11211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -11219,7 +11228,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -11229,7 +11238,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:11233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -11250,13 +11259,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:11254: checking for iconv declaration" >&5 +echo "configure:11263: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -11275,7 +11284,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else diff --git a/gdb/configure.in b/gdb/configure.in index e527648ff74..89a9fc27ea3 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -1520,7 +1520,10 @@ rm -f xm.h xm_h="" if test "${hostfile}" != ""; then xm_h=xm.h - GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" + case "${hostfile}" in + xm-*.h ) GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" ;; + * ) GDB_XM_FILE="${hostfile}" + esac files="${files} ${GDB_XM_FILE}" links="${links} xm.h" AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}") @@ -1531,7 +1534,10 @@ rm -f tm.h tm_h="" if test "${targetfile}" != ""; then tm_h=tm.h - GDB_TM_FILE="config/${gdb_target_cpu}/${targetfile}" + case "${targetfile}" in + tm-*.h ) GDB_TM_FILE="config/${gdb_host_cpu}/${targetfile}" ;; + * ) GDB_TM_FILE="${targetfile}" + esac files="${files} ${GDB_TM_FILE}" links="${links} tm.h" AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}") @@ -1542,7 +1548,10 @@ rm -f nm.h nm_h="" if test "${nativefile}" != ""; then nm_h=nm.h - GDB_NM_FILE="config/${gdb_host_cpu}/${nativefile}" + case "${nativefile}" in + nm-*.h ) GDB_NM_FILE="config/${gdb_host_cpu}/${nativefile}" ;; + * ) GDB_NM_FILE="${nativefile}" + esac files="${files} ${GDB_NM_FILE}" links="${links} nm.h" AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}") -- 2.30.2