diff options
author | Andrew Cagney <cagney@redhat.com> | 2003-09-03 15:02:51 +0000 |
---|---|---|
committer | Andrew Cagney <cagney@redhat.com> | 2003-09-03 15:02:51 +0000 |
commit | 4922db005ece3921dc06dc7fac16b43e93e1ce54 (patch) | |
tree | 6d3a59eced8d4258dfdfa142be75637fce173acb /gdb/configure | |
parent | bdbe0dd984f7a2a67b119ba0a291f6ea07906e74 (diff) | |
download | gdb-4922db005ece3921dc06dc7fac16b43e93e1ce54.tar.gz |
2003-09-03 Andrew Cagney <cagney@redhat.com>
* defs.h: Do not include "arch-utils.h".
(GDB_MULTI_ARCH): If not defined, set to GDB_MULTI_ARCH_PARTIAL or
GDB_MULTI_ARCH_PURE.
* configure.in (GDB_MULTI_ARCH): Do not define.
* configure, config.in: Regenerate.
* configure.tgt: Do not set variable "gdb_multi_arch".
* config/s390/s390x.mt (GDB_MULTI_ARCH): Delete.
* config/s390/s390.mt (GDB_MULTI_ARCH): Delete.
* config/i386/x86-64linux.mt (GDB_MULTI_ARCH): Delete.
* config/v850/v850.mt (TM_FILE): Delete disabled definition.
* config/m68hc11/m68hc11.mt (TM_FILE): Delete definition.
* config/vax/tm-vax.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-sparc.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-sun4sol2.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-nbsd.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-linux.h (GDB_MULTI_ARCH): Delete definition.
* config/sparc/tm-sp64.h (GDB_MULTI_ARCH): Delete definition.
* config/pa/tm-hppa64.h (GDB_MULTI_ARCH): Delete definition.
* config/ns32k/tm-ns32k.h (GDB_MULTI_ARCH): Delete definition.
* config/m68k/tm-m68k.h (GDB_MULTI_ARCH): Delete definition.
* config/i386/tm-i386.h (GDB_MULTI_ARCH): Delete definition.
* config/h8300/tm-h8300.h (GDB_MULTI_ARCH): Delete definition.
* config/frv/tm-frv.h (GDB_MULTI_ARCH): Delete definition.
* config/alpha/tm-alpha.h (GDB_MULTI_ARCH): Delete definition.
Diffstat (limited to 'gdb/configure')
-rwxr-xr-x | gdb/configure | 70 |
1 files changed, 18 insertions, 52 deletions
diff --git a/gdb/configure b/gdb/configure index 1a9a877ddab..f2015caca5a 100755 --- a/gdb/configure +++ b/gdb/configure @@ -10239,10 +10239,6 @@ targetfile=`sed -n ' s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p ' ${target_makefile_frag}` -GDB_MULTI_ARCH=`sed -n ' -s/GDB_MULTI_ARCH[ ]*=[ ]*\([^ ]*\)[ ]*/\1/p -' ${target_makefile_frag}` - if test "${target}" = "${host}"; then # We pick this up from the host configuration file (.mh) because we # do not have a native configuration Makefile fragment. @@ -10252,36 +10248,6 @@ s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p fi -# New targets should just set gdb_multi_arch=yes in configure.tgt. -# Old targets being converted can either do that or set GDB_MULTI_ARCH -# in the target specific makefile frag. Eventually gdb_multi_arch=yes -# will be the default. -if test x"${GDB_MULTI_ARCH}" = x ; then - case "${gdb_multi_arch}" in - yes ) GDB_MULTI_ARCH=GDB_MULTI_ARCH_PURE ;; - no ) GDB_MULTI_ARCH=0 ;; - 0|1|2 ) GDB_MULTI_ARCH=${gdb_multi_arch} ;; - esac -fi -if test x"${GDB_MULTI_ARCH}" != x ; then - cat >> confdefs.h <<EOF -#define GDB_MULTI_ARCH ${GDB_MULTI_ARCH} -EOF - -fi -# Warn the user when they use an old practice -case "${GDB_MULTI_ARCH}" in - "" ) ;; - 0 | GDB_MULTI_ARCH_PARTIAL | 1 | GDB_MULTI_ARCH_TM | 2 ) - echo "configure: warning: "GDB: Target is not pure multi-arch"" 1>&2 ;; - GDB_MULTI_ARCH_PURE ) - if test x"${targetfile}" != x ; then - echo "configure: warning: "GDB: Ignoring TM_FILE in ${target_makefile_frag}"" 1>&2 - targetfile="" - fi ;; - *) { echo "configure: error: "GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}"" 1>&2; exit 1; };; -esac - if test x"${gdb_osabi}" != x ; then cat >> confdefs.h <<EOF #define GDB_OSABI_DEFAULT $gdb_osabi @@ -10307,7 +10273,7 @@ fi # We only build gdbserver automatically if host and target are the same. if test "x$target" = "x$host"; then echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6 -echo "configure:10311: checking whether gdbserver is supported on this host" >&5 +echo "configure:10277: checking whether gdbserver is supported on this host" >&5 if test "x$build_gdbserver" = xyes; then configdirs="$configdirs gdbserver" echo "$ac_t""yes" 1>&6 @@ -10371,12 +10337,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:10375: checking for Cygwin environment" >&5 +echo "configure:10341: 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 <<EOF -#line 10380 "configure" +#line 10346 "configure" #include "confdefs.h" int main() { @@ -10387,7 +10353,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:10391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -10404,19 +10370,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:10408: checking for mingw32 environment" >&5 +echo "configure:10374: 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 <<EOF -#line 10413 "configure" +#line 10379 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:10420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -10435,7 +10401,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:10439: checking for executable suffix" >&5 +echo "configure:10405: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10445,10 +10411,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:10449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:10415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj | *.ilk | *.pdb) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -10487,7 +10453,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:10491: checking for iconv" >&5 +echo "configure:10457: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10495,7 +10461,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext <<EOF -#line 10499 "configure" +#line 10465 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -10505,7 +10471,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:10509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -10517,7 +10483,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext <<EOF -#line 10521 "configure" +#line 10487 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -10527,7 +10493,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:10531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10497: \"$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 @@ -10548,13 +10514,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:10552: checking for iconv declaration" >&5 +echo "configure:10518: 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 <<EOF -#line 10558 "configure" +#line 10524 "configure" #include "confdefs.h" #include <stdlib.h> @@ -10573,7 +10539,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else |