Moved bfd_stab_name() and bfd_stab_names[]

	from syms.c to new file stab-syms.c.
	Renamed to  aout_stab_name() and aout_stab_names[].
	Also, since GNU extended type codes such as N_SETT are no longer
	in ../include/stab.def, include them manually.

6 files changed, 34 insertions, 31 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 1717a3a..53d4163 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -86,6 +86,7 @@ opncls.c
 reloc.c
 section.c
 srec.c
+stab-syms.c
 sunos.c
 syms.c
 targets.c
@@ -115,7 +116,14 @@ echo Done in `pwd`.
 #
 #
 # $Log$
-# Revision 1.30  1991/11/21 01:56:17  gnu
+# Revision 1.31  1991/11/22 05:00:08  bothner
+# 	Moved bfd_stab_name() and bfd_stab_names[]
+# 	from syms.c to new file stab-syms.c.
+# 	Renamed to  aout_stab_name() and aout_stab_names[].
+# 	Also, since GNU extended type codes such as N_SETT are no longer
+# 	in ../include/stab.def, include them manually.
+#
+# Revision 1.30  1991/11/21  01:56:17  gnu
 # Avoid duplicate echo.
 #
 # Revision 1.29  1991/11/17  21:38:05  bothner
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5d20605..394dbdd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+Thu Nov 21 19:56:40 1991  Per Bothner  (bothner at cygnus.com)
+
+	* stab-syms.c, syms.c:  Moved bfd_stab_name() and bfd_stab_names[]
+	from syms.c to new file stab-syms.c.  Also, since GNU extended
+	type codes such as N_SETT are no longer in ../include/stab.def,
+	include them manually.
+	* stab-syms.c, aoutx.h: Renamed bfd_stab_name() and
+	bfd_stab_names[] to aout_stab_name() and aout_stab_names[].
+	* libaout.h: Added prototype for aout_stab_name().
+	* Makefile.in:  Update Makefile for new stab-syms.[co].
+
 Thu Nov 21 11:50:49 1991  John Gilmore  (gnu at cygnus.com)
 
 	* libaout.h (WORK_OUT_FILE_POSITIONS):  One more try at this
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 4879897..e63b7c5 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -23,7 +23,7 @@
 srcdir = .
 ddestdir = /usr/local
 libdir = $(ddestdir)/lib
-docdir = $(srcdir)/doc
+docdir = $(srcdir)$(subdir)/doc
 includedir= $(ddestdir)/include
 RANLIB = ranlib
 AR = ar
@@ -38,6 +38,10 @@ SUBDIRS = doc
 #### host and target dependent Makefile fragments come in here.
 ###
 
+# Change this (to MINIMIZE=1) to save space in executables.
+# Currently, all this does is control the target_vector in targets.c.
+MINIMIZE=0
+
 TARGETLIB = libbfd.a
 CFLAGS = $(MINUS_G) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) # -DINTEL960VERSION
 
@@ -48,7 +52,7 @@ BFD_LIBS = libbfd.o opncls.o bfd.o archive.o targets.o cache.o \
 BFD_MACHINES = cpu-h8300.o cpu-i960.o cpu-sparc.o cpu-m68k.o cpu-m88k.o \
 	cpu-vax.o cpu-mips.o cpu-a29k.o cpu-i386.o cpu-rs6000.o
 
-BFD_BACKENDS = oasys.o ieee.o srec.o elf.o \
+BFD_BACKENDS = oasys.o ieee.o srec.o elf.o stab-syms.o\
 	aout64.o aout32.o demo64.o sunos.o newsos3.o i386aout.o bout.o \
 	coff-i960.o coff-a29k.o coff-m68k.o coff-i386.o coff-m88k.o \
 	coff-mips.o coff-rs6000.o
@@ -61,7 +65,7 @@ BFD_H=$(INCDIR)/bfd.h
 CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c archures.c \
 	 coff-i386.c aout64.c aout32.c sunos.c demo64.c coff-i960.c srec.c \
 	 oasys.c ieee.c coff-m68k.c coff-a29k.c coff-rs6000.c \
-	 format.c section.c core.c syms.c reloc.c init.c ctor.c \
+	 format.c section.c core.c syms.c stabs-syms.c reloc.c init.c ctor.c \
 	 coff-m88k.c coff-mips.c trad-core.c newsos3.c i386aout.c bout.c elf.c \
 	cpu-h8300.c cpu-i960.c cpu-sparc.c cpu-m68k.c cpu-m88k.c \
  	cpu-vax.c cpu-mips.c cpu-a29k.c cpu-i386.c cpu-rs6000.c 
@@ -87,7 +91,7 @@ $(TARGETLIB): $(OFILES)
 
 # When compiling targets.c, supply the default target info from configure.
 targets.o: targets.c
-	$(CC) $(CFLAGS) -c $(TDEFAULTS) $<
+	$(CC) $(CFLAGS) -c -DMINIMIZE=$(MINIMIZE) $(TDEFAULTS) $<
 
 subdir_do: force
 	for i in $(DODIRS); do \
@@ -308,6 +312,7 @@ core.o : core.c $(INCDIR)/bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
 syms.o : syms.c $(INCDIR)/bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
+syms.o : stab-syms.c
 reloc.o : reloc.c $(INCDIR)/bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
 coff-m88k.o : coff-m88k.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 9e5886e..89b989a 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -1631,7 +1631,7 @@ DEFUN(NAME(aout,print_symbol),(ignore_abfd, afile, symbol, how),
       if (section_code == '?')
 	{
 	  int type_code = aout_symbol(symbol)->type  & 0xff;
-	  char *stab_name = bfd_stab_name(type_code);
+	  char *stab_name = aout_stab_name(type_code);
 	  char buf[10];
 	  if (stab_name == NULL)
 	    {
diff --git a/bfd/libaout.h b/bfd/libaout.h
index 57d50ed..01eb50e 100644
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -216,6 +216,10 @@ PROTO (void,	NAME(aout,swap_exec_header_in), (bfd *abfd,
 PROTO (void,	NAME(aout,swap_exec_header_out),(bfd *abfd, struct internal_exec *execp,
 			 struct external_exec *raw_bytes));
 
+/* Prototypes for functions in stab-syms.c. */
+
+PROTO(char *, aout_stab_name, (int code));
+
 /* A.out uses the generic versions of these routines... */
 
 #define	aout_32_get_section_contents	bfd_generic_get_section_contents
diff --git a/bfd/syms.c b/bfd/syms.c
index 30effa2..f791c06 100644
--- a/bfd/syms.c
+++ b/bfd/syms.c
@@ -418,28 +418,3 @@ asymbol *symbol)
  
   return '?';
 }
-
-/* Create a table of debugging stab-codes and corresponding names.  */
-
-#define __define_stab(NAME, CODE, STRING) {NAME, STRING},
-struct {enum __stab_debug_code code; char *string;} bfd_stab_names[]
-  = {
-#include "stab.def"
-    };
-#undef __define_stab
-
-/*proto* bfd_stab_name
-Returns a string for the stab with the given code, or NULL if not found.
-
-*; PROTO(char *, bfd_stab_name, (int code));
-*/
-char *
-DEFUN(bfd_stab_name,(code),
-int code)
-{
-  register int i;
-  for (i = sizeof(bfd_stab_names) / sizeof(bfd_stab_names[0]) - 1; i >= 0; i--)
-    if (bfd_stab_names[i].code == (enum __stab_debug_code) code)
-      return bfd_stab_names[i].string;
-  return NULL;
-}