From dca7760fb5cb24c6f2ca566c5c5c73f37b14ccae Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Sun, 5 Nov 2000 06:27:15 +0000
Subject: [PATCH] * ldlex.l (yy_create_string_buffer): Init all structure
 fields.

* Makefile.am (DISTCLEANFILES): Add stringify.sed.
Move 2000-11-02 Makefile.in changes to this file.
---
 ld/ChangeLog   | 9 +++++++++
 ld/Makefile.am | 6 +++++-
 ld/Makefile.in | 4 ++--
 ld/ldlex.l     | 5 +++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d2e2c9a8387..fbecc429405 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-05  Alan Modra  <alan@linuxcare.com.au>
+
+	* ldlex.l (yy_create_string_buffer): Init yy_is_our_buffer,
+	yy_is_interactive, yy_at_bol, and yy_fill_buffer.
+
+	* Makefile.am (DISTCLEANFILES): Add stringify.sed.
+	Move 2000-11-02 Makefile.in changes to this file.
+	* Makefile.in: Regenerate.
+
 2000-11-03  Nick Clifton  <nickc@redhat.com>
 
 	* scripttempl/h8300.sc: Use ${CONSTRUCTING...} to enclose
diff --git a/ld/Makefile.am b/ld/Makefile.am
index abb3f13cfd5..2093694c0e2 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -153,6 +153,7 @@ ALL_EMULATIONS = \
 	eelf32ppcsim.o \
 	eelf_i386.o \
 	eelf_i386_be.o \
+	eelf_i386_chaos.o \
 	egld960.o \
 	egld960coff.o \
 	eh8300.o \
@@ -501,6 +502,9 @@ eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
 eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_i386_be "$(tdir_elf_i386_be)"
+eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} elf_i386_chaos "$(tdir_elf_i386_chaos)"
 egld960.c: $(srcdir)/emulparams/gld960.sh \
   $(srcdir)/emultempl/gld960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} gld960 "$(tdir_gld960)"
@@ -921,7 +925,7 @@ install-data-local:
 LDDISTSTUFF = ldgram.c ldgram.h ldlex.c
 diststuff: $(LDDISTSTUFF) info
 
-DISTCLEANFILES = tdirs site.exp site.bak
+DISTCLEANFILES = tdirs site.exp site.bak stringify.sed
 distclean-local:
 	rm -rf ldscripts
 
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 4bb110d8a69..29edd99612f 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -416,7 +416,7 @@ CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
 # target is run by the taz target in ../Makefile.in.
 LDDISTSTUFF = ldgram.c ldgram.h ldlex.c
 
-DISTCLEANFILES = tdirs site.exp site.bak
+DISTCLEANFILES = tdirs site.exp site.bak stringify.sed
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = config.h
@@ -458,7 +458,7 @@ deffilep.c ldgram.c ldlex.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES)
 OBJECTS = $(ld_new_OBJECTS)
diff --git a/ld/ldlex.l b/ld/ldlex.l
index 4dfa53f7a4d..d5f5d27d3b8 100644
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -479,6 +479,11 @@ yy_create_string_buffer (string, size)
   b->yy_n_chars = size+1;
   b->yy_buf_pos = &b->yy_ch_buf[1];
 
+  b->yy_is_our_buffer = 1;
+  b->yy_is_interactive = 0;
+  b->yy_at_bol = 1;
+  b->yy_fill_buffer = 0;
+
   /* flex 2.4.7 changed the interface.  FIXME: We should not be using
      a flex internal interface in the first place!  */
 #ifdef YY_BUFFER_NEW
-- 
2.30.2