From 45449d9fd611410bbe27804eaf998e4609ae150f Mon Sep 17 00:00:00 2001 From: zack Date: Tue, 1 May 2001 17:45:05 +0000 Subject: [PATCH] 2001-05-01 Zack Weinberg * config.gcc: Don't default xmake_file to ${cpu_type}/x-${cpu_type}. Remove references to deleted files. (*-*-openbsd): No need to override xmake_file. (*-*-sysv4): Treat like *-*-sysv. * configure.in: Probe for ldopen in various places, and set up collect2 to be linked with them if found. Don't dink with Windows registry stuff unless $host_os is a Win32 os name. Check to see if we need -ladvapi32. * configure: Regenerate. * Makefile: Get rid of CLIB and HOST_CLIB. Substitute in COLLECT2_LIBS and link collect2 against its contents. * build-make: Get rid of HOST_CLIB. * config/a29k/x-unix, config/alpha/x-osf, config/i386/x-aix, config/i386/x-osfrose, config/m68k/x-dpx2, config/mips/x-iris3, config/mips/x-mips, config/mips/x-osfrose, config/mips/x-sony, config/mips/x-sysv, config/rs6000/x-aix31, config/rs6000/x-aix41, config/rs6000/x-rs6000: Delete. * config/i386/x-cygwin, config/m68k/t-aux, config/mips/x-iris: Don't set CLIB. 24 x-host fragments remain, 0 x-cpu, 3 top level. 2001-05-01 Zack Weinberg * aclocal.m4 (gcc_AC_C_CHAR_BIT): Correct test program. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41732 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 33 ++++ gcc/Makefile.in | 15 +- gcc/aclocal.m4 | 8 +- gcc/build-make | 1 - gcc/config.gcc | 30 --- gcc/config/a29k/x-unix | 2 - gcc/config/alpha/x-osf | 1 - gcc/config/i386/x-aix | 1 - gcc/config/i386/x-cygwin | 2 - gcc/config/i386/x-osf1elf | 1 - gcc/config/i386/x-osfrose | 1 - gcc/config/m68k/t-aux | 3 - gcc/config/m68k/x-dpx2 | 1 - gcc/config/mips/x-iris | 4 - gcc/config/mips/x-iris3 | 3 - gcc/config/mips/x-mips | 2 - gcc/config/mips/x-osfrose | 1 - gcc/config/mips/x-sony | 2 - gcc/config/mips/x-sysv | 3 - gcc/config/rs6000/x-aix31 | 4 - gcc/config/rs6000/x-aix41 | 6 - gcc/config/rs6000/x-rs6000 | 6 - gcc/configure | 447 ++++++++++++++++++++++++++++----------------- gcc/configure.in | 26 ++- 24 files changed, 349 insertions(+), 254 deletions(-) delete mode 100644 gcc/config/a29k/x-unix delete mode 100644 gcc/config/alpha/x-osf delete mode 100644 gcc/config/i386/x-aix delete mode 100644 gcc/config/i386/x-osf1elf delete mode 100644 gcc/config/i386/x-osfrose delete mode 100644 gcc/config/m68k/x-dpx2 delete mode 100644 gcc/config/mips/x-iris3 delete mode 100644 gcc/config/mips/x-mips delete mode 100644 gcc/config/mips/x-osfrose delete mode 100644 gcc/config/mips/x-sony delete mode 100644 gcc/config/mips/x-sysv delete mode 100644 gcc/config/rs6000/x-aix31 delete mode 100644 gcc/config/rs6000/x-aix41 delete mode 100644 gcc/config/rs6000/x-rs6000 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2c30eb6..124f4f8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,36 @@ +2001-05-01 Zack Weinberg + + * config.gcc: Don't default xmake_file to ${cpu_type}/x-${cpu_type}. + Remove references to deleted files. + (*-*-openbsd): No need to override xmake_file. + (*-*-sysv4): Treat like *-*-sysv. + + * configure.in: Probe for ldopen in various places, and set up + collect2 to be linked with them if found. + Don't dink with Windows registry stuff unless $host_os is a + Win32 os name. Check to see if we need -ladvapi32. + * configure: Regenerate. + + * Makefile: Get rid of CLIB and HOST_CLIB. + Substitute in COLLECT2_LIBS and link collect2 against its contents. + * build-make: Get rid of HOST_CLIB. + + * config/a29k/x-unix, config/alpha/x-osf, config/i386/x-aix, + config/i386/x-osfrose, config/m68k/x-dpx2, config/mips/x-iris3, + config/mips/x-mips, config/mips/x-osfrose, config/mips/x-sony, + config/mips/x-sysv, config/rs6000/x-aix31, config/rs6000/x-aix41, + config/rs6000/x-rs6000: Delete. + + * config/i386/x-cygwin, config/m68k/t-aux, config/mips/x-iris: + Don't set CLIB. + + 24 x-host fragments remain, 0 x-cpu, 3 top level. + +2001-05-01 Zack Weinberg + + * aclocal.m4 (gcc_AC_C_CHAR_BIT): Correct test program. + * configure: Regenerate. + 2001-05-01 Angela Marie Thomas * Makefile.in (install-headers): Remove redundant dependency. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index dac77e7..7b9508e 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -353,9 +353,6 @@ INTLLIBS = @INTLLIBS@ POSUB = @POSUB@ INTL_SUBDIRS = intl $(POSUB) -# Additional system libraries to link with. -CLIB= - # Change this to a null string if obstacks are installed in the # system library. OBSTACK=obstack.o @@ -513,7 +510,6 @@ HOST_CC=$(CC) # If you change any of the following variables, check whether a # similar change is needed in build-make. HOST_CFLAGS=$(ALL_CFLAGS) -DGENERATOR_FILE -HOST_CLIB=$(CLIB) HOST_LDFLAGS=$(LDFLAGS) HOST_CPPFLAGS=$(ALL_CPPFLAGS) HOST_OBSTACK=$(OBSTACK) @@ -628,12 +624,12 @@ HOST_LIBDEPS= $(HOST_PREFIX)$(HOST_OBSTACK) \ # How to link with both our special library facilities # and the system's installed libraries. LIBS = $(OBSTACK) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRINT) \ - $(STRSTR) $(CLIB) ../libiberty/libiberty.a + $(STRSTR) ../libiberty/libiberty.a # Likewise, for use in the tools that must run on this machine # even if we are cross-building GCC. HOST_LIBS = $(USE_HOST_OBSTACK) $(USE_HOST_VFPRINTF) \ - $(USE_HOST_DOPRINT) $(USE_HOST_STRSTR) $(HOST_CLIB) + $(USE_HOST_DOPRINT) $(USE_HOST_STRSTR) HOST_RTL = $(HOST_PREFIX)rtl.o $(HOST_PREFIX)bitmap.o \ $(HOST_PREFIX)ggc-none.o gensupport.o hashtab.o safe-ctype.o @@ -680,7 +676,6 @@ ORDINARY_FLAGS_TO_PASS = \ "BISON=$(BISON)" \ "BISONFLAGS=$(BISONFLAGS)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ - "CLIB=$(CLIB)" \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ "LDFLAGS=$(LDFLAGS)" \ "FLEX=$(FLEX)" \ @@ -1224,10 +1219,12 @@ sbitmap.o: sbitmap.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) flags.h hard-reg-set.h \ $(BASIC_BLOCK_H) COLLECT2_OBJS = collect2.o tlink.o hash.o intl.o underscore.o version.o +COLLECT2_LIBS = @COLLECT2_LIBS@ collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS) # Don't try modifying collect2 (aka ld) in place--it might be linking this. - -rm -f collect2$(exeext) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(COLLECT2_OBJS) $(LIBS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@T \ + $(COLLECT2_OBJS) $(LIBS) $(COLLECT2_LIBS) + mv -f $@T $@ collect2.o : collect2.c $(CONFIG_H) $(SYSTEM_H) gstab.h intl.h \ $(OBSTACK_H) $(DEMANGLE_H) collect2.h version.h diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 83117a2..f2eda88 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -1192,9 +1192,11 @@ if test $gcc_cv_decl_char_bit = no; then gcc_cv_c_nbby= while test $i -lt 65; do AC_TRY_COMPILE(, - [switch(0) { case 0: case (char)(1 << $i) && (char)(1 << $i) != 1: ; }], - gcc_cv_c_nbby=$i - break) + [switch(0) { + case (unsigned char)((unsigned long)1 << $i) == ((unsigned long)1 << $i): + case (unsigned char)((unsigned long)1<<($i-1)) == ((unsigned long)1<<($i-1)): + ; }], + [gcc_cv_c_nbby=$i; break]) i=`expr $i + 1` done test -z "$gcc_cv_c_nbby" && gcc_cv_c_nbby=failed diff --git a/gcc/build-make b/gcc/build-make index c47a78c..de1b448 100644 --- a/gcc/build-make +++ b/gcc/build-make @@ -13,7 +13,6 @@ HOST_PREFIX_1=$(HOST_PREFIX) HOST_CC=$(CC) -b $(build) HOST_CFLAGS=$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS) \ -DGENERATOR_FILE -HOST_CLIB= HOST_LDFLAGS=$(LDFLAGS) HOST_CPPFLAGS=$(ALL_CPPFLAGS) HOST_MALLOC=$(MALLOC) diff --git a/gcc/config.gcc b/gcc/config.gcc index 954fc8f..4f0d3dc 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -247,10 +247,6 @@ if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-protos.h then tm_p_file=${cpu_type}/${cpu_type}-protos.h fi -if test -f ${srcdir}/config/${cpu_type}/x-${cpu_type} -then - xmake_file=${cpu_type}/x-${cpu_type} -fi # On a.out targets, we need to use collect2. case $machine in *-*-*aout*) @@ -292,8 +288,6 @@ case $machine in tm_file=${cpu_type}/openbsd.h tmake_file="t-libc-ok t-openbsd" xm_defines=POSIX - # don't depend on processor x-fragments as well - xmake_file= if test x$enable_threads = xyes; then thread_file='posix' tmake_file="${tmake_file} t-openbsd-thread" @@ -326,7 +320,6 @@ case $machine in a29k-*-bsd* | a29k-*-sym1*) tm_file="${tm_file} a29k/unix.h" xm_defines=POSIX - xmake_file=a29k/x-unix use_collect2=yes ;; a29k-*-udi | a29k-*-coff) @@ -440,7 +433,6 @@ alpha*-dec-osf*) fi use_collect2=yes tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-osf" - xmake_file=alpha/x-osf case $machine in *-*-osf1*) tm_file="${tm_file} alpha/osf.h alpha/osf12.h alpha/osf2or3.h" @@ -644,7 +636,6 @@ hppa*64*-*-linux* | parisc*64*-*-linux*) tm_file="pa/pa64-start.h ${tm_file} linux.h pa/pa-linux.h \ pa/pa64-regs.h pa/pa-64.h pa/pa64-linux.h" tmake_file=pa/t-linux64 - xmake_file=x-linux gas=yes gnu_ld=yes ;; hppa*-*-linux* | parisc*-*-linux*) @@ -652,7 +643,6 @@ hppa*-*-linux* | parisc*-*-linux*) tm_file="${tm_file} linux.h pa/pa-linux.h \ pa/pa32-regs.h pa/pa32-linux.h" tmake_file=pa/t-linux - xmake_file=x-linux extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" gas=yes gnu_ld=yes if test x$enable_threads = xyes; then @@ -925,7 +915,6 @@ i[34567]86-ibm-aix*) # IBM PS/2 running AIX use_collect2=yes fi xm_defines=POSIX - xmake_file=i386/x-aix ;; i[34567]86-ncr-sysv4*) # NCR 3000 - ix86 running system V.4 xm_defines="POSIX SMALL_ARG_MAX" @@ -1154,7 +1143,6 @@ i[34567]86-*-osfrose*) # 386 using OSF/rose tm_file=i386/osfrose.h use_collect2=yes fi - xmake_file=i386/x-osfrose tmake_file=i386/t-osf extra_objs=halfpic.o ;; @@ -1301,7 +1289,6 @@ i[34567]86-*-osf1*) # Intel 80386's running OSF/1 1.3+ tm_file=i386/osf1elf.h fi tmake_file=i386/t-osf1elf - xmake_file=i386/x-osf1elf extra_parts="crti.o crtn.o crtbegin.o crtend.o" ;; i[34567]86-*-sysv*) # Intel 80386's running system V @@ -1634,7 +1621,6 @@ m68k-bull-sysv*) # Bull DPX/2 tm_file=m68k/dpx2.h fi xm_defines=POSIX - xmake_file=m68k/x-dpx2 use_collect2=yes extra_headers=math-68881.h ;; @@ -2160,7 +2146,6 @@ mips-sgi-*) # Mostly like a MIPS. tm_file="${tm_file} dbx.h" fi xm_defines=POSIX - xmake_file=mips/x-iris3 if test x$gas = xyes then tmake_file=mips/t-mips-gas @@ -2174,7 +2159,6 @@ mips-sgi-*) # Mostly like a MIPS. ;; mips-dec-osfrose*) # Decstation running OSF/1 reference port with OSF/rose. tm_file="mips/osfrose.h ${tm_file}" - xmake_file=mips/x-osfrose tmake_file=mips/t-osfrose extra_objs=halfpic.o use_collect2=yes @@ -2251,7 +2235,6 @@ mips-sony-bsd* | mips-sony-newsos*) # Sony NEWS 3600 or risc/news. then use_collect2=yes fi - xmake_file=mips/x-sony ;; mips-sony-sysv*) # Sony NEWS 3800 with NEWSOS5.0. # That is based on svr4. @@ -2278,7 +2261,6 @@ mips-tandem-sysv4*) # Tandem S2 running NonStop UX tm_file="${tm_file} dbx.h" fi xm_defines=POSIX - xmake_file=mips/x-sysv if test x$gas = xyes then tmake_file=mips/t-mips-gas @@ -2348,7 +2330,6 @@ mips-*-riscos[56789]sysv4*) if test x$stabs = xyes; then tm_file="${tm_file} dbx.h" fi - xmake_file=mips/x-sysv if test x$gas = xyes then tmake_file=mips/t-svr4-gas @@ -2367,7 +2348,6 @@ mips-*-sysv4* | mips-*-riscos[1234]sysv4* | mips-*-riscossysv4*) tm_file="${tm_file} dbx.h" fi xm_defines=POSIX - xmake_file=mips/x-sysv if test x$gas = xyes then tmake_file=mips/t-svr4-gas @@ -2386,7 +2366,6 @@ mips-*-riscos[56789]sysv*) tm_file="${tm_file} dbx.h" fi xm_defines=POSIX - xmake_file=mips/x-sysv if test x$gas = xyes then tmake_file=mips/t-svr3-gas @@ -2405,7 +2384,6 @@ mips-*-sysv* | mips-*-riscos*sysv*) tm_file="${tm_file} dbx.h" fi xm_defines=POSIX - xmake_file=mips/x-sysv if test x$gas = xyes then tmake_file=mips/t-svr3-gas @@ -2736,7 +2714,6 @@ powerpcle-*-solaris2*) rs6000-ibm-aix3.[01]*) xm_defines=POSIX tm_file="${tm_file} rs6000/aix.h rs6000/aix31.h" - xmake_file=rs6000/x-aix31 float_format=none use_collect2=yes ;; @@ -2751,7 +2728,6 @@ rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*) xm_defines=POSIX tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h" tmake_file=rs6000/t-newas - xmake_file=rs6000/x-aix41 float_format=none use_collect2=yes ;; @@ -2759,7 +2735,6 @@ rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*) xm_defines=POSIX tm_file="${tm_file} rs6000/aix.h rs6000/aix43.h" tmake_file=rs6000/t-aix43 - xmake_file=rs6000/x-aix41 float_format=none use_collect2=yes thread_file='aix' @@ -2768,7 +2743,6 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*) xm_defines=POSIX tm_file="${tm_file} rs6000/aix.h rs6000/aix51.h" tmake_file=rs6000/t-aix43 - xmake_file=rs6000/x-aix41 float_format=none use_collect2=yes thread_file='aix' @@ -3208,10 +3182,6 @@ xscale-*-coff) esac case $machine in -*-*-sysv4*) - xmake_try_sysv=x-sysv - install_headers_dir=install-headers-cpio - ;; *-*-sysv*) install_headers_dir=install-headers-cpio ;; diff --git a/gcc/config/a29k/x-unix b/gcc/config/a29k/x-unix deleted file mode 100644 index f671a00..0000000 --- a/gcc/config/a29k/x-unix +++ /dev/null @@ -1,2 +0,0 @@ -# Needed for collect2? -CLIB=-lld diff --git a/gcc/config/alpha/x-osf b/gcc/config/alpha/x-osf deleted file mode 100644 index 86aab85..0000000 --- a/gcc/config/alpha/x-osf +++ /dev/null @@ -1 +0,0 @@ -CLIB=-lmld -lexc diff --git a/gcc/config/i386/x-aix b/gcc/config/i386/x-aix deleted file mode 100644 index 7d73083..0000000 --- a/gcc/config/i386/x-aix +++ /dev/null @@ -1 +0,0 @@ -CLIB = -lld diff --git a/gcc/config/i386/x-cygwin b/gcc/config/i386/x-cygwin index f251835..d284b3e 100644 --- a/gcc/config/i386/x-cygwin +++ b/gcc/config/i386/x-cygwin @@ -1,4 +1,2 @@ # Don't run fixproto STMP_FIXPROTO = -# prefix.c wants to poke around the Registry -CLIB = -ladvapi32 diff --git a/gcc/config/i386/x-osf1elf b/gcc/config/i386/x-osf1elf deleted file mode 100644 index f9ee98c..0000000 --- a/gcc/config/i386/x-osf1elf +++ /dev/null @@ -1 +0,0 @@ -CLIB = -lld diff --git a/gcc/config/i386/x-osfrose b/gcc/config/i386/x-osfrose deleted file mode 100644 index f9ee98c..0000000 --- a/gcc/config/i386/x-osfrose +++ /dev/null @@ -1 +0,0 @@ -CLIB = -lld diff --git a/gcc/config/m68k/t-aux b/gcc/config/m68k/t-aux index 3d59d67..1d441e7 100644 --- a/gcc/config/m68k/t-aux +++ b/gcc/config/m68k/t-aux @@ -4,9 +4,6 @@ LIB2FUNCS_EXTRA=aux-mcount.c aux-exit.c FIXPROTO_DEFINES=-D_POSIX_SOURCE -# Only really needed for collect2 -CLIB=-lld - # Needed to support builds for multiple versions of A/UX # LDFLAGS=-static diff --git a/gcc/config/m68k/x-dpx2 b/gcc/config/m68k/x-dpx2 deleted file mode 100644 index ec45bd8..0000000 --- a/gcc/config/m68k/x-dpx2 +++ /dev/null @@ -1 +0,0 @@ -CLIB=-lld diff --git a/gcc/config/mips/x-iris b/gcc/config/mips/x-iris index fbe8afc..3f0f304 100644 --- a/gcc/config/mips/x-iris +++ b/gcc/config/mips/x-iris @@ -1,6 +1,2 @@ -# -lmld is so we can link collect2 running native. -CLIB = -lmld - # Find all of the declarations from the header files FIXPROTO_DEFINES= -D__EXTENSIONS__ -D_SGI_SOURCE -D_LANGUAGE_C_PLUS_PLUS - diff --git a/gcc/config/mips/x-iris3 b/gcc/config/mips/x-iris3 deleted file mode 100644 index 63e5777..0000000 --- a/gcc/config/mips/x-iris3 +++ /dev/null @@ -1,3 +0,0 @@ -# -lmld is so we can link collect2 running native. -# -lmalloc is supposed to be faster than the normal malloc -CLIB = -lmld diff --git a/gcc/config/mips/x-mips b/gcc/config/mips/x-mips deleted file mode 100644 index 7f0ec53..0000000 --- a/gcc/config/mips/x-mips +++ /dev/null @@ -1,2 +0,0 @@ -# This is so we can link collect2 running native. -CLIB = -lmld diff --git a/gcc/config/mips/x-osfrose b/gcc/config/mips/x-osfrose deleted file mode 100644 index f9ee98c..0000000 --- a/gcc/config/mips/x-osfrose +++ /dev/null @@ -1 +0,0 @@ -CLIB = -lld diff --git a/gcc/config/mips/x-sony b/gcc/config/mips/x-sony deleted file mode 100644 index 7f0ec53..0000000 --- a/gcc/config/mips/x-sony +++ /dev/null @@ -1,2 +0,0 @@ -# This is so we can link collect2 running native. -CLIB = -lmld diff --git a/gcc/config/mips/x-sysv b/gcc/config/mips/x-sysv deleted file mode 100644 index 9b2e234..0000000 --- a/gcc/config/mips/x-sysv +++ /dev/null @@ -1,3 +0,0 @@ -# This enables collect2 to link. -# Some systems use version 2.11 of the compilers. Some use version 3.11. -CLIB= -L/usr/lib/cmplrs/cc2.11 -L/usr/lib/cmplrs/cc3.11 -lmld diff --git a/gcc/config/rs6000/x-aix31 b/gcc/config/rs6000/x-aix31 deleted file mode 100644 index de19792..0000000 --- a/gcc/config/rs6000/x-aix31 +++ /dev/null @@ -1,4 +0,0 @@ -# We need -lld for collect2 (actually this only matters -# for a native compiler, but this is as good a place as any -# to define the symbol). -CLIB= -lld diff --git a/gcc/config/rs6000/x-aix41 b/gcc/config/rs6000/x-aix41 deleted file mode 100644 index d573d4d..0000000 --- a/gcc/config/rs6000/x-aix41 +++ /dev/null @@ -1,6 +0,0 @@ -# configuration for IBM RS/6000 running AIX 4.1+ - -# We need -lld for collect2 (actually this only matters -# for a native compiler, but this is as good a place as any -# to define the symbol). -CLIB=-lld diff --git a/gcc/config/rs6000/x-rs6000 b/gcc/config/rs6000/x-rs6000 deleted file mode 100644 index 6e553cc..0000000 --- a/gcc/config/rs6000/x-rs6000 +++ /dev/null @@ -1,6 +0,0 @@ -# configuration for IBM rs6000 running aix - -# We need -lld for collect2 (actually this only matters -# for a native compiler, but this is as good a place as any -# to define the symbol). -CLIB=-lld diff --git a/gcc/configure b/gcc/configure index 96a70e8..7255406 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2580,13 +2580,15 @@ else #include "confdefs.h" int main() { -switch(0) { case 0: case (char)(1 << $i) && (char)(1 << $i) != 1: ; } +switch(0) { + case (unsigned char)((unsigned long)1 << $i) == ((unsigned long)1 << $i): + case (unsigned char)((unsigned long)1<<($i-1)) == ((unsigned long)1<<($i-1)): + ; } ; return 0; } EOF -if { (eval echo configure:2587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - gcc_cv_c_nbby=$i - break + gcc_cv_c_nbby=$i; break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -2609,7 +2611,7 @@ EOF fi fi echo $ac_n "checking byte ordering""... $ac_c" 1>&6 -echo "configure:2613: checking byte ordering" >&5 +echo "configure:2615: checking byte ordering" >&5 if eval "test \"`echo '$''{'ac_cv_c_compile_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2623,7 +2625,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then od -c conftest.o | sed 's/^[0-7]*[ ]*/ / s/\*/./g @@ -2682,7 +2684,7 @@ EOF fi echo $ac_n "checking floating point format""... $ac_c" 1>&6 -echo "configure:2686: checking floating point format" >&5 +echo "configure:2688: checking floating point format" >&5 if eval "test \"`echo '$''{'ac_cv_c_float_format'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2695,7 +2697,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then od -c conftest.o | sed 's/^[0-7]*[ ]*/ / s/\*/./g @@ -2806,7 +2808,7 @@ fi # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2810: checking for $ac_word" >&5 +echo "configure:2812: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_have_gnat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2838,7 +2840,7 @@ fi # Extract the first word of "mktemp", so it can be a program name with args. set dummy mktemp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2842: checking for $ac_word" >&5 +echo "configure:2844: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_have_mktemp_command'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2877,7 +2879,7 @@ else # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2881: checking for $ac_word" >&5 +echo "configure:2883: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2906,13 +2908,13 @@ fi if test -n "$MAKEINFO"; then # Found it, now check the version. echo $ac_n "checking for modern makeinfo""... $ac_c" 1>&6 -echo "configure:2910: checking for modern makeinfo" >&5 +echo "configure:2912: checking for modern makeinfo" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_makeinfo_modern'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:2916: version of makeinfo is $ac_prog_version" >&5 + echo "configure:2918: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 4.*) @@ -2940,7 +2942,7 @@ fi # Is pod2man recent enough to regenerate manpages? echo $ac_n "checking for recent Pod::Man""... $ac_c" 1>&6 -echo "configure:2944: checking for recent Pod::Man" >&5 +echo "configure:2946: checking for recent Pod::Man" >&5 if perl -e 'use 1.10 Pod::Man' >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 GENERATED_MANPAGES=generated-manpages @@ -2956,7 +2958,7 @@ else # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2960: checking for $ac_word" >&5 +echo "configure:2962: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2993,7 +2995,7 @@ else # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2997: checking for $ac_word" >&5 +echo "configure:2999: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3022,17 +3024,62 @@ fi fi +# These libraries may be used by collect2. +# We may need a special search path to get them linked. +echo $ac_n "checking for collect2 libraries""... $ac_c" 1>&6 +echo "configure:3031: checking for collect2 libraries" >&5 +if eval "test \"`echo '$''{'gcc_cv_collect2_libs'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + save_LIBS="$LIBS" +for libs in '' -lld -lmld '-lmld -lexc' \ + '-L/usr/lib/cmplrs/cc2.11 -lmld' \ + '-L/usr/lib/cmplrs/cc3.11 -lmld' +do + LIBS="$libs" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + gcc_cv_collect2_libs="$libs"; break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +LIBS="$save_LIBS" +test -z "$gcc_cv_collect2_libs" && gcc_cv_collect2_libs='none required' +fi + +echo "$ac_t""$gcc_cv_collect2_libs" 1>&6 +case $gcc_cv_collect2_libs in + "none required") ;; + *) COLLECT2_LIBS=$gcc_cv_collect2_libs ;; +esac + + # See if the stage1 system preprocessor understands the ANSI C # preprocessor stringification operator. (Used by symcat.h.) echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:3031: checking for preprocessor stringizing operator" >&5 +echo "configure:3078: checking for preprocessor stringizing operator" >&5 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 # Use only if it exists, # doesn't clash with , and declares intmax_t. echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 -echo "configure:3069: checking for inttypes.h" >&5 +echo "configure:3116: checking for inttypes.h" >&5 if eval "test \"`echo '$''{'gcc_cv_header_inttypes_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3078,7 +3125,7 @@ int main() { intmax_t i = -1; ; return 0; } EOF -if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_header_inttypes_h=yes else @@ -3105,12 +3152,12 @@ for ac_func in strtoul bsearch popen times clock \ fputs_unlocked getrusage iconv nl_langinfo lstat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3109: checking for $ac_func" >&5 +echo "configure:3156: 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:3184: \"$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 @@ -3159,12 +3206,12 @@ done echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:3163: checking for ssize_t" >&5 +echo "configure:3210: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3195,12 +3242,12 @@ fi # Try to determine the array type of the second argument of getgroups # for the target system (int or gid_t). echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3199: checking for uid_t in sys/types.h" >&5 +echo "configure:3246: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -3229,7 +3276,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:3233: checking type of array argument to getgroups" >&5 +echo "configure:3280: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3237,7 +3284,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -3276,7 +3323,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -3317,12 +3364,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3321: checking for vprintf" >&5 +echo "configure:3368: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+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:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3369,12 +3416,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3373: checking for _doprnt" >&5 +echo "configure:3420: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+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:3448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3435,12 +3482,12 @@ fi for ac_func in strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3439: checking for $ac_func" >&5 +echo "configure:3486: 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:3514: \"$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 @@ -3490,7 +3537,7 @@ done echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6 -echo "configure:3494: checking whether the printf functions support %p" >&5 +echo "configure:3541: checking whether the printf functions support %p" >&5 if eval "test \"`echo '$''{'gcc_cv_func_printf_ptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3498,7 +3545,7 @@ else gcc_cv_func_printf_ptr=no else cat > conftest.$ac_ext < @@ -3511,7 +3558,7 @@ int main() return (p != q); } EOF -if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gcc_cv_func_printf_ptr=yes else @@ -3543,12 +3590,12 @@ case "${host}" in ;; esac echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3547: checking for pid_t" >&5 +echo "configure:3594: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3577,17 +3624,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:3581: checking for vfork.h" >&5 +echo "configure:3628: checking for vfork.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:3591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3638: \"$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* @@ -3612,18 +3659,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:3616: checking for working vfork" >&5 +echo "configure:3663: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:3622: checking for vfork" >&5 +echo "configure:3669: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+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:3697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -3668,7 +3715,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext < @@ -3763,7 +3810,7 @@ main() { } } EOF -if { (eval echo configure:3767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -3788,12 +3835,12 @@ fi for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3792: checking for $ac_func" >&5 +echo "configure:3839: 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:3867: \"$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 @@ -4087,7 +4134,7 @@ main () EOF echo $ac_n "checking for working mmap from /dev/zero""... $ac_c" 1>&6 -echo "configure:4091: checking for working mmap from /dev/zero" >&5 +echo "configure:4138: checking for working mmap from /dev/zero" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_dev_zero'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4103,11 +4150,11 @@ else esac else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_dev_zero=yes else @@ -4134,7 +4181,7 @@ EOF fi echo $ac_n "checking for working mmap with MAP_ANON(YMOUS)""... $ac_c" 1>&6 -echo "configure:4138: checking for working mmap with MAP_ANON(YMOUS)" >&5 +echo "configure:4185: checking for working mmap with MAP_ANON(YMOUS)" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_anon'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4144,12 +4191,12 @@ else ac_cv_func_mmap_anon=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_anon=yes else @@ -4177,7 +4224,7 @@ fi rm -f ct-mmap.inc echo $ac_n "checking for working mmap of a file""... $ac_c" 1>&6 -echo "configure:4181: checking for working mmap of a file" >&5 +echo "configure:4228: checking for working mmap of a file" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_file'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4192,7 +4239,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_mmap_file=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_file=yes else @@ -4261,12 +4308,12 @@ for ac_func in getenv atol sbrk abort atof getcwd getwd \ do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4265: checking whether $ac_func is declared" >&5 +echo "configure:4312: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+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:4331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4375,12 +4422,12 @@ for ac_func in getrlimit setrlimit getrusage do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4379: checking whether $ac_func is declared" >&5 +echo "configure:4426: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+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:4449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4440,12 +4487,12 @@ for ac_func in times do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4444: checking whether $ac_func is declared" >&5 +echo "configure:4491: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+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:4514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4497,13 +4544,13 @@ fi # More time-related stuff. echo $ac_n "checking for struct tms""... $ac_c" 1>&6 -echo "configure:4501: checking for struct tms" >&5 +echo "configure:4548: checking for struct tms" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tms'+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:4567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tms=yes else @@ -4539,13 +4586,13 @@ fi # use gcc_cv_* here because this doesn't match the behavior of AC_CHECK_TYPE. # revisit after autoconf 2.50. echo $ac_n "checking for clock_t""... $ac_c" 1>&6 -echo "configure:4543: checking for clock_t" >&5 +echo "configure:4590: checking for clock_t" >&5 if eval "test \"`echo '$''{'gcc_cv_type_clock_t'+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:4606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_type_clock_t=yes else @@ -4580,12 +4627,12 @@ CFLAGS="$saved_CFLAGS" # mkdir takes a single argument on some systems. echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6 -echo "configure:4584: checking if mkdir takes one argument" >&5 +echo "configure:4631: checking if mkdir takes one argument" >&5 if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4602,7 +4649,7 @@ int main() { mkdir ("foo", 0); ; return 0; } EOF -if { (eval echo configure:4606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_mkdir_takes_one_arg=no else @@ -4882,7 +4929,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:4886: checking for strerror in -lcposix" >&5 +echo "configure:4933: 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 @@ -4890,7 +4937,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:4952: \"$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 @@ -4924,12 +4971,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4928: checking for working const" >&5 +echo "configure:4975: 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:5029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4999,12 +5046,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5003: checking for off_t" >&5 +echo "configure:5050: 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 @@ -5032,12 +5079,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5036: checking for size_t" >&5 +echo "configure:5083: 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 @@ -5070,17 +5117,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:5074: checking for $ac_hdr" >&5 +echo "configure:5121: 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:5084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5131: \"$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* @@ -5110,12 +5157,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5114: checking for $ac_func" >&5 +echo "configure:5161: 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:5189: \"$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 @@ -5167,12 +5214,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5171: checking for $ac_func" >&5 +echo "configure:5218: 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:5246: \"$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 @@ -5229,19 +5276,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:5233: checking for LC_MESSAGES" >&5 +echo "configure:5280: 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:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5292: \"$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 @@ -5262,7 +5309,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:5266: checking whether NLS is requested" >&5 +echo "configure:5313: 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" @@ -5282,7 +5329,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:5286: checking whether included gettext is requested" >&5 +echo "configure:5333: 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" @@ -5301,17 +5348,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:5305: checking for libintl.h" >&5 +echo "configure:5352: 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:5315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5362: \"$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* @@ -5328,19 +5375,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:5332: checking for gettext in libc" >&5 +echo "configure:5379: 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:5344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5391: \"$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 @@ -5356,7 +5403,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:5360: checking for bindtextdomain in -lintl" >&5 +echo "configure:5407: 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 @@ -5364,7 +5411,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:5426: \"$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 @@ -5391,12 +5438,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:5395: checking for gettext in libintl" >&5 +echo "configure:5442: 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:5400: checking for gettext in -lintl" >&5 +echo "configure:5447: 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 @@ -5404,7 +5451,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:5466: \"$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 @@ -5458,7 +5505,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:5462: checking for $ac_word" >&5 +echo "configure:5509: 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 @@ -5492,12 +5539,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5496: checking for $ac_func" >&5 +echo "configure:5543: 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:5571: \"$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 @@ -5547,7 +5594,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:5551: checking for $ac_word" >&5 +echo "configure:5598: 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 @@ -5583,7 +5630,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:5587: checking for $ac_word" >&5 +echo "configure:5634: 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 @@ -5615,7 +5662,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -5648,7 +5695,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:5652: checking whether catgets can be used" >&5 +echo "configure:5699: 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" @@ -5661,7 +5708,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:5665: checking for main in -li" >&5 +echo "configure:5712: 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 @@ -5669,14 +5716,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:5727: \"$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 @@ -5704,12 +5751,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:5708: checking for catgets" >&5 +echo "configure:5755: 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:5783: \"$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 @@ -5754,7 +5801,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:5758: checking for $ac_word" >&5 +echo "configure:5805: 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 @@ -5790,7 +5837,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:5794: checking for $ac_word" >&5 +echo "configure:5841: 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 @@ -5827,7 +5874,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:5831: checking for $ac_word" >&5 +echo "configure:5878: 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 @@ -5865,7 +5912,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:5869: checking for $ac_word" >&5 +echo "configure:5916: 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 @@ -5923,7 +5970,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:5927: checking for $ac_word" >&5 +echo "configure:5974: 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 @@ -5957,7 +6004,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:5961: checking for $ac_word" >&5 +echo "configure:6008: 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 @@ -5996,7 +6043,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:6000: checking for $ac_word" >&5 +echo "configure:6047: 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 @@ -6095,7 +6142,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:6099: checking for catalogs to be installed" >&5 +echo "configure:6146: checking for catalogs to be installed" >&5 if test "x$LINGUAS" = "x"; then LINGUAS=$ALL_LINGUAS else @@ -6127,17 +6174,17 @@ echo "configure:6099: 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:6131: checking for linux/version.h" >&5 +echo "configure:6178: 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:6141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6188: \"$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* @@ -6210,15 +6257,78 @@ if test "${enable_win32_registry+set}" = set; then : fi - +case $host_os in + win32 | pe | cygwin* | mingw32* | uwin*) echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:6216: checking whether windows registry support is requested" >&5 +echo "configure:6264: 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 EOF echo "$ac_t""yes" 1>&6 + +echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6 +echo "configure:6273: checking for library containing RegOpenKeyExA" >&5 +if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_func_search_save_LIBS="$LIBS" +ac_cv_search_RegOpenKeyExA="no" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_RegOpenKeyExA="none required" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do +LIBS="-l$i $ac_func_search_save_LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_RegOpenKeyExA="-l$i" +break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +LIBS="$ac_func_search_save_LIBS" +fi + +echo "$ac_t""$ac_cv_search_RegOpenKeyExA" 1>&6 +if test "$ac_cv_search_RegOpenKeyExA" != "no"; then + test "$ac_cv_search_RegOpenKeyExA" = "none required" || LIBS="$ac_cv_search_RegOpenKeyExA $LIBS" + +else : + +fi else echo "$ac_t""no" 1>&6 fi @@ -6241,13 +6351,15 @@ esac if test x$enable_win32_registry != xno; then echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 -echo "configure:6245: checking registry key on windows hosts" >&5 +echo "configure:6355: checking registry key on windows hosts" >&5 cat >> confdefs.h <&6 fi +;; +esac # Get an absolute path to the GCC top-level source directory holddir=`pwd` @@ -6432,7 +6544,7 @@ fi # Figure out what assembler we will be using. echo $ac_n "checking what assembler to use""... $ac_c" 1>&6 -echo "configure:6436: checking what assembler to use" >&5 +echo "configure:6548: checking what assembler to use" >&5 gcc_cv_as= gcc_cv_gas_major_version= gcc_cv_gas_minor_version= @@ -6517,7 +6629,7 @@ fi # Figure out what nm we will be using. echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:6521: checking what nm to use" >&5 +echo "configure:6633: 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 @@ -6528,7 +6640,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:6532: checking assembler alignment features" >&5 +echo "configure:6644: 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. @@ -6576,7 +6688,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:6580: checking assembler subsection support" >&5 +echo "configure:6692: 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 @@ -6616,7 +6728,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:6620: checking assembler weak support" >&5 +echo "configure:6732: 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 @@ -6639,7 +6751,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:6643: checking assembler hidden support" >&5 +echo "configure:6755: 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 @@ -6663,7 +6775,7 @@ fi echo "$ac_t""$gcc_cv_as_hidden" 1>&6 echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 -echo "configure:6667: checking assembler leb128 support" >&5 +echo "configure:6779: 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 @@ -6710,7 +6822,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:6714: checking assembler .register pseudo-op support" >&5 +echo "configure:6826: 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 @@ -6738,7 +6850,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:6742: checking assembler supports -relax" >&5 +echo "configure:6854: 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 @@ -6768,7 +6880,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:6772: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 +echo "configure:6884: 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 @@ -6813,7 +6925,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:6817: checking for assembler offsetable %lo() support" >&5 +echo "configure:6929: 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 @@ -6852,7 +6964,7 @@ EOF i[34567]86-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:6856: checking assembler instructions" >&5 +echo "configure:6968: 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 @@ -6881,7 +6993,7 @@ EOF esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:6885: checking assembler dwarf2 debug_line support" >&5 +echo "configure:6997: 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 @@ -7066,7 +7178,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7070: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:7182: 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" @@ -7586,6 +7698,7 @@ s%@BUILD_INFO@%$BUILD_INFO%g s%@GENERATED_MANPAGES@%$GENERATED_MANPAGES%g s%@FLEX@%$FLEX%g s%@BISON@%$BISON%g +s%@COLLECT2_LIBS@%$COLLECT2_LIBS%g s%@TARGET_GETGROUPS_T@%$TARGET_GETGROUPS_T%g s%@vfprintf@%$vfprintf%g s%@doprint@%$doprint%g diff --git a/gcc/configure.in b/gcc/configure.in index 2f2d2c1..893e2f8 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -521,6 +521,26 @@ else AC_CHECK_PROG(BISON, bison, bison, false) fi +# These libraries may be used by collect2. +# We may need a special search path to get them linked. +AC_CACHE_CHECK(for collect2 libraries, gcc_cv_collect2_libs, +[save_LIBS="$LIBS" +for libs in '' -lld -lmld '-lmld -lexc' \ + '-L/usr/lib/cmplrs/cc2.11 -lmld' \ + '-L/usr/lib/cmplrs/cc3.11 -lmld' +do + LIBS="$libs" + AC_TRY_LINK_FUNC(ldopen, + [gcc_cv_collect2_libs="$libs"; break]) +done +LIBS="$save_LIBS" +test -z "$gcc_cv_collect2_libs" && gcc_cv_collect2_libs='none required']) +case $gcc_cv_collect2_libs in + "none required") ;; + *) COLLECT2_LIBS=$gcc_cv_collect2_libs ;; +esac +AC_SUBST(COLLECT2_LIBS) + # See if the stage1 system preprocessor understands the ANSI C # preprocessor stringification operator. (Used by symcat.h.) AC_C_STRINGIZE @@ -907,13 +927,15 @@ AC_ARG_ENABLE(win32-registry, --enable-win32-registry=KEY Use KEY instead of GCC version as the last portion of the registry key.],,) - +case $host_os in + win32 | pe | cygwin* | mingw32* | uwin*) AC_MSG_CHECKING(whether windows registry support is requested) if test x$enable_win32_registry != xno; then AC_DEFINE(ENABLE_WIN32_REGISTRY, 1, [Define to 1 if installation paths should be looked up in Windows32 Registry. Ignored on non windows32 hosts.]) AC_MSG_RESULT(yes) + AC_SEARCH_LIBS(RegOpenKeyExA, advapi32) else AC_MSG_RESULT(no) fi @@ -940,6 +962,8 @@ if test x$enable_win32_registry != xno; then [Define to be the last portion of registry key on windows hosts.]) AC_MSG_RESULT($gcc_cv_win32_registry_key) fi +;; +esac # Get an absolute path to the GCC top-level source directory holddir=`pwd` -- 2.7.4