* inftarg.c (child_thread_alive): New function to see if a

[deliverable/binutils-gdb.git] / gdb / configure.in

diff --git a/gdb/configure.in b/gdb/configure.in
index fe4fac16d778774ee13692167d75092664506d60..5a0b19bdc0e908ab0a2cae2cc600b3674328481c 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -251,8 +251,8 @@ arm-*-*)            gdb_target=arm ;;
 c1-*-*)                        gdb_target=convex ;;
 c2-*-*)                        gdb_target=convex ;;
 
-h8300-*-*)             gdb_target=h8300hms ;;
-h8500-*-*)             gdb_target=h8500hms ;;
+h8300-*-*)             gdb_target=h8300 ;;
+h8500-*-*)             gdb_target=h8500 ;;
 
 sh-*-*)                        gdb_target=sh ;;
 
@@ -403,8 +403,8 @@ vax-*-*)            gdb_target=vax ;;
 
 w65-*-*)               gdb_target=w65 ;;
 
-z8k-*-sim*)            gdb_target=z8ksim ;;
-z8k-*-coff*)           gdb_target=z8ksim ;;
+z8k-*-sim*)            gdb_target=z8k ;;
+z8k-*-coff*)           gdb_target=z8k ;;
 
 esac
 
@@ -433,23 +433,27 @@ AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 AC_SUBST_FILE(target_makefile_frag)
 
+changequote(,)dnl
+hostfile=`sed -n '
+s/XM_FILE[     ]*=[    ]*\([^  ]*\)/\1/p
+' ${host_makefile_frag}`
 
-#  We really shouldn't depend on there being a space after XM_FILE= ...
-hostfile=`awk '$1 == "XM_FILE=" { print $2 }' ${host_makefile_frag}`
-
-#  We really shouldn't depend on there being a space after TM_FILE= ...
-targetfile=`awk '$1 == "TM_FILE=" { print $2 }' ${target_makefile_frag}`
+targetfile=`sed -n '
+s/TM_FILE[     ]*=[    ]*\([^  ]*\)/\1/p
+' ${target_makefile_frag}`
 
 # these really aren't orthogonal true/false values of the same condition,
 # but shells are slow enough that I like to reuse the test conditions
 # whenever possible
 if test "${target}" = "${host}"; then
-nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' ${host_makefile_frag}`
+nativefile=`sed -n '
+s/NAT_FILE[    ]*=[    ]*\([^  ]*\)/\1/p
+' ${host_makefile_frag}`
 else
 # GDBserver is only useful in a "native" enviroment
 configdirs=`echo $configdirs | sed 's/gdbserver//'`
 fi
-
+changequote([,])
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
 # (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the
@@ -515,4 +519,9 @@ case ${srcdir} in
 grep "source ${srcdir}/.gdbinit" .gdbinit >/dev/null 2>/dev/null || \
 echo "source ${srcdir}/.gdbinit" >> .gdbinit
 esac
+],
+[
+gdb_host_cpu=$gdb_host_cpu
+gdb_target_cpu=$gdb_target_cpu
+nativefile=$nativefile
 ])