From: Mark Kettenis Date: Fri, 13 Jun 2003 17:49:52 +0000 (+0000) Subject: From Kelley Cook : X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1581182a448382596b344ebc0857138310bec402;p=binutils-gdb.git From Kelley Cook : * configure.host: Accept i[34567]86 variants. * configure.tgt: Likewise. * nlm/configure.in: Likewise. * nlm/configure: Regenerated. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d90a9ee332f..d2aa80958da 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2003-06-13 Mark Kettenis + + From Kelley Cook : + * configure.host: Accept i[34567]86 variants. + * configure.tgt: Likewise. + * nlm/configure.in: Likewise. + * nlm/configure: Regenerated. + 2003-06-13 Richard Earnshaw * arm-tdep.c (solib-svr4.h): Dont' include it. diff --git a/gdb/configure.host b/gdb/configure.host index 0268a871af0..0c88533f785 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -13,7 +13,7 @@ case "${host_cpu}" in alpha*) gdb_host_cpu=alpha ;; arm*) gdb_host_cpu=arm ;; hppa*) gdb_host_cpu=pa ;; -i[3456]86*) gdb_host_cpu=i386 ;; +i[34567]86*) gdb_host_cpu=i386 ;; m68*) gdb_host_cpu=m68k ;; mips*) gdb_host_cpu=mips ;; powerpc*) gdb_host_cpu=powerpc ;; @@ -48,34 +48,34 @@ hppa*-*-hpux11*) gdb_host=hpux11 ;; hppa*-*-hpux*) gdb_host=hppahpux ;; # OBSOLETE hppa*-*-osf*) gdb_host=hppaosf ;; -i[3456]86-ncr-*) gdb_host=ncr3000 ;; +i[34567]86-ncr-*) gdb_host=ncr3000 ;; # OBSOLETE i[3456]86-sequent-bsd*) gdb_host=symmetry ;; # dynix # OBSOLETE i[3456]86-sequent-sysv4*) gdb_host=ptx4 ;; # OBSOLETE i[3456]86-sequent-sysv*) gdb_host=ptx ;; -i[3456]86-*-bsd*) gdb_host=i386bsd ;; -i[3456]86-*-dgux*) gdb_host=i386v4 ;; -i[3456]86-*-freebsd*) gdb_host=fbsd ;; -i[3456]86-*-netbsdelf*) gdb_host=nbsdelf ;; -i[3456]86-*-netbsdaout*) gdb_host=nbsdaout ;; -i[3456]86-*-netbsd*) gdb_host=nbsdaout ;; -i[3456]86-*-go32*) gdb_host=go32 ;; -i[3456]86-*-msdosdjgpp*) gdb_host=go32 ;; -i[3456]86-*-linux*) gdb_host=linux ;; -i[3456]86-*-lynxos*) gdb_host=i386lynx ;; -i[3456]86-*-gnu*) gdb_host=i386gnu ;; -i[3456]86-*-openbsd*) gdb_host=obsd ;; -i[3456]86-*-sco3.2v5*) gdb_host=i386sco5 ;; -i[3456]86-*-sco3.2v4*) gdb_host=i386sco4 ;; -i[3456]86-*-sco*) gdb_host=i386sco ;; -i[3456]86-*-solaris*) gdb_host=i386sol2 ;; -i[3456]86-*-sysv4.2*) gdb_host=i386v42mp ;; -i[3456]86-*-sysv4*) gdb_host=i386v4 ;; -i[3456]86-*-sysv5*) gdb_host=i386v42mp ;; -i[3456]86-*-unixware2*) gdb_host=i386v42mp ;; -i[3456]86-*-unixware*) gdb_host=i386v4 ;; -i[3456]86-*-sysv*) gdb_host=i386v ;; -i[3456]86-*-isc*) gdb_host=i386v ;; -i[3456]86-*-cygwin*) gdb_host=cygwin ;; +i[34567]86-*-bsd*) gdb_host=i386bsd ;; +i[34567]86-*-dgux*) gdb_host=i386v4 ;; +i[34567]86-*-freebsd*) gdb_host=fbsd ;; +i[34567]86-*-netbsdelf*) gdb_host=nbsdelf ;; +i[34567]86-*-netbsdaout*) gdb_host=nbsdaout ;; +i[34567]86-*-netbsd*) gdb_host=nbsdaout ;; +i[34567]86-*-go32*) gdb_host=go32 ;; +i[34567]86-*-msdosdjgpp*) gdb_host=go32 ;; +i[34567]86-*-linux*) gdb_host=linux ;; +i[34567]86-*-lynxos*) gdb_host=i386lynx ;; +i[34567]86-*-gnu*) gdb_host=i386gnu ;; +i[34567]86-*-openbsd*) gdb_host=obsd ;; +i[34567]86-*-sco3.2v5*) gdb_host=i386sco5 ;; +i[34567]86-*-sco3.2v4*) gdb_host=i386sco4 ;; +i[34567]86-*-sco*) gdb_host=i386sco ;; +i[34567]86-*-solaris*) gdb_host=i386sol2 ;; +i[34567]86-*-sysv4.2*) gdb_host=i386v42mp ;; +i[34567]86-*-sysv4*) gdb_host=i386v4 ;; +i[34567]86-*-sysv5*) gdb_host=i386v42mp ;; +i[34567]86-*-unixware2*) gdb_host=i386v42mp ;; +i[34567]86-*-unixware*) gdb_host=i386v4 ;; +i[34567]86-*-sysv*) gdb_host=i386v ;; +i[34567]86-*-isc*) gdb_host=i386v ;; +i[34567]86-*-cygwin*) gdb_host=cygwin ;; ia64-*-aix*) gdb_host=aix ;; ia64-*-linux*) gdb_host=linux ;; diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 3f90ed2de0c..21945c5f314 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -16,7 +16,7 @@ alpha*) gdb_target_cpu=alpha ;; arm*) gdb_target_cpu=arm ;; avr*) gdb_target_cpu=avr ;; hppa*) gdb_target_cpu=pa ;; -i[3456]86*) gdb_target_cpu=i386 ;; +i[34567]86*) gdb_target_cpu=i386 ;; m68hc11*|m6811*) gdb_target_cpu=m68hc11 ;; m68*) gdb_target_cpu=m68k ;; mips*) gdb_target_cpu=mips ;; @@ -85,27 +85,27 @@ hppa*-*-*) gdb_target=hppa ;; # OBSOLETE i[3456]86-sequent-bsd*) gdb_target=symmetry ;; # OBSOLETE i[3456]86-sequent-sysv4*) gdb_target=ptx4 ;; # OBSOLETE i[3456]86-sequent-sysv*) gdb_target=ptx ;; -i[3456]86-ncr-*) gdb_target=ncr3000 ;; -i[3456]86-*-bsd*) gdb_target=i386bsd ;; -i[3456]86-*-netbsd*) gdb_target=nbsd ;; -i[3456]86-*-openbsd*) gdb_target=obsd ;; -i[3456]86-*-go32*) gdb_target=i386aout ;; -i[3456]86-*-msdosdjgpp*) gdb_target=go32 ;; -i[3456]86-*-nto*) gdb_target=nto ;; -i[3456]86-*-lynxos*) gdb_target=i386lynx ;; -i[3456]86-*-solaris*) gdb_target=i386sol2 ;; -i[3456]86-*-sco*) gdb_target=i386v ;; -i[3456]86-*-sysv*) gdb_target=i386v ;; -i[3456]86-*-linux*) gdb_target=linux +i[34567]86-ncr-*) gdb_target=ncr3000 ;; +i[34567]86-*-bsd*) gdb_target=i386bsd ;; +i[34567]86-*-netbsd*) gdb_target=nbsd ;; +i[34567]86-*-openbsd*) gdb_target=obsd ;; +i[34567]86-*-go32*) gdb_target=i386aout ;; +i[34567]86-*-msdosdjgpp*) gdb_target=go32 ;; +i[34567]86-*-nto*) gdb_target=nto ;; +i[34567]86-*-lynxos*) gdb_target=i386lynx ;; +i[34567]86-*-solaris*) gdb_target=i386sol2 ;; +i[34567]86-*-sco*) gdb_target=i386v ;; +i[34567]86-*-sysv*) gdb_target=i386v ;; +i[34567]86-*-linux*) gdb_target=linux build_gdbserver=yes ;; -i[3456]86-*-isc*) gdb_target=i386v ;; -i[3456]86-*-gnu*) gdb_target=i386gnu ;; -i[3456]86-*-netware*) gdb_target=i386nw +i[34567]86-*-isc*) gdb_target=i386v ;; +i[34567]86-*-gnu*) gdb_target=i386gnu ;; +i[34567]86-*-netware*) gdb_target=i386nw configdirs="${configdirs} nlm" ;; -i[3456]86-*-cygwin*) gdb_target=cygwin ;; -i[3456]86-*-vxworks*) gdb_target=vxworks ;; -i[3456]86-*-*) gdb_target=embed ;; +i[34567]86-*-cygwin*) gdb_target=cygwin ;; +i[34567]86-*-vxworks*) gdb_target=vxworks ;; +i[34567]86-*-*) gdb_target=embed ;; ia64-*-aix*) gdb_target=aix ;; ia64-*-linux*) gdb_target=linux diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 3a324d630f2..8e9551715aa 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2003-06-13 Mark Kettenis + + From Kelley Cook : + * configure.srv: Accept i[34567]86 variants. + 2003-06-05 Daniel Jacobowitz * linux-low.c (linux_wait_for_event): Correct comment typos. diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 28dc2aad1f6..6ab60e93549 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -23,7 +23,7 @@ case "${target}" in srv_linux_usrregs=yes srv_linux_thread_db=yes ;; - i[3456]86-*-linux*) srv_regobj=reg-i386-linux.o + i[34567]86-*-linux*) srv_regobj=reg-i386-linux.o srv_tgtobj="linux-low.o linux-i386-low.o i387-fp.o" srv_linux_usrregs=yes srv_linux_regsets=yes diff --git a/gdb/nlm/configure b/gdb/nlm/configure index 3918fee794c..ca1146a14b4 100755 --- a/gdb/nlm/configure +++ b/gdb/nlm/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.2 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -28,6 +28,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -142,6 +143,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -312,6 +314,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -333,7 +340,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12.2" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -477,12 +484,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +if test -z "$sitefile"; then + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -569,7 +580,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:573: checking host system type" >&5 +echo "configure:584: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -590,7 +601,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:594: checking target system type" >&5 +echo "configure:605: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -608,7 +619,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:612: checking build system type" >&5 +echo "configure:623: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -662,7 +673,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:666: checking for a BSD compatible install" >&5 +echo "configure:677: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -710,6 +721,8 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -719,7 +732,7 @@ case "${target_cpu}" in alpha) gdb_target_cpu=alpha ;; c[12]) gdb_target_cpu=convex ;; hppa*) gdb_target_cpu=pa ;; -i[3456]86) gdb_target_cpu=i386 ;; +i[34567]86) gdb_target_cpu=i386 ;; m68*) gdb_target_cpu=m68k ;; np1) gdb_target_cpu=gould ;; pn) gdb_target_cpu=gould ;; @@ -773,7 +786,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -852,7 +865,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12.2" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -876,6 +889,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -910,6 +924,7 @@ s%@build_cpu@%$build_cpu%g s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@target_makefile_frag_path@%$target_makefile_frag_path%g /@target_makefile_frag@/r $target_makefile_frag diff --git a/gdb/nlm/configure.in b/gdb/nlm/configure.in index 845b486e524..ba415aa31e1 100644 --- a/gdb/nlm/configure.in +++ b/gdb/nlm/configure.in @@ -15,7 +15,7 @@ case "${target_cpu}" in alpha) gdb_target_cpu=alpha ;; c[12]) gdb_target_cpu=convex ;; hppa*) gdb_target_cpu=pa ;; -i[3456]86) gdb_target_cpu=i386 ;; +i[34567]86) gdb_target_cpu=i386 ;; m68*) gdb_target_cpu=m68k ;; np1) gdb_target_cpu=gould ;; pn) gdb_target_cpu=gould ;;