From b5775df3dce36c9eb7c88fd865183b8bc4b9636d Mon Sep 17 00:00:00 2001
From: David Henkel-Wallace <gumby@cygnus>
Date: Wed, 8 Jun 1994 05:05:21 +0000
Subject: [PATCH] rs6k lynx changes

---
 ChangeLog             |  6 +++++
 binutils/ChangeLog    |  9 +++++++
 binutils/Makefile.in  |  5 +++-
 binutils/configure.in | 63 +++++++++++++++++++++++++++++++++++++++++++
 build-all.mk          |  2 +-
 configure.in          |  2 +-
 6 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 336bf2dfb0..531f6a7708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@ Tue Jun  7 12:06:24 1994  Ian Lance Taylor  (ian@cygnus.com)
 	* configure: If there is a package_makefile_frag, remove
 	${subdir}/Makefile.tem after copying it in.
 
+Mon Jun  6 21:35:02 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* build_all.mk: support rs6000 lynx identifies itself as
+	rs6000-lynx-lynxos2.2.2.  Also, use /usr/cygnus/progressive/bin/gcc
+	since /bin/gcc is too feeble to compile a modern gcc.
+
 Mon Jun  6 16:06:34 1994  Karen Christiansen (karen@cirdan.cygnus.com)
 
 	* brought devo/test-build.mk update-to-date with progressive/
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8e10150668..f0b841bc2d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jun  6 21:36:43 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* configure.in: if this is an rs6000 (and we're not building for
+	any other bfd targets) then build only nm (collect needs it on
+	rs6000-lynx).
+
+	* Makefile.in: define TOOL_PROGS which the list of programes to
+	install in $tooldir -- replaces a hard-coded list.
+
 Fri Jun  3 10:59:18 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* objdump.c (display_target_list): Remove unused local ok.
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 56e844d3cf..e7fdee300c 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -111,6 +111,9 @@ STAGESTUFF = $(PROGS) *.o
 # Files that can be generated, but should be in the distribution.
 DISTSTUFF=arparse.c arlex.c nlmheader.c sysinfo.c syslex.c info
 
+# Stuff that goes in tooldir/ if appropriate
+TOOL_PROGS = nm.new strip.new ar ranlib
+
 BASEDIR = $(srcdir)/..
 BFDDIR = $(BASEDIR)/bfd
 INCDIR	= $(BASEDIR)/include
@@ -495,7 +498,7 @@ install: all $(DEMANGLER_PROG).1
 	done
 	-if [ -d $(tooldir) ]; then \
 	  if [ -d $(tooldir)/bin ]; then true; else mkdir $(tooldir)/bin; fi; \
-	  for i in nm.new strip.new ar ranlib; do \
+	  for i in $(TOOL_PROGS) ; do \
 	    j=`echo $$i | sed -e 's/.new//'`; \
 	    rm -f $(tooldir)/bin/$$j; \
 	    k=`t='$(program_transform_name)'; echo $$j | sed -e s/x/x/ $$t`; \
diff --git a/binutils/configure.in b/binutils/configure.in
index 00806f8697..649e5d5236 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -10,9 +10,72 @@ configdirs="testsuite"
 
 # per-host:
 
+. ${srcdir}/../bfd/configure.host
+
 host_makefile_frag=
 if [ -f ${srcdir}/../bfd/config/${my_host}.mh ] ; then
 	host_makefile_frag=../bfd/config/${my_host}.mh
 fi
 
 # per-target:
+
+# Canonicalize the secondary target names.
+if [ -n "$with_targets" ]; then
+    for targ in `echo $with_targets | sed 's/,/ /g'`
+    do
+	result=`$configsub $targ 2>/dev/null`
+	if [ -n "$result" ]; then
+	    canon_targets="$canon_targets $result"
+	else
+	    # Allow targets that config.sub doesn't recognize, like "all".
+	    canon_targets="$canon_targets $targ"
+	fi
+    done
+else
+# If our target is rs6000 _and nothing else_ then we build only nm!
+    case $target in
+	rs6000-*-lynx*) target_makefile_frag=config/rslynx ;;
+    esac
+fi
+
+all_targets=false
+build_nlmconv=false
+build_srconv=false
+
+for targ in $target $canon_targets
+do
+    bfd_target=`$srcdir/../bfd/config.bfd $targ`
+
+    if [ "x$bfd_target" = "xall" ]; then
+        all_targets=true
+	build_nlmconv=true
+	build_srconv=true
+    else
+	case $targ in
+	*-*-netware*) build_nlmconv=true ;;
+	esac
+
+	case $targ in
+	*-*-hms*) build_srconv=true ;;
+	esac
+    fi
+done
+
+# We don't do any links based on the target system, just makefile config.
+
+# post-target:
+
+rm -f Makefile.tmp Makefile.2
+mv Makefile Makefile.tmp
+
+if [ "x${build_nlmconv}" = "xtrue" ]; then
+    echo 'BUILD_NLMCONV = $(NLMCONV_PROG)' >> Makefile.2
+fi
+
+if [ "x${build_srconv}" = "xtrue" ]; then
+    echo 'BUILD_SRCONV = $(SRCONV_PROG)' >> Makefile.2
+fi
+
+cat Makefile.tmp >> Makefile.2
+rm -f Makefile.tmp
+mv Makefile.2 Makefile
diff --git a/build-all.mk b/build-all.mk
index 5586cb1d07..2aac81a3a8 100644
--- a/build-all.mk
+++ b/build-all.mk
@@ -235,7 +235,7 @@ endif
 
 ifeq ($(canonhost),rs6000-lynx)
 TARGETS = $(NATIVE)
-CC = /bin/gcc
+CC = /usr/cygnus/progressive/bin/gcc
 all: all-cygnus
 SHELL=/bin/bash
 endif
diff --git a/configure.in b/configure.in
index 76b8944b1c..1ef77d09df 100644
--- a/configure.in
+++ b/configure.in
@@ -251,7 +251,7 @@ case "${target}" in
     # a gcc built textutils will cause the linker to hang on 'join'
     # The CVS server code doesn't work on the RS/6000
     # Newlib makes problems for libg++ in crosses.
-    noconfigdirs="$noconfigdirs gas ld newlib binutils gprof textutils cvs diff make tcl expect texinfo"
+    noconfigdirs="$noconfigdirs gas ld newlib gprof textutils cvs"
     use_gnu_ld=no
     use_gnu_as=no
     ;;