From 7e19f60e5a44156252894a4eed7f943ce0c2694d Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Thu, 15 Feb 1996 21:32:43 +0000
Subject: [PATCH] 	* configure.in: Call AC_PROG_CC before configure.host.
 	* configure: Rebuild. 	* configure.host: Remove go32 host, since it
 should no longer be 	necessary.  Don't set CC for romp host.

---
 ld/ChangeLog      |  5 +++++
 ld/configure      | 21 +++++++++++----------
 ld/configure.host |  6 ------
 ld/configure.in   |  3 ++-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 786e914a529..409ae60ddaf 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,10 @@
 Thu Feb 15 13:58:06 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* configure.in: Call AC_PROG_CC before configure.host.
+	* configure: Rebuild.
+	* configure.host: Remove go32 host, since it should no longer be
+	necessary.  Don't set CC for romp host.
+
 	* scripttempl/elf.sc: Don't skip a page in virtual memory space if
 	the text segment ends exactly on a page boundary.
 
diff --git a/ld/configure b/ld/configure
index 6366f1a670d..e0855ab4f6e 100755
--- a/ld/configure
+++ b/ld/configure
@@ -675,8 +675,6 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 # host-specific stuff:
 
-. ${srcdir}/configure.host
-
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -753,6 +751,9 @@ else
 fi
 
 
+. ${srcdir}/configure.host
+
+
 
 
 
@@ -790,7 +791,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 794 "configure"
+#line 795 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -804,7 +805,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 808 "configure"
+#line 809 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -837,7 +838,7 @@ 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 841 "configure"
+#line 842 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -872,7 +873,7 @@ 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 876 "configure"
+#line 877 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -925,7 +926,7 @@ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 929 "configure"
+#line 930 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -965,7 +966,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 969 "configure"
+#line 970 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1000,7 +1001,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1004 "configure"
+#line 1005 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1043,7 +1044,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1047 "configure"
+#line 1048 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
diff --git a/ld/configure.host b/ld/configure.host
index 04013fd5a55..2e74df7df7a 100644
--- a/ld/configure.host
+++ b/ld/configure.host
@@ -4,7 +4,6 @@
 # information.
 
 # This file sets the following shell variables:
-#  CC			compiler to use (only if needed and not already set)
 #  HDEFINES		host specific compiler flags
 #  HOSTING_CRT0		crt0.o file used for bootstrapping
 #  HOSTING_LIBS		libraries used for bootstrapping
@@ -37,10 +36,6 @@ i[345]86-*-bsd* | i[345]86-*-freebsd* | i[345]86-*-netbsd*)
   HOSTING_CRT0=/usr/lib/crt0.o
   ;;
 
-i[345]86-*-go32*)
-  test -z "${CC}" && CC="i386-go32-gcc -O2 -fno-omit-frame-pointer -Wl,-S"
-  ;;
-
 i[345]86-*-sysv4*)
   HOSTING_CRT0='/usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xa.o `if [ -f ../gcc/crtbegin.o ]; then echo ../gcc/crtbegin.o; else gcc -print-libgcc-file-name | sed -e 's/libgcc.a/crtbegin.o/'; fi`'
   HOSTING_LIBS='`if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else gcc -print-libgcc-file-name; fi`  -lc `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else gcc -print-libgcc-file-name | sed -e 's/libgcc.a/crtend.o/'; fi` /usr/ccs/lib/crtn.o'
@@ -123,7 +118,6 @@ m88*-motorola-sysv3)
 
 romp-*-*)
   HDEFINES=-DNO_VARARGS
-  CC=${CC-gcc}
   ;;
 
 sparc-*-solaris2*)
diff --git a/ld/configure.in b/ld/configure.in
index a20f72ea51e..726521c5f3e 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -33,9 +33,10 @@ AC_ARG_PROGRAM
 
 # host-specific stuff:
 
+AC_PROG_CC
+
 . ${srcdir}/configure.host
 
-AC_PROG_CC
 AC_SUBST(CFLAGS)
 AC_SUBST(HLDFLAGS)
 AC_SUBST(RPATH_ENVVAR)
-- 
2.30.2