Updated to point to where the header files are now

4 files changed, 22 insertions, 71 deletions

diff --git a/binutils/am29k-pinsn.c b/binutils/am29k-pinsn.c
index 431fe5e..ae626c3 100644
--- a/binutils/am29k-pinsn.c
+++ b/binutils/am29k-pinsn.c
@@ -23,11 +23,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifdef GDB
 # include "defs.h"
 # include "target.h"
-# include "am29k-opcode.h"
+# include "opcode/a29k.h"
 #else
 # include "bfd.h"
 # include "sysdep.h"
-# include "a29k-opcode.h"
+# include "opcode/a29k.h"
 # define am29k_opcodes a29k_opcodes
 # define am29k_opcode a29k_opcode
 # define NUM_OPCODES num_opcodes
diff --git a/binutils/m68k-pinsn.c b/binutils/m68k-pinsn.c
index 139a663..60fa9c2 100644
--- a/binutils/m68k-pinsn.c
+++ b/binutils/m68k-pinsn.c
@@ -20,17 +20,20 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* $Id$
    $Log$
-   Revision 1.5  1991/11/03 22:58:44  bothner
-   	* Makefile.in ($(DIST_NAME).tar.Z), TODO:  Various fixes.
-   	* ar.c (get_pos_bfd): Fix to handling of before/after
-   	positioning options.
-   	* bucomm.c (fatal):  MISSING_VFPRINTF is no longer an issue,
-   	since libiberty contains vfprintf etc if otherwise missing.
-   	* m68k-pinsn.c (print_insn_arg):  Support BB/BW/BL
-   	type operands, as used by branch instructions.
-   	* nm.c:  Delegate printing of symbols to BFD,
-   	by using bfd_print_symbol to do the formatting.
-
+   Revision 1.6  1991/12/01 02:58:34  sac
+   Updated to point to where the header files are now
+
+ * Revision 1.5  1991/11/03  22:58:44  bothner
+ * 	* Makefile.in ($(DIST_NAME).tar.Z), TODO:  Various fixes.
+ * 	* ar.c (get_pos_bfd): Fix to handling of before/after
+ * 	positioning options.
+ * 	* bucomm.c (fatal):  MISSING_VFPRINTF is no longer an issue,
+ * 	since libiberty contains vfprintf etc if otherwise missing.
+ * 	* m68k-pinsn.c (print_insn_arg):  Support BB/BW/BL
+ * 	type operands, as used by branch instructions.
+ * 	* nm.c:  Delegate printing of symbols to BFD,
+ * 	by using bfd_print_symbol to do the formatting.
+ *
  * Revision 1.4  1991/10/16  18:56:56  bothner
  * 	* Makefile.in, ar.c, bucomm.c, copy.c, cplus-dem.c, filemode.c,
  * 	i960-pinsn.c, m68k-pinsn.c, nm.c, objdump.c, size.c, sparc-pinsn.c,
@@ -80,7 +83,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include <stdio.h>
-#include "m68k-opcode.h"
+#include "opcode/m68k.h"
 
 extern int fputs();
 extern void print_address();
diff --git a/binutils/nm.c b/binutils/nm.c
index 2fa1d7e..f0636c3 100644
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include "getopt.h"
-#include "stab.gnu.h"
+#include "aout/stab_gnu.h"
 #include <ranlib.h>
 
 
@@ -329,50 +329,6 @@ filter_symbols (abfd, syms, symcount)
   return dst_count;
 }
 
-
-/* Return a lower-case character corresponding to the symbol class of sym */
-char
-decode_symclass (sym)
-     asymbol *sym;
-{
-  flagword flags = sym->flags;
-  
-  if ((sym->value == 0) && (sym->section != NULL))
-    /* Huh?  All section names don't begin with "." */
-    return (sym->section->name)[1];
-
-  if (flags & BSF_FORT_COMM) return 'C';
-  if (flags & BSF_UNDEFINED) return 'U';
-  if (flags & BSF_ABSOLUTE)  return 'a';
-
- 
-   if ( (flags & BSF_GLOBAL) || (flags & BSF_LOCAL) ){
-     if (sym->section == (asection *)NULL) {
-       return '*';
-     }
-     else if ( !strcmp(sym->section->name, ".text") ){
-       return 't';
-     } else if ( !strcmp(sym->section->name, ".data") ){
-       return 'd';
-     } else if ( !strcmp(sym->section->name, ".bss") ){
-       return 'b';
-     } else {
-       return 'o';
-     }
-    }
-
-  /* We don't have to handle these cases just yet, but we will soon:
-     N_SETV: 'v'; 
-     N_SETA: 'l'; 
-     N_SETT: 'x';
-     N_SETD: 'z';
-     N_SETB: 's';
-     N_INDR: 'i';
-     */
- 
-  return '?';
-}
-
 static void
 print_symbols (abfd, syms, symcount)
      bfd *abfd;
@@ -392,17 +348,9 @@ print_symbols (abfd, syms, symcount)
     else {
       asymbol *p = *sym;
       if (p) {
-      class = decode_symclass (p);
-
-      if (p->flags & BSF_GLOBAL)
-	class = toupper (class);
-      
-      if (p->value || ((p->flags & BSF_UNDEFINED) !=  BSF_UNDEFINED)) 
-	printf_vma( (p->section ? p->value + p->section->vma : p->value));
-      else fputs ("        ", stdout);
-
-      printf (" %c %s\n", class, p->name ? p->name : "");
-    }
+	bfd_print_symbol(abfd, stdout, p, bfd_print_symbol_nm);
+	putchar('\n');
+      }
     }
   }
 }
diff --git a/binutils/sparc-pinsn.c b/binutils/sparc-pinsn.c
index 554bdda..68d057c 100644
--- a/binutils/sparc-pinsn.c
+++ b/binutils/sparc-pinsn.c
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include <stdio.h>
-#include "sparc-opcode.h"
+#include "opcode/sparc.h"
 
 extern int fputs();
 extern int print_address();