From 4dc0535b80c2b9031f3df755e7c933888c3d29e8 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 5 Apr 2001 04:34:24 +0000 Subject: [PATCH] config.gcc: Remove default for xm_file. * config.gcc: Remove default for xm_file. Clean up local machine type handling. Remove settings of xm_file to something that doesn't exist. In the big switch, set xm_file, don't append to it (the value before the big switch is always null). Don't force build_xm_file or host_xm_file to have a value. * configure.in: Remove default for xm_file. Do not special case $cpu/xm-$cpu.h not existing. * configure: Regenerate. From-SVN: r41106 --- gcc/ChangeLog | 11 +++ gcc/config.gcc | 41 +++++------ gcc/configure | 173 ++++++++++++++++++++++------------------------- gcc/configure.in | 13 +--- 4 files changed, 112 insertions(+), 126 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cfc9306318e..3de4ba4b606 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2001-04-04 Zack Weinberg + + * config.gcc: Remove default for xm_file. Clean up local + machine type handling. Remove settings of xm_file to + something that doesn't exist. In the big switch, set xm_file, + don't append to it (the value before the big switch is always + null). Don't force build_xm_file or host_xm_file to have a value. + * configure.in: Remove default for xm_file. Do not special + case $cpu/xm-$cpu.h not existing. + * configure: Regenerate. + 2001-04-04 Diego Novillo * simplify-rtx.c (simplify_binary_operation): Check for overflow diff --git a/gcc/config.gcc b/gcc/config.gcc index 13090857f37..76ca5b44f22 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -243,7 +243,6 @@ sparc*-*-*) esac tm_file=${cpu_type}/${cpu_type}.h -xm_file=${cpu_type}/xm-${cpu_type}.h if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-protos.h; then tm_p_file=${cpu_type}/${cpu_type}-protos.h; @@ -301,17 +300,16 @@ esac case $machine in # Support site-specific machine types. *local*) - cpu_type=`echo $machine | sed -e 's/-.*//'` rest=`echo $machine | sed -e "s/$cpu_type-//"` - xm_file=${cpu_type}/xm-$rest.h tm_file=${cpu_type}/$rest.h - if test -f $srcdir/config/${cpu_type}/x-$rest; \ - then xmake_file=${cpu_type}/x-$rest; \ - else true; \ + if test -f $srcdir/config/${cpu_type}/xm-$rest.h + then xm_file=${cpu_type}/xm-$rest.h fi - if test -f $srcdir/config/${cpu_type}/t-$rest; \ - then tmake_file=${cpu_type}/t-$rest; \ - else true; \ + if test -f $srcdir/config/${cpu_type}/x-$rest + then xmake_file=${cpu_type}/x-$rest + fi + if test -f $srcdir/config/${cpu_type}/t-$rest + then tmake_file=${cpu_type}/t-$rest fi ;; 1750a-*-*) @@ -485,7 +483,7 @@ alpha*-*-vxworks*) alpha*-dec-vms*) xm_defines=POSIX tm_file=alpha/vms.h - xm_file="${xm_file} alpha/xm-vms.h" + xm_file=alpha/xm-vms.h tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee" ;; arm*-*-rtems*) @@ -913,7 +911,6 @@ hppa*-*-lites*) ;; hppa*-*-mpeix*) tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-mpeix.h" - xm_file=pa/xm-pampeix.h xmake_file=pa/x-pa-mpeix echo "You must use gas. Assuming it is already installed." install_headers_dir=install-headers-tar @@ -1220,7 +1217,6 @@ i[34567]86-*-osfrose*) # 386 using OSF/rose ;; i[34567]86-go32-rtems*) cpu_type=i386 - xm_file=i386/xm-go32.h tm_file=i386/go32-rtems.h tmake_file=t-rtems if test x$enable_threads = xyes; then @@ -1354,7 +1350,7 @@ i[34567]86-*-udk*) # Intel x86 on SCO UW/OSR5 Dev Kit ;; i[34567]86-*-osf1*) # Intel 80386's running OSF/1 1.3+ cpu_type=i386 - xm_file="${xm_file} i386/xm-osf1elf.h" + xm_file=i386/xm-osf1elf.h xm_defines='USG POSIX USE_C_ALLOCA SMALL_ARG_MAX' if test x$stabs = xyes then @@ -1389,14 +1385,14 @@ i[34567]86-*-sysv*) # Intel 80386's running system V tmake_file="$tmake_file i386/t-crtpic" ;; i386-*-vsta) # Intel 80386's running VSTa kernel - xm_file="${xm_file} i386/xm-vsta.h" + xm_file=i386/xm-vsta.h tm_file=i386/vsta.h tmake_file=i386/t-vsta xmake_file=i386/x-vsta ;; i[34567]86-*-win32) xm_defines=POSIX - xm_file="${xm_file} i386/xm-cygwin.h" + xm_file=i386/xm-cygwin.h float_format=i386 tmake_file=i386/t-cygwin tm_file=i386/win32.h @@ -1409,7 +1405,7 @@ i[34567]86-*-win32) ;; i[34567]86-*-pe | i[34567]86-*-cygwin*) xm_defines=POSIX - xm_file="${xm_file} i386/xm-cygwin.h" + xm_file=i386/xm-cygwin.h float_format=i386 tmake_file=i386/t-cygwin tm_file=i386/cygwin.h @@ -1424,7 +1420,7 @@ i[34567]86-*-mingw32*) tm_file=i386/mingw32.h float_format=i386 xm_defines=USG - xm_file="${xm_file} i386/xm-mingw32.h" + xm_file=i386/xm-mingw32.h tmake_file="i386/t-cygwin i386/t-mingw32" extra_objs=winnt.o xmake_file=i386/x-cygwin @@ -1474,7 +1470,6 @@ i[34567]86-dg-dgux*) ;; i860-alliant-*) # Alliant FX/2800 tm_file="${tm_file} svr4.h i860/sysv4.h i860/fx2800.h" - xm_file="${xm_file}" tmake_file=i860/t-fx2800 extra_parts="crtbegin.o crtend.o" ;; @@ -3469,9 +3464,8 @@ fi # Save data on host machine in vars host_xm_file and host_xmake_file. if test x$pass1done = x then - if test x"$xm_file" = x - then build_xm_file=$cpu_type/xm-$cpu_type.h - else build_xm_file=$xm_file + if test x$xm_file != x + then build_xm_file=$xm_file fi build_xm_defines=$xm_defines build_install_headers_dir=$install_headers_dir @@ -3480,9 +3474,8 @@ then else if test x$pass2done = x then - if test x"$xm_file" = x - then host_xm_file=$cpu_type/xm-$cpu_type.h - else host_xm_file=$xm_file + if test x$xm_file != x + then host_xm_file=$xm_file fi host_xm_defines=$xm_defines if test x"$xmake_file" = x diff --git a/gcc/configure b/gcc/configure index d6fe6fef5ab..8b0d1b8ef7f 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2018,7 +2018,7 @@ EOF fi # Find some useful tools -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4511,9 +4511,6 @@ then tm_file=$cpu_type/$cpu_type.h; fi if test x"$extra_headers" = x then extra_headers=; fi -if test x"$xm_file" = x -then xm_file=$cpu_type/xm-$cpu_type.h; fi - if test x$md_file = x then md_file=$cpu_type/$cpu_type.md; fi @@ -4548,14 +4545,12 @@ echo "Using \`$srcdir/config/$out_file' for machine-specific logic." echo "Using \`$srcdir/config/$md_file' as machine description file." # If any of the xm_file variables contain nonexistent files, warn -# about them and drop them. But $cpu/xm-$cpu.h is allowed not to -# exist, if we have nothing for it to do. +# about them and drop them. + bx= for x in $build_xm_file; do if test -f $srcdir/config/$x then bx="$bx $x" - elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null - then : else echo "configure: warning: $srcdir/config/$x does not exist." 1>&2 fi done @@ -4565,8 +4560,6 @@ hx= for x in $host_xm_file; do if test -f $srcdir/config/$x then hx="$hx $x" - elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null - then : else echo "configure: warning: $srcdir/config/$x does not exist." 1>&2 fi done @@ -4576,8 +4569,6 @@ tx= for x in $xm_file; do if test -f $srcdir/config/$x then tx="$tx $x" - elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null - then : else echo "configure: warning: $srcdir/config/$x does not exist." 1>&2 fi done @@ -4745,7 +4736,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:4749: checking for strerror in -lcposix" >&5 +echo "configure:4740: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4753,7 +4744,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4787,12 +4778,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4791: checking for working const" >&5 +echo "configure:4782: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+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:4836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4862,12 +4853,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4866: checking for off_t" >&5 +echo "configure:4857: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4895,12 +4886,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4899: checking for size_t" >&5 +echo "configure:4890: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4933,17 +4924,17 @@ unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4937: checking for $ac_hdr" >&5 +echo "configure:4928: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4973,12 +4964,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4977: checking for $ac_func" >&5 +echo "configure:4968: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5030,12 +5021,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5034: checking for $ac_func" >&5 +echo "configure:5025: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5092,19 +5083,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:5096: checking for LC_MESSAGES" >&5 +echo "configure:5087: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -5125,7 +5116,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:5129: checking whether NLS is requested" >&5 +echo "configure:5120: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -5145,7 +5136,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:5149: checking whether included gettext is requested" >&5 +echo "configure:5140: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -5164,17 +5155,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:5168: checking for libintl.h" >&5 +echo "configure:5159: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5191,19 +5182,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:5195: checking for gettext in libc" >&5 +echo "configure:5186: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -5219,7 +5210,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:5223: checking for bindtextdomain in -lintl" >&5 +echo "configure:5214: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5227,7 +5218,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5254,12 +5245,12 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:5258: checking for gettext in libintl" >&5 +echo "configure:5249: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:5263: checking for gettext in -lintl" >&5 +echo "configure:5254: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5267,7 +5258,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5321,7 +5312,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5325: checking for $ac_word" >&5 +echo "configure:5316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5355,12 +5346,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5359: checking for $ac_func" >&5 +echo "configure:5350: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5410,7 +5401,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5414: checking for $ac_word" >&5 +echo "configure:5405: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5446,7 +5437,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5450: checking for $ac_word" >&5 +echo "configure:5441: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5478,7 +5469,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -5511,7 +5502,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:5515: checking whether catgets can be used" >&5 +echo "configure:5506: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -5524,7 +5515,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:5528: checking for main in -li" >&5 +echo "configure:5519: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5532,14 +5523,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5567,12 +5558,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:5571: checking for catgets" >&5 +echo "configure:5562: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -5617,7 +5608,7 @@ EOF # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5621: checking for $ac_word" >&5 +echo "configure:5612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5653,7 +5644,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5657: checking for $ac_word" >&5 +echo "configure:5648: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5690,7 +5681,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5694: checking for $ac_word" >&5 +echo "configure:5685: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5728,7 +5719,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5732: checking for $ac_word" >&5 +echo "configure:5723: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5786,7 +5777,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5790: checking for $ac_word" >&5 +echo "configure:5781: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5820,7 +5811,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5824: checking for $ac_word" >&5 +echo "configure:5815: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5859,7 +5850,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5863: checking for $ac_word" >&5 +echo "configure:5854: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5958,7 +5949,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:5962: checking for catalogs to be installed" >&5 +echo "configure:5953: checking for catalogs to be installed" >&5 if test "x$LINGUAS" = "x"; then LINGUAS=$ALL_LINGUAS else @@ -5990,17 +5981,17 @@ echo "configure:5962: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:5994: checking for linux/version.h" >&5 +echo "configure:5985: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6075,7 +6066,7 @@ fi echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:6079: checking whether windows registry support is requested" >&5 +echo "configure:6070: checking whether windows registry support is requested" >&5 if test x$enable_win32_registry != xno; then cat >> confdefs.h <<\EOF #define ENABLE_WIN32_REGISTRY 1 @@ -6104,7 +6095,7 @@ esac if test x$enable_win32_registry != xno; then echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 -echo "configure:6108: checking registry key on windows hosts" >&5 +echo "configure:6099: checking registry key on windows hosts" >&5 cat >> confdefs.h <&6 -echo "configure:6299: checking what assembler to use" >&5 +echo "configure:6290: checking what assembler to use" >&5 gcc_cv_as= gcc_cv_gas_major_version= gcc_cv_gas_minor_version= @@ -6380,7 +6371,7 @@ fi # Figure out what nm we will be using. echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:6384: checking what nm to use" >&5 +echo "configure:6375: checking what nm to use" >&5 if test -x nm$host_exeext; then gcc_cv_nm=./nm$host_exeext elif test x$host = x$target; then @@ -6391,7 +6382,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6 # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:6395: checking assembler alignment features" >&5 +echo "configure:6386: checking assembler alignment features" >&5 gcc_cv_as_alignment_features=none if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then # Gas version 2.6 and later support for .balign and .p2align. @@ -6439,7 +6430,7 @@ fi echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6 -echo "configure:6443: checking assembler subsection support" >&5 +echo "configure:6434: checking assembler subsection support" >&5 gcc_cv_as_subsections=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -6479,7 +6470,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:6483: checking assembler weak support" >&5 +echo "configure:6474: checking assembler weak support" >&5 gcc_cv_as_weak=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -6502,7 +6493,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:6506: checking assembler hidden support" >&5 +echo "configure:6497: checking assembler hidden support" >&5 gcc_cv_as_hidden=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -6526,7 +6517,7 @@ fi echo "$ac_t""$gcc_cv_as_hidden" 1>&6 echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 -echo "configure:6530: checking assembler leb128 support" >&5 +echo "configure:6521: checking assembler leb128 support" >&5 gcc_cv_as_leb128=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -6573,7 +6564,7 @@ echo "$ac_t""$gcc_cv_as_leb128" 1>&6 case "$target" in sparc*-*-*) echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:6577: checking assembler .register pseudo-op support" >&5 +echo "configure:6568: checking assembler .register pseudo-op support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6601,7 +6592,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:6605: checking assembler supports -relax" >&5 +echo "configure:6596: checking assembler supports -relax" >&5 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6631,7 +6622,7 @@ EOF case "$tm_file" in *64*) echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6 -echo "configure:6635: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 +echo "configure:6626: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6676,7 +6667,7 @@ EOF if test "x$gcc_cv_as_flags64" != xno; then echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 -echo "configure:6680: checking for assembler offsetable %lo() support" >&5 +echo "configure:6671: checking for assembler offsetable %lo() support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6715,7 +6706,7 @@ EOF i[34567]86-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:6719: checking assembler instructions" >&5 +echo "configure:6710: checking assembler instructions" >&5 gcc_cv_as_instructions= if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -6744,7 +6735,7 @@ EOF esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:6748: checking assembler dwarf2 debug_line support" >&5 +echo "configure:6739: checking assembler dwarf2 debug_line support" >&5 gcc_cv_as_dwarf2_debug_line=no # ??? Not all targets support dwarf2 debug_line, even within a version # of gas. Moreover, we need to emit a valid instruction to trigger any @@ -6934,7 +6925,7 @@ EOF echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:6938: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:6929: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/gcc/configure.in b/gcc/configure.in index 726c0a78d30..ca356f30cc3 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -642,9 +642,6 @@ then tm_file=$cpu_type/$cpu_type.h; fi if test x"$extra_headers" = x then extra_headers=; fi -if test x"$xm_file" = x -then xm_file=$cpu_type/xm-$cpu_type.h; fi - if test x$md_file = x then md_file=$cpu_type/$cpu_type.md; fi @@ -679,15 +676,13 @@ echo "Using \`$srcdir/config/$out_file' for machine-specific logic." echo "Using \`$srcdir/config/$md_file' as machine description file." # If any of the xm_file variables contain nonexistent files, warn -# about them and drop them. But $cpu/xm-$cpu.h is allowed not to -# exist, if we have nothing for it to do. +# about them and drop them. + changequote(,)dnl bx= for x in $build_xm_file; do if test -f $srcdir/config/$x then bx="$bx $x" - elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null - then : else AC_MSG_WARN($srcdir/config/$x does not exist.) fi done @@ -697,8 +692,6 @@ hx= for x in $host_xm_file; do if test -f $srcdir/config/$x then hx="$hx $x" - elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null - then : else AC_MSG_WARN($srcdir/config/$x does not exist.) fi done @@ -708,8 +701,6 @@ tx= for x in $xm_file; do if test -f $srcdir/config/$x then tx="$tx $x" - elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null - then : else AC_MSG_WARN($srcdir/config/$x does not exist.) fi done -- 2.30.2