From 30104b16c32c5173e72221394a6319de81fd9581 Mon Sep 17 00:00:00 2001
From: Steve Chamberlain <steve@cygnus>
Date: Tue, 3 Sep 1991 21:04:24 +0000
Subject: [PATCH] *** empty log message ***

---
 ld/.Sanitize        | 35 ++++++++++++++++++---------------
 ld/Makefile.in      | 48 ++++++++++++++++++++++-----------------------
 ld/config/.Sanitize | 23 ++++++++++++----------
 ld/configure.in     |  6 +++---
 4 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/ld/.Sanitize b/ld/.Sanitize
index 668933b0590..1254a6953bf 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -46,23 +46,23 @@ ldindr.c
 ldindr.h
 ldfile.h
 ldgld.c
-ldgld.script
+ldgld.sc
 ldgld68k.c
-ldgld68k.script
-ldgld68kUr.script
-ldgld68kr.script
+ldgld68k.sc
+ldgld68kUr.sc
+ldgld68kr.sc
 ldgld960.c
-ldgld960.script
-ldgldUr.script
+ldgld960.sc
+ldgldUr.sc
 ldgldm88kbcs.c
-ldgldm88kbcs.script
-ldgldm88kbcsUr.script
-ldgldm88kbcsr.script
+ldgldm88kbcs.sc
+ldgldm88kbcsUr.sc
+ldgldm88kbcsr.sc
 ldglda29k.c
-ldglda29k.script
-ldglda29kUr.script
-ldglda29kr.script
-ldgldr.script
+ldglda29k.sc
+ldglda29kUr.sc
+ldglda29kr.sc
+ldgldr.sc
 ldgram.h
 ldgram.y
 ldlang.c
@@ -70,8 +70,8 @@ ldlang.h
 ldlex.h
 ldlex.l
 ldlnk960.c
-ldlnk960.script
-ldlnk960r.script
+ldlnk960.sc
+ldlnk960r.sc
 ldmain.c
 ldmain.h
 ldmisc.c
@@ -93,7 +93,10 @@ echo Done in `pwd`.
 #
 #
 # $Log$
-# Revision 1.5  1991/08/27 00:21:34  steve
+# Revision 1.6  1991/09/03 21:04:00  steve
+# *** empty log message ***
+#
+# Revision 1.5  1991/08/27  00:21:34  steve
 # Added config.sub
 #
 # Revision 1.4  1991/08/06  21:28:21  steve
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 0f73ea30a54..7b2f71cb0d4 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -26,11 +26,11 @@ DEBUG	= -g
 BISON = bison
 BISONFLAGS = -v
 
-SCRIPTS = ldgld68k.script ldgld68kUr.script ldgld68kr.script \
-	ldgld.script ldgldUr.script ldgldr.script ldlnk960.script \
-	ldlnk960r.script ldgld960.script \
-	ldgldm88kbcs.script ldgldm88kbcsUr.script ldgldm88kbcsr.script \
-	ldglda29k.script ldglda29kUr.script ldglda29kr.script
+SCRIPTS = ldgld68k.sc ldgld68kUr.sc ldgld68kr.sc \
+	ldgld.sc ldgldUr.sc ldgldr.sc ldlnk960.sc \
+	ldlnk960r.sc ldgld960.sc \
+	ldgldm88kbcs.sc ldgldm88kbcsUr.sc ldgldm88kbcsr.sc \
+	ldglda29k.sc ldglda29kUr.sc ldglda29kr.sc
 
 PROCESSED_SCRIPTS = ldgld68k.x ldgld68kUr.x ldgld68kr.x ldgld.x \
 	ldgldUr.x ldgldr.x ldlnk960.x ldlnk960r.x ldgld960.x \
@@ -43,7 +43,7 @@ PROCESSED_SCRIPTS = ldgld68k.x ldgld68kUr.x ldgld68kr.x ldgld.x \
 CFLAGS	= $(INCLUDES) $(DEBUG) $(HDEFINES) $(TDEFINES) $(CDEFINES)
 LINTFLAGS =  $(INCLUDES) $(EXTRA_DEF) 
 
-.SUFFIXES: .y .x .script $(SUFFIXES)
+.SUFFIXES: .y .x .sc $(SUFFIXES)
 
 
 # go directly to ld.new in case this ld isn't capable of
@@ -51,7 +51,7 @@ LINTFLAGS =  $(INCLUDES) $(EXTRA_DEF)
 # install.
 LD_PROG	= ld.new
 
-.script.x:
+.sc.x:
 	./mkscript < $< >$*.x
 
 # for self hosting
@@ -122,7 +122,7 @@ ld.dvi:ld.tex
 	tex ld.tex
 
 mkscript: $(srcdir)/mkscript.c
-	$(CC) $(CFLAGS) -o mkscript $(srcdir)/mkscript.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o mkscript $(srcdir)/mkscript.c $(LOADLIBES)
 
 ldgld.o: $(PROCESSED_SCRIPTS) ldgld.c 
 
@@ -131,22 +131,22 @@ ldlex.o: ldlex.c ldgram.h
 ldgram.o: ldgram.c
 ldgram.c:ldgram.y
 
-ldgld68k.x :ldgld68k.script 
-ldgld68kUr.x :ldgld68kUr.script 
-ldgld68kr.x :ldgld68kr.script 
-ldgld.x :ldgld.script 
-ldgldUr.x :ldgldUr.script 
-ldgldr.x :ldgldr.script 
-ldlnk960.x :ldlnk960.script 
-ldlnk960r.x :ldlnk960r.script 
-ldgld960.x :ldgld960.script 
-ldgldm88kbcs.x :ldgldm88kbcs.script 
-ldgldm88kbcsUr.x :ldgldm88kbcsUr.script 
-ldgldm88kbcsr.x:ldgldm88kbcsr.script
-ldgld68k.x:ldgld68k.script
-ldglda29k.x :ldglda29k.script 
-ldglda29kr.x :ldglda29kr.script 
-ldglda29kUr.x :ldglda29kUr.script 
+ldgld68k.x :ldgld68k.sc 
+ldgld68kUr.x :ldgld68kUr.sc 
+ldgld68kr.x :ldgld68kr.sc 
+ldgld.x :ldgld.sc 
+ldgldUr.x :ldgldUr.sc 
+ldgldr.x :ldgldr.sc 
+ldlnk960.x :ldlnk960.sc 
+ldlnk960r.x :ldlnk960r.sc 
+ldgld960.x :ldgld960.sc 
+ldgldm88kbcs.x :ldgldm88kbcs.sc 
+ldgldm88kbcsUr.x :ldgldm88kbcsUr.sc 
+ldgldm88kbcsr.x:ldgldm88kbcsr.sc
+ldgld68k.x:ldgld68k.sc
+ldglda29k.x :ldglda29k.sc 
+ldglda29kr.x :ldglda29kr.sc 
+ldglda29kUr.x :ldglda29kUr.sc 
 
 stage1:	force
 	- mkdir stage1
diff --git a/ld/config/.Sanitize b/ld/config/.Sanitize
index 7629f3cb49a..ce439532d3e 100644
--- a/ld/config/.Sanitize
+++ b/ld/config/.Sanitize
@@ -20,7 +20,7 @@ Do-first:
 echo Sanitizing `pwd`...
 
 if ( echo $* | grep keep\-v9 > /dev/null ) ; then
-	keep_these_too=hmake-sun4-64
+	keep_these_too=h-sun4-64
 fi
 
 # All files listed between the "Things-to-keep:" line and the
@@ -30,14 +30,14 @@ fi
 # with rm -rf.
 
 Things-to-keep:
-hmake-rtbsd
-hmake-dgux
-hmake-sun3
-hmake-sun4
-hmake-dec3100
-tmake-sun4
-tmake-m88k-bcs
-tmake-coff-a29k
+h-rtbsd
+h-dgux
+h-sun3
+h-sun4
+h-dec3100
+t-sun4
+t-m88k-bcs
+t-coff-a29k
 Do-last:
 
 echo Done in `pwd`.
@@ -45,7 +45,10 @@ echo Done in `pwd`.
 #
 #
 # $Log$
-# Revision 1.4  1991/07/15 23:41:06  steve
+# Revision 1.5  1991/09/03 21:04:24  steve
+# *** empty log message ***
+#
+# Revision 1.4  1991/07/15  23:41:06  steve
 # *** empty log message ***
 #
 # Revision 1.3  1991/06/14  22:11:24  steve
diff --git a/ld/configure.in b/ld/configure.in
index 1ecf3fba3e1..6346e5e685b 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -57,12 +57,12 @@ else
 	esac
 fi
 
-if [ ! -f config/hmake-${my_host} ] ; then
+if [ ! -f config/h-${my_host} ] ; then
 	echo '***' The linker do not support host ${host}
 	exit 1
 fi
 
-host_makefile_frag=config/hmake-${my_host}
+host_makefile_frag=config/h-${my_host}
 
 # per-target:
 
@@ -76,7 +76,7 @@ m88k)	my_target=m88k-bcs ;;
 a29k)	my_target=coff-a29k ;;
 esac
 
-target_makefile_frag=config/tmake-${my_target}
+target_makefile_frag=config/t-${my_target}
 
 files=
 links=
-- 
2.30.2