diff options
author | Marc Espie <espie@cvs.openbsd.org> | 1999-06-17 23:31:34 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 1999-06-17 23:31:34 +0000 |
commit | 172ef3677b253146c790140bf657cd08dcaaa427 (patch) | |
tree | e4a810e4243c2f74296177aecbb990e0277e254e /gnu/egcs | |
parent | 67cbffa561baf673138bbeb2fe9a3cbea6f06dbf (diff) |
basic automated merge. to be verified.
Diffstat (limited to 'gnu/egcs')
-rw-r--r-- | gnu/egcs/gcc/Makefile.in | 9 | ||||
-rw-r--r-- | gnu/egcs/gcc/configure | 254 | ||||
-rw-r--r-- | gnu/egcs/gcc/configure.in | 70 |
3 files changed, 222 insertions, 111 deletions
diff --git a/gnu/egcs/gcc/Makefile.in b/gnu/egcs/gcc/Makefile.in index e2d3fd2bc94..0ef96a3bbbc 100644 --- a/gnu/egcs/gcc/Makefile.in +++ b/gnu/egcs/gcc/Makefile.in @@ -68,9 +68,10 @@ ALLOCA_FINISH = true # TCFLAGS is used for compilations with the GCC just built. XCFLAGS = TCFLAGS = -CFLAGS = -g @stage1_warn_cflags@ +# -W -Wall warnings are disabled for releases. +CFLAGS = -g BOOT_CFLAGS = -O2 $(CFLAGS) -WARN_CFLAGS = -W -Wall +#WARN_CFLAGS = -W -Wall # These exists to be overridden by the x-* and t-* files, respectively. X_CFLAGS = T_CFLAGS = @@ -166,7 +167,7 @@ INSTALL_ASSERT_H = install-assert-h # The GCC to use for compiling libgcc2.a, enquire, and libgcc1-test. # Usually the one we just built. # Don't use this as a dependency--use $(GCC_PASSES) or $(GCC_PARTS). -GCC_FOR_TARGET = ./xgcc -B./ -B$(build_tooldir)/bin/ +GCC_FOR_TARGET = ./xgcc -B./ -B$(build_tooldir)/bin/ -I$(build_tooldir)/include # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET. # It omits XCFLAGS, and specifies -B./. @@ -2247,6 +2248,8 @@ stmp-fixproto: fixhdr.ready fixproto stmp-headers else \ : This line works around a 'make' bug in BSDI 1.1.; \ FIXPROTO_DEFINES="$(FIXPROTO_DEFINES)"; export FIXPROTO_DEFINES; \ + mkinstalldirs="$(SHELL) $(srcdir)/mkinstalldirs"; \ + export mkinstalldirs; \ if [ -d $(SYSTEM_HEADER_DIR) ] ; then \ $(SHELL) ${srcdir}/fixproto include include $(SYSTEM_HEADER_DIR); \ else true; fi; \ diff --git a/gnu/egcs/gcc/configure b/gnu/egcs/gcc/configure index eff20884c45..23273c766ba 100644 --- a/gnu/egcs/gcc/configure +++ b/gnu/egcs/gcc/configure @@ -608,7 +608,7 @@ echo "$ac_t""$library_path_setting" 1>&6 if test "$library_path_setting" != "ok"; then { echo "configure: error: *** LIBRARY_PATH shouldn't contain the current directory when -*** building egcs. Please change the environment variable +*** building gcc. Please change the environment variable *** and run configure again." 1>&2; exit 1; } fi @@ -633,7 +633,7 @@ echo "$ac_t""$gcc_exec_prefix_setting" 1>&6 if test "$gcc_exec_prefix_setting" != "ok"; then { echo "configure: error: *** GCC_EXEC_PREFIX shouldn't contain the current directory when -*** building egcs. Please change the environment variable +*** building gcc. Please change the environment variable *** and run configure again." 1>&2; exit 1; } fi @@ -3170,6 +3170,7 @@ for machine in $build $host $target; do tm_file=arm/netbsd.h xm_file="arm/xm-netbsd.h ${xm_file}" tmake_file="t-netbsd arm/t-netbsd" + use_collect2=yes ;; arm*-*-linux-gnuaout*) # ARM GNU/Linux with a.out cpu_type=arm @@ -3536,20 +3537,21 @@ for machine in $build $host $target; do # use_collect2=yes ;; i[34567]86-*-freebsdelf*) - tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h" + tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" - tmake_file=i386/t-freebsd + tmake_file=t-freebsd gas=yes gnu_ld=yes stabs=yes ;; i[34567]86-*-freebsd*) tm_file=i386/freebsd.h - tmake_file=i386/t-freebsd + tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) tm_file=i386/netbsd.h tmake_file=t-netbsd + use_collect2=yes ;; i[34567]86-*-openbsd*) # we need collect2 until our bug is fixed... @@ -3791,6 +3793,7 @@ for machine in $build $host $target; do tmake_file="i386/t-crtpic i386/t-udk" xmake_file=x-svr4 extra_parts="crtbegin.o crtend.o" + install_headers_dir=install-headers-cpio ;; i[34567]86-*-osf1*) # Intel 80386's running OSF/1 1.3+ cpu_type=i386 @@ -4188,7 +4191,6 @@ for machine in $build $host $target; do ;; m68k-hp-bsd4.4*) # HP 9000/3xx running 4.4bsd tm_file=m68k/hp3bsd44.h - xmake_file=m68k/x-hp3bsd44 use_collect2=yes extra_headers=math-68881.h float_format=m68k @@ -4357,6 +4359,7 @@ for machine in $build $host $target; do tm_file=m68k/netbsd.h tmake_file=t-netbsd float_format=m68k + use_collect2=yes ;; m68k*-*-openbsd*) float_format=m68k @@ -5024,6 +5027,7 @@ for machine in $build $host $target; do xm_file="ns32k/xm-netbsd.h ${xm_file}" # On NetBSD, the headers are already okay, except for math.h. tmake_file=t-netbsd + use_collect2=yes ;; pdp11-*-bsd) tm_file="${tm_file} pdp11/2bsd.h" @@ -5321,6 +5325,7 @@ for machine in $build $host $target; do sparc-*-netbsd*) tm_file=sparc/netbsd.h tmake_file=t-netbsd + use_collect2=yes ;; sparc-*-openbsd*) # we need collect2 until our bug is fixed... @@ -5551,6 +5556,7 @@ for machine in $build $host $target; do tm_file="${tm_file} netbsd.h vax/netbsd.h" tmake_file=t-netbsd float_format=vax + use_collect2=yes ;; vax-*-openbsd*) tmake_file="${tmake_file} vax/t-openbsd" @@ -5629,7 +5635,7 @@ for machine in $build $host $target; do alpha*-*-*) case $machine in alphaev6*) - target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_CIX|MASK_MAX" + target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX" ;; alphapca56*) target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX" @@ -6030,7 +6036,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:6034: checking for strerror in -lcposix" >&5 +echo "configure:6040: 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 @@ -6038,7 +6044,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 6042 "configure" +#line 6048 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6049,7 +6055,7 @@ int main() { strerror() ; return 0; } EOF -if { (eval echo configure:6053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6059: \"$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 @@ -6072,12 +6078,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6076: checking for working const" >&5 +echo "configure:6082: 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 <<EOF -#line 6081 "configure" +#line 6087 "configure" #include "confdefs.h" int main() { @@ -6126,7 +6132,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:6130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6147,21 +6153,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:6151: checking for inline" >&5 +echo "configure:6157: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 6158 "configure" +#line 6164 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:6165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -6187,12 +6193,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6191: checking for off_t" >&5 +echo "configure:6197: 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 <<EOF -#line 6196 "configure" +#line 6202 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6220,12 +6226,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6224: checking for size_t" >&5 +echo "configure:6230: 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 <<EOF -#line 6229 "configure" +#line 6235 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6255,19 +6261,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6259: checking for working alloca.h" >&5 +echo "configure:6265: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6264 "configure" +#line 6270 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6288,12 +6294,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6292: checking for alloca" >&5 +echo "configure:6298: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6297 "configure" +#line 6303 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -6321,7 +6327,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:6325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6353,12 +6359,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6357: checking whether alloca needs Cray hooks" >&5 +echo "configure:6363: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6362 "configure" +#line 6368 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -6383,12 +6389,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6387: checking for $ac_func" >&5 +echo "configure:6393: 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 <<EOF -#line 6392 "configure" +#line 6398 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6411,7 +6417,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6421: \"$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 @@ -6438,7 +6444,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6442: checking stack direction for C alloca" >&5 +echo "configure:6448: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6446,7 +6452,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 6450 "configure" +#line 6456 "configure" #include "confdefs.h" find_stack_direction () { @@ -6465,7 +6471,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:6469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -6490,17 +6496,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6494: checking for $ac_hdr" >&5 +echo "configure:6500: 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 -#line 6499 "configure" +#line 6505 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6510: \"$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* @@ -6529,12 +6535,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6533: checking for $ac_func" >&5 +echo "configure:6539: 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 <<EOF -#line 6538 "configure" +#line 6544 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6557,7 +6563,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6567: \"$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 @@ -6582,7 +6588,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:6586: checking for working mmap" >&5 +echo "configure:6592: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6590,7 +6596,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 6594 "configure" +#line 6600 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -6730,7 +6736,7 @@ main() } EOF -if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -6758,17 +6764,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:6762: checking for $ac_hdr" >&5 +echo "configure:6768: 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 -#line 6767 "configure" +#line 6773 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6778: \"$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* @@ -6798,12 +6804,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6802: checking for $ac_func" >&5 +echo "configure:6808: 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 <<EOF -#line 6807 "configure" +#line 6813 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6826,7 +6832,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6836: \"$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 @@ -6855,12 +6861,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6859: checking for $ac_func" >&5 +echo "configure:6865: 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 <<EOF -#line 6864 "configure" +#line 6870 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6883,7 +6889,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6893: \"$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 @@ -6917,19 +6923,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:6921: checking for LC_MESSAGES" >&5 +echo "configure:6927: 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 <<EOF -#line 6926 "configure" +#line 6932 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:6933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6939: \"$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 @@ -6950,7 +6956,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:6954: checking whether NLS is requested" >&5 +echo "configure:6960: 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" @@ -6970,7 +6976,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:6974: checking whether included gettext is requested" >&5 +echo "configure:6980: 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" @@ -6989,17 +6995,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:6993: checking for libintl.h" >&5 +echo "configure:6999: 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 -#line 6998 "configure" +#line 7004 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7009: \"$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* @@ -7016,19 +7022,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:7020: checking for gettext in libc" >&5 +echo "configure:7026: 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 <<EOF -#line 7025 "configure" +#line 7031 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:7032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7038: \"$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 @@ -7044,7 +7050,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:7048: checking for bindtextdomain in -lintl" >&5 +echo "configure:7054: 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 @@ -7052,7 +7058,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 7056 "configure" +#line 7062 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7063,7 +7069,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:7067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7073: \"$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 @@ -7079,12 +7085,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:7083: checking for gettext in libintl" >&5 +echo "configure:7089: 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:7088: checking for gettext in -lintl" >&5 +echo "configure:7094: 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 @@ -7092,7 +7098,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 7096 "configure" +#line 7102 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7103,7 +7109,7 @@ int main() { gettext() ; return 0; } EOF -if { (eval echo configure:7107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7113: \"$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 @@ -7142,7 +7148,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:7146: checking for $ac_word" >&5 +echo "configure:7152: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7176,12 +7182,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7180: checking for $ac_func" >&5 +echo "configure:7186: 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 <<EOF -#line 7185 "configure" +#line 7191 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7204,7 +7210,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7214: \"$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 @@ -7231,7 +7237,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:7235: checking for $ac_word" >&5 +echo "configure:7241: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7267,7 +7273,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:7271: checking for $ac_word" >&5 +echo "configure:7277: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7299,7 +7305,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 7303 "configure" +#line 7309 "configure" #include "confdefs.h" int main() { @@ -7307,7 +7313,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:7311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -7330,7 +7336,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:7334: checking whether catgets can be used" >&5 +echo "configure:7340: 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" @@ -7343,7 +7349,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:7347: checking for main in -li" >&5 +echo "configure:7353: 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 @@ -7351,14 +7357,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <<EOF -#line 7355 "configure" +#line 7361 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7368: \"$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 @@ -7386,12 +7392,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:7390: checking for catgets" >&5 +echo "configure:7396: 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 <<EOF -#line 7395 "configure" +#line 7401 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char catgets(); below. */ @@ -7414,7 +7420,7 @@ catgets(); ; return 0; } EOF -if { (eval echo configure:7418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7424: \"$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 @@ -7436,7 +7442,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:7440: checking for $ac_word" >&5 +echo "configure:7446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7472,7 +7478,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:7476: checking for $ac_word" >&5 +echo "configure:7482: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7509,7 +7515,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:7513: checking for $ac_word" >&5 +echo "configure:7519: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7544,7 +7550,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:7548: checking for $ac_word" >&5 +echo "configure:7554: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7602,7 +7608,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:7606: checking for $ac_word" >&5 +echo "configure:7612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7636,7 +7642,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:7640: checking for $ac_word" >&5 +echo "configure:7646: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7672,7 +7678,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:7676: checking for $ac_word" >&5 +echo "configure:7682: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7765,7 +7771,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:7769: checking for catalogs to be installed" >&5 +echo "configure:7775: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -7793,17 +7799,17 @@ echo "configure:7769: 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:7797: checking for linux/version.h" >&5 +echo "configure:7803: 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 -#line 7802 "configure" +#line 7808 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7813: \"$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* @@ -8037,7 +8043,7 @@ fi # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:8041: checking assembler alignment features" >&5 +echo "configure:8047: checking assembler alignment features" >&5 gcc_cv_as= gcc_cv_as_alignment_features= gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas @@ -8081,7 +8087,55 @@ EOF fi elif test x$host = x$target; then # Native build. - gcc_cv_as=as$host_exeext + # Search the same directories that the installed compiler will + # search. Else we may find the wrong assembler and lose. If we + # do not find a suitable assembler binary, then try the user's + # path. + # + # Also note we have to check MD_EXEC_PREFIX before checking the + # user's path. Unfortunately, there is no good way to get at the + # value of MD_EXEC_PREFIX here. So we do a brute force search + # through all the known MD_EXEC_PREFIX values. Ugh. This needs + # to be fixed as part of the make/configure rewrite too. + + if test "x$exec_prefix" = xNONE; then + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi + else + test_prefix=$exec_prefix + fi + + # If the loop below does not find an assembler, then use whatever + # one we can find in the users's path. + # user's path. + as=as$host_exeext + + test_dirs="$test_prefix/lib/gcc-lib/$target/$gcc_version \ + $test_prefix/lib/gcc-lib/$target \ + /usr/lib/gcc/$target/$gcc_version \ + /usr/lib/gcc/$target \ + $test_prefix/$target/bin/$target/$gcc_version \ + $test_prefix/$target/bin \ + /usr/libexec \ + /usr/ccs/gcc \ + /usr/ccs/bin \ + /udk/usr/ccs/bin \ + /bsd43/usr/lib/cmplrs/cc \ + /usr/cross64/usr/bin \ + /usr/lib/cmplrs/cc \ + /sysv/usr/lib/cmplrs/cc \ + /svr4/usr/lib/cmplrs/cc \ + /usr/bin" + + for dir in $test_dirs; do + if test -f $dir/as$host_exeext; then + gcc_cv_as=$dir/as$host_exeext + break; + fi + done fi if test x$gcc_cv_as != x; then # Check if we have .balign and .p2align @@ -8110,7 +8164,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:8114: checking assembler subsection support" >&5 +echo "configure:8168: checking assembler subsection support" >&5 gcc_cv_as_subsections= if test x$gcc_cv_as != x; then # Check if we have .subsection @@ -8150,7 +8204,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:8154: checking assembler instructions" >&5 +echo "configure:8208: checking assembler instructions" >&5 gcc_cv_as_instructions= if test x$gcc_cv_as != x; then set "filds fists" "filds mem; fists mem" diff --git a/gnu/egcs/gcc/configure.in b/gnu/egcs/gcc/configure.in index ff7a08524d9..e74825918b7 100644 --- a/gnu/egcs/gcc/configure.in +++ b/gnu/egcs/gcc/configure.in @@ -53,7 +53,7 @@ AC_MSG_RESULT($library_path_setting) if test "$library_path_setting" != "ok"; then AC_MSG_ERROR([ *** LIBRARY_PATH shouldn't contain the current directory when -*** building egcs. Please change the environment variable +*** building gcc. Please change the environment variable *** and run configure again.]) fi @@ -79,7 +79,7 @@ AC_MSG_RESULT($gcc_exec_prefix_setting) if test "$gcc_exec_prefix_setting" != "ok"; then AC_MSG_ERROR([ *** GCC_EXEC_PREFIX shouldn't contain the current directory when -*** building egcs. Please change the environment variable +*** building gcc. Please change the environment variable *** and run configure again.]) fi @@ -743,6 +743,7 @@ changequote([,])dnl tm_file=arm/netbsd.h xm_file="arm/xm-netbsd.h ${xm_file}" tmake_file="t-netbsd arm/t-netbsd" + use_collect2=yes ;; arm*-*-linux-gnuaout*) # ARM GNU/Linux with a.out cpu_type=arm @@ -1137,9 +1138,9 @@ changequote([,])dnl changequote(,)dnl i[34567]86-*-freebsdelf*) changequote([,])dnl - tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h" + tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" - tmake_file=i386/t-freebsd + tmake_file=t-freebsd gas=yes gnu_ld=yes stabs=yes @@ -1148,13 +1149,14 @@ changequote(,)dnl i[34567]86-*-freebsd*) changequote([,])dnl tm_file=i386/freebsd.h - tmake_file=i386/t-freebsd + tmake_file=t-freebsd ;; changequote(,)dnl i[34567]86-*-netbsd*) changequote([,])dnl tm_file=i386/netbsd.h tmake_file=t-netbsd + use_collect2=yes ;; changequote(,)dnl i[34567]86-*-openbsd*) @@ -1446,6 +1448,7 @@ changequote([,])dnl tmake_file="i386/t-crtpic i386/t-udk" xmake_file=x-svr4 extra_parts="crtbegin.o crtend.o" + install_headers_dir=install-headers-cpio ;; changequote(,)dnl i[34567]86-*-osf1*) # Intel 80386's running OSF/1 1.3+ @@ -1861,7 +1864,6 @@ changequote([,])dnl ;; m68k-hp-bsd4.4*) # HP 9000/3xx running 4.4bsd tm_file=m68k/hp3bsd44.h - xmake_file=m68k/x-hp3bsd44 use_collect2=yes extra_headers=math-68881.h float_format=m68k @@ -2030,6 +2032,7 @@ changequote([,])dnl tm_file=m68k/netbsd.h tmake_file=t-netbsd float_format=m68k + use_collect2=yes ;; m68k*-*-openbsd*) float_format=m68k @@ -2709,6 +2712,7 @@ changequote([,])dnl xm_file="ns32k/xm-netbsd.h ${xm_file}" # On NetBSD, the headers are already okay, except for math.h. tmake_file=t-netbsd + use_collect2=yes ;; pdp11-*-bsd) tm_file="${tm_file} pdp11/2bsd.h" @@ -3016,6 +3020,7 @@ changequote([,])dnl sparc-*-netbsd*) tm_file=sparc/netbsd.h tmake_file=t-netbsd + use_collect2=yes ;; sparc-*-openbsd*) # we need collect2 until our bug is fixed... @@ -3248,6 +3253,7 @@ changequote([,])dnl tm_file="${tm_file} netbsd.h vax/netbsd.h" tmake_file=t-netbsd float_format=vax + use_collect2=yes ;; vax-*-openbsd*) tmake_file="${tmake_file} vax/t-openbsd" @@ -3326,7 +3332,7 @@ changequote([,])dnl alpha*-*-*) case $machine in alphaev6*) - target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_CIX|MASK_MAX" + target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX" ;; alphapca56*) target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX" @@ -3928,7 +3934,55 @@ changequote([,])dnl fi elif test x$host = x$target; then # Native build. - gcc_cv_as=as$host_exeext + # Search the same directories that the installed compiler will + # search. Else we may find the wrong assembler and lose. If we + # do not find a suitable assembler binary, then try the user's + # path. + # + # Also note we have to check MD_EXEC_PREFIX before checking the + # user's path. Unfortunately, there is no good way to get at the + # value of MD_EXEC_PREFIX here. So we do a brute force search + # through all the known MD_EXEC_PREFIX values. Ugh. This needs + # to be fixed as part of the make/configure rewrite too. + + if test "x$exec_prefix" = xNONE; then + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi + else + test_prefix=$exec_prefix + fi + + # If the loop below does not find an assembler, then use whatever + # one we can find in the users's path. + # user's path. + as=as$host_exeext + + test_dirs="$test_prefix/lib/gcc-lib/$target/$gcc_version \ + $test_prefix/lib/gcc-lib/$target \ + /usr/lib/gcc/$target/$gcc_version \ + /usr/lib/gcc/$target \ + $test_prefix/$target/bin/$target/$gcc_version \ + $test_prefix/$target/bin \ + /usr/libexec \ + /usr/ccs/gcc \ + /usr/ccs/bin \ + /udk/usr/ccs/bin \ + /bsd43/usr/lib/cmplrs/cc \ + /usr/cross64/usr/bin \ + /usr/lib/cmplrs/cc \ + /sysv/usr/lib/cmplrs/cc \ + /svr4/usr/lib/cmplrs/cc \ + /usr/bin" + + for dir in $test_dirs; do + if test -f $dir/as$host_exeext; then + gcc_cv_as=$dir/as$host_exeext + break; + fi + done fi if test x$gcc_cv_as != x; then # Check if we have .balign and .p2align |