config.gcc: Don't default xmake_file to ${cpu_type}/x-${cpu_type}.

2001-05-01  Zack Weinberg  <zackw@stanford.edu>

	* 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  <zackw@stanford.edu>

	* aclocal.m4 (gcc_AC_C_CHAR_BIT): Correct test program.
	* configure: Regenerate.

From-SVN: r41732

gcc/ChangeLog

+2001-05-01  Zack Weinberg  <zackw@stanford.edu>
+
+	* 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  <zackw@stanford.edu>
+
+	* aclocal.m4 (gcc_AC_C_CHAR_BIT): Correct test program.
+	* configure: Regenerate.
+
 2001-05-01  Angela Marie Thomas <angela@cygnus.com>
 
 	* Makefile.in (install-headers): Remove redundant dependency.

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

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

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)

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
 	;;

gcc/config/a29k/x-unix

-# Needed for collect2?
-CLIB=-lld

gcc/config/alpha/x-osf

-CLIB=-lmld -lexc

gcc/config/i386/x-aix

-CLIB = -lld

gcc/config/i386/x-cygwin

 # Don't run fixproto
 STMP_FIXPROTO =
-# prefix.c wants to poke around the Registry
-CLIB = -ladvapi32

gcc/config/i386/x-osf1elf

-CLIB		= -lld

gcc/config/i386/x-osfrose

-CLIB		= -lld

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
 

gcc/config/m68k/x-dpx2

-CLIB=-lld

gcc/config/mips/x-iris

-# -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
-

gcc/config/mips/x-iris3

-# -lmld is so we can link collect2 running native.
-# -lmalloc is supposed to be faster than the normal malloc
-CLIB		= -lmld

gcc/config/mips/x-mips

-# This is so we can link collect2 running native.
-CLIB		= -lmld

gcc/config/mips/x-osfrose

-CLIB		= -lld

gcc/config/mips/x-sony

-# This is so we can link collect2 running native.
-CLIB		= -lmld

gcc/config/mips/x-sysv

-# 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

gcc/config/rs6000/x-aix31

-# 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

gcc/config/rs6000/x-aix41

-# 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

gcc/config/rs6000/x-rs6000

-# 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

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`