From bb4ff694080ce03ffc2b8003cf1548ee416a7939 Mon Sep 17 00:00:00 2001
From: Fred Fish <fnf@specifix.com>
Date: Thu, 24 Oct 1991 11:11:12 +0000
Subject: [PATCH] Add dwarfread.c, dwarfread.o, elfread.c, elfread.o to source
 and object file macros.  Other obvious dwarf/elf tweaks.

---
 gdb/ChangeLog   |  5 +++++
 gdb/Makefile.in | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a97914b4c6..5d6ade0771 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 Thu Oct 24 01:32:51 1991  Fred Fish  (fnf at cygnus.com)
 
+	* Makefile.in: Add elfread.c and dwarfread.c to SFILES_MAINDIR.
+	Add elfread.o and dwarfread.o to OBS.
+
+	* symfile.h: Add "elf" to list of supported formats in comment.
+
 	* c-exp.y, defs.h, symtab.h, valprint.c:  Add three new builtin
 	types to gdb, builtin_type_long_double, builtin_type_complex, and
 	builtin_type_double_complex.  Add and use new TARGET_SHORT_BIT,
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 937dffa370..eede28cf41 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -132,7 +132,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${LIBIBERTY} ${RL_LIB}
 ADD_FILES = ${REGEX} ${ALLOCA}  ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES}
 
-VERSION = 4.1.3
+VERSION = 4.2
 DIST=gdb
 
 LINT=/usr/5bin/lint
@@ -148,7 +148,7 @@ SFILES_MAINDIR = \
 	 remote.c source.c stack.c symmisc.c symtab.c symfile.c \
 	 utils.c valarith.c valops.c valprint.c values.c c-exp.y m2-exp.y \
 	 signame.c cplus-dem.c mem-break.c target.c inftarg.c \
-	 dbxread.c coffread.c \
+	 dbxread.c coffread.c elfread.c dwarfread.c \
 	 ieee-float.c language.c parse.c
 
 # Source files in subdirectories (which will be handled separately by
@@ -253,7 +253,7 @@ OBS = main.o blockframe.o breakpoint.o findvar.o stack.o source.o \
     command.o utils.o expprint.o environ.o version.o \
     copying.o $(DEPFILES) signame.o cplus-dem.o mem-break.o target.o \
     inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
-    dbxread.o coffread.o # mipsread.o
+    dbxread.o coffread.o elfread.o dwarfread.o # mipsread.o
 
 RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
 
@@ -604,7 +604,7 @@ ${srcdir}/m2-exp.tab.c : $(srcdir)/m2-exp.y
 	${YACC} $(srcdir)/m2-exp.y
 	mv y.tab.c ${srcdir}/m2-exp.tab.c
 
-# dbxread, coffread, mipsread have dependencies on BFD header files.
+# dbxread, coffread, mipsread, elfread have dependencies on BFD header files.
 dbxread.o: ${srcdir}/dbxread.c
 	${CC} -c ${CFLAGS} -I$(BFD_DIR) ${srcdir}/dbxread.c
 
@@ -614,6 +614,9 @@ coffread.o: ${srcdir}/coffread.c
 mipsread.o: ${srcdir}/mipsread.c
 	${CC} -c ${CFLAGS} -I$(BFD_DIR) ${srcdir}/mipsread.c
 
+elfread.o: ${srcdir}/elfread.c
+	${CC} -c ${CFLAGS} -I$(BFD_DIR) ${srcdir}/elfread.c
+
 # Drag in the files that are in another directory.
 
 xdr_ld.o: ${srcdir}/vx-share/xdr_ld.c