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

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

diff --git a/gdb/configure b/gdb/configure
index bc449233e5605bcf74a4900592fa81e819dc9320..ca5ef18f6692e6805f42925d5c7e3b4035927cd7 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -1699,8 +1699,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 ;;
 
@@ -1851,8 +1851,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
 
@@ -1875,18 +1875,21 @@ target_makefile_frag_path=$target_makefile_frag
 
 
 
+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//'`
@@ -2193,7 +2196,15 @@ while test -n "$ac_sources"; do
     { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
   fi
 done
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
+gdb_host_cpu=$gdb_host_cpu
+gdb_target_cpu=$gdb_target_cpu
+nativefile=$nativefile
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 
 if test "${nativefile}" = ""; then
 sed -e '/^NATDEPFILES= /s//# NATDEPFILES= /' \