* stab-syms.c (stdio.h): Include prior to libaout.h, which

	includes bfdlink.h, which now uses FILE.

2 files changed, 45 insertions, 23 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 48b795d..edf6e33 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul  1 12:10:42 1995  Fred Fish  <fnf@cygnus.com>
+
+	* stab-syms.c (stdio.h):  Include prior to libaout.h, which
+	includes bfdlink.h, which now uses FILE.
+
 Sat Jul  1 00:11:08 1995  Ken Raeburn  <raeburn@cygnus.com>
 
 	* elfxx-target.h: New file.
@@ -14,7 +19,7 @@ Fri Jun 30 16:07:18 1995  Steve Chamberlain  <sac@slash.cygnus.com>
 	* cofflink.c (_bfd_coff_generic_relocate_section): Compare
 	the full text of .reloc or .edata section names.
 
-Fri Jun 30 15:47:37 1995  Fred Fish  <fnf@deneb.cygnus.com>
+Fri Jun 30 15:47:37 1995  Fred Fish  <fnf@cygnus.com>
 
 	* cofflink.c (_bfd_coff_generic_relocate_section):
 	Remove extra '+'.
diff --git a/bfd/stab-syms.c b/bfd/stab-syms.c
index 209c8a4..b227af6 100644
--- a/bfd/stab-syms.c
+++ b/bfd/stab-syms.c
@@ -1,5 +1,5 @@
 /* Table of stab names for the BFD library.
-   Copyright (C) 1990-1991 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -20,40 +20,57 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "bfd.h"
 
-#define ARCH_SIZE 32 /* Value doesn't matter. */
+#define ARCH_SIZE 32		/* Value doesn't matter. */
+#include <stdio.h>		/* Required by bfdlink.h, from libaout.h */
 #include "libaout.h"
-#include "aout64.h"
+#include "aout/aout64.h"
 
 /* Create a table of debugging stab-codes and corresponding names.  */
 
-#define __define_name(CODE, STRING) {(int)CODE, STRING},
 #define __define_stab(NAME, CODE, STRING) __define_name(CODE, STRING)
-struct {short code; char string[10];} aout_stab_names[]
-  = {
-#include "stab.def"
 
 /* These are not really stab symbols, but it is
    convenient to have them here for the sake of nm.
    For completeness, we could also add N_TEXT etc, but those
    are never needed, since nm treats those specially. */
-__define_name (N_SETA, "SETA")	/* Absolute set element symbol */
-__define_name (N_SETT, "SETT")	/* Text set element symbol */
-__define_name (N_SETD, "SETD")	/* Data set element symbol */
-__define_name (N_SETB, "SETB")	/* Bss set element symbol */
-__define_name (N_SETV, "SETV")  /* Pointer to set vector in data area. */
-__define_name (N_INDR, "INDR")
-__define_name (N_WARNING, "WARNING")
-    };
-#undef __define_stab
-#undef GNU_EXTRA_STABS
-
-char *
-DEFUN(aout_stab_name,(code),
-int code)
+#define EXTRA_SYMBOLS \
+  __define_name (N_SETA, "SETA")/* Absolute set element symbol */ \
+  __define_name (N_SETT, "SETT")/* Text set element symbol */ \
+  __define_name (N_SETD, "SETD")/* Data set element symbol */ \
+  __define_name (N_SETB, "SETB")/* Bss set element symbol */ \
+  __define_name (N_SETV, "SETV")/* Pointer to set vector in data area. */ \
+  __define_name (N_INDR, "INDR") \
+  __define_name (N_WARNING, "WARNING")
+
+CONST char *
+aout_stab_name (code)
+     int code;
 {
-  register int i = sizeof(aout_stab_names) / sizeof(aout_stab_names[0]);
+#if 0 /* This lookup table is slower than lots of explicit tests, at
+	 least on the i386.  One advantage is that the compiler can
+	 eliminate duplicates from the code, whereas they can't easily
+	 be eliminated from the lookup table.  */
+
+#define __define_name(CODE, STRING) {(int)CODE, STRING},
+  static const struct {
+    int code;
+    char string[7];
+  } aout_stab_names[] = {
+#include "aout/stab.def"
+    EXTRA_SYMBOLS
+  };
+  register int i = sizeof (aout_stab_names) / sizeof (aout_stab_names[0]);
   while (--i >= 0)
     if (aout_stab_names[i].code == code)
       return aout_stab_names[i].string;
+
+#else
+
+#define __define_name(val, str) if (val == code) return str ;
+#include "aout/stab.def"
+  EXTRA_SYMBOLS
+
+#endif
+
   return 0;
 }