From 4725fb48f5d3fc844e96e1fdcd05e9d43528f6f9 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Sat, 26 Feb 1994 03:17:02 +0000
Subject: [PATCH] 	* ldgram.y (dirlist_ptr): Removed; not used. 	*
 lexsup.c: Include ldver.h. 	* Makefile.in: Rebuilt dependencies.

---
 ld/ChangeLog   |  6 ++++++
 ld/Makefile.in | 25 +++++++++++++++----------
 ld/ldgram.y    |  2 --
 ld/lexsup.c    |  1 +
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 62a4c0b483..abcef5c892 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 25 19:12:03 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ldgram.y (dirlist_ptr): Removed; not used.
+	* lexsup.c: Include ldver.h.
+	* Makefile.in: Rebuilt dependencies.
+
 Fri Feb 25 18:55:54 1994  Ted Lemon  (mellon@pepper.ncd.com)
 
 	* ldlang.c (lookup_name): don't call bfd_set_gp_size.
diff --git a/ld/Makefile.in b/ld/Makefile.in
index b6e349ed51..306455eeb6 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -739,19 +739,22 @@ ldexp.o : ldexp.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   ldgram.h ldlang.h
 ldfile.o : ldfile.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/obstack.h ../bfd/sysdep.h $(INCDIR)/fopen-same.h \
-  ld.h ldmisc.h ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h ldlex.h
+  ld.h ldmisc.h ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h \
+  ldlex.h
 ldlang.o : ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/obstack.h ../bfd/sysdep.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h ld.h ldmain.h ldgram.h ldexp.h \
-  ldlang.h ldemul.h ldlex.h ldmisc.h ldctor.h ldfile.h
+  $(INCDIR)/libiberty.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
+  ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
+  ldctor.h ldfile.h
 ldmain.o : ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/obstack.h ../bfd/sysdep.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h config.h ld.h ldmain.h ldmisc.h \
-  ldwrite.h ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h \
-  ldfile.h ldctor.h
+  $(INCDIR)/libiberty.h $(INCDIR)/bfdlink.h config.h \
+  ld.h ldmain.h ldmisc.h ldwrite.h ldgram.h ldexp.h ldlang.h \
+  ldemul.h ldlex.h ldfile.h ldctor.h
 ldmisc.o : ldmisc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/obstack.h ../bfd/sysdep.h $(INCDIR)/fopen-same.h \
-  ld.h ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h ldmain.h ldfile.h
+  ld.h ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h ldmain.h \
+  ldfile.h
 ldver.o : ldver.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/obstack.h ../bfd/sysdep.h $(INCDIR)/fopen-same.h \
   ld.h ldver.h ldemul.h ldmain.h
@@ -761,8 +764,9 @@ ldwrite.o : ldwrite.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   ldmisc.h ldgram.h ldmain.h
 lexsup.o : lexsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/obstack.h ../bfd/sysdep.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/getopt.h $(INCDIR)/bfdlink.h config.h \
-  ldgram.h ldlex.h ld.h ldexp.h ldgram.h ldmisc.h ldmain.h ldfile.h
+  $(INCDIR)/getopt.h $(INCDIR)/bfdlink.h config.h ld.h \
+  ldmain.h ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h \
+  ldfile.h ldver.h
 mri.o : mri.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/obstack.h \
   ../bfd/sysdep.h $(INCDIR)/fopen-same.h ld.h ldexp.h \
   ldlang.h ldmisc.h mri.h ldgram.h
@@ -771,6 +775,7 @@ ldgram.o : ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/bfdlink.h ld.h ldexp.h ldver.h ldlang.h ldemul.h \
   ldfile.h ldmisc.h ldmain.h mri.h ldlex.h
 ldlex.o : ldlex.c ../bfd/bfd.h $(INCDIR)/obstack.h \
-  ld.h ldgram.h ldmisc.h ldexp.h ldlang.h ldfile.h ldlex.h ldmain.h
+  ../bfd/sysdep.h $(INCDIR)/fopen-same.h ld.h ldgram.h \
+  ldmisc.h ldexp.h ldlang.h ldfile.h ldlex.h ldmain.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ld/ldgram.y b/ld/ldgram.y
index fe248cada0..9187579127 100644
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -42,8 +42,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 static int typebits;
 
-static char *dirlist_ptr;
-
 lang_memory_region_type *region;
 
 
diff --git a/ld/lexsup.c b/ld/lexsup.c
index 7f52ce2de6..0b07e0f78f 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -32,6 +32,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "ldgram.h"
 #include "ldlex.h"
 #include "ldfile.h"
+#include "ldver.h"
 
 /* Omit args to avoid the possibility of clashing with a system header
    that might disagree about consts.  */