Remove IRIX 5 <sys/proc.h> _KMEMUSER workaround

[deliverable/binutils-gdb.git] / binutils / nm.c

diff --git a/binutils/nm.c b/binutils/nm.c
index 5ca4d34ee3843c8d5e3575dcd180f7a744490c71..6d887485cba2c754ec82b8b97039c948fa11de34 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -36,6 +36,7 @@
 #include "coff/internal.h"
 #include "libcoff.h"
 #include "bucomm.h"
+#include "plugin-api.h"
 #include "plugin.h"
 
 /* When sorting by size, we use this structure to hold the size and a
@@ -230,7 +231,7 @@ static struct option long_options[] =
 \f
 /* Some error-reporting functions.  */
 
-static void
+ATTRIBUTE_NORETURN static void
 usage (FILE *stream, int status)
 {
   fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
@@ -341,7 +342,8 @@ set_output_format (char *f)
 static const char *
 get_elf_symbol_type (unsigned int type)
 {
-  static char buff [32];
+  static char *bufp;
+  int n;
 
   switch (type)
     {
@@ -352,21 +354,25 @@ get_elf_symbol_type (unsigned int type)
     case STT_FILE:     return "FILE";
     case STT_COMMON:   return "COMMON";
     case STT_TLS:      return "TLS";
-    default:
-      if (type >= STT_LOPROC && type <= STT_HIPROC)
-       sprintf (buff, _("<processor specific>: %d"), type);
-      else if (type >= STT_LOOS && type <= STT_HIOS)
-       sprintf (buff, _("<OS specific>: %d"), type);
-      else
-       sprintf (buff, _("<unknown>: %d"), type);
-      return buff;
     }
+
+  free (bufp);
+  if (type >= STT_LOPROC && type <= STT_HIPROC)
+    n = asprintf (&bufp, _("<processor specific>: %d"), type);
+  else if (type >= STT_LOOS && type <= STT_HIOS)
+    n = asprintf (&bufp, _("<OS specific>: %d"), type);
+  else
+    n = asprintf (&bufp, _("<unknown>: %d"), type);
+  if (n < 0)
+    fatal ("%s", xstrerror (errno));
+  return bufp;
 }
 
 static const char *
 get_coff_symbol_type (const struct internal_syment *sym)
 {
-  static char buff [32];
+  static char *bufp;
+  int n;
 
   switch (sym->n_sclass)
     {
@@ -377,16 +383,19 @@ get_coff_symbol_type (const struct internal_syment *sym)
 
   if (!sym->n_type)
     return "None";
-    
+
   switch (DTYPE(sym->n_type))
     {
     case DT_FCN: return "Function";
     case DT_PTR: return "Pointer";
     case DT_ARY: return "Array";
     }
-  
-  sprintf (buff, _("<unknown>: %d/%d"), sym->n_sclass, sym->n_type);
-  return buff;
+
+  free (bufp);
+  n = asprintf (&bufp, _("<unknown>: %d/%d"), sym->n_sclass, sym->n_type);
+  if (n < 0)
+    fatal ("%s", xstrerror (errno));
+  return bufp;
 }
 \f
 /* Print symbol name NAME, read from ABFD, with printf format FORM,
@@ -843,8 +852,7 @@ static void
 print_symbol (bfd *        abfd,
              asymbol *    sym,
              bfd_vma      ssize,
-             bfd *        archive_bfd,
-             bfd_boolean  is_synthetic)
+             bfd *        archive_bfd)
 {
   symbol_info syminfo;
   struct extended_symbol_info info;
@@ -858,7 +866,7 @@ print_symbol (bfd *        abfd,
   info.sinfo = &syminfo;
   info.ssize = ssize;
   /* Synthetic symbols do not have a full symbol type set of data available.  */
-  if (is_synthetic)
+  if ((sym->flags & BSF_SYNTHETIC) != 0)
     {
       info.elfinfo = NULL;
       info.coffinfo = NULL;
@@ -992,13 +1000,11 @@ print_size_symbols (bfd *              abfd,
                    bfd_boolean        is_dynamic,
                    struct size_sym *  symsizes,
                    long               symcount,
-                   long               synth_count,
                    bfd *              archive_bfd)
 {
   asymbol *store;
   struct size_sym *from;
   struct size_sym *fromend;
-  struct size_sym *fromsynth;
 
   store = bfd_make_empty_symbol (abfd);
   if (store == NULL)
@@ -1006,7 +1012,6 @@ print_size_symbols (bfd *              abfd,
 
   from = symsizes;
   fromend = from + symcount;
-  fromsynth = symsizes + (symcount - synth_count);
 
   for (; from < fromend; from++)
     {
@@ -1016,7 +1021,7 @@ print_size_symbols (bfd *              abfd,
       if (sym == NULL)
        bfd_fatal (bfd_get_filename (abfd));
 
-      print_symbol (abfd, sym, from->size, archive_bfd, from >= fromsynth);
+      print_symbol (abfd, sym, from->size, archive_bfd);
     }
 }
 
@@ -1025,9 +1030,7 @@ print_size_symbols (bfd *              abfd,
 
    If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD.
 
-   SYMCOUNT is the number of symbols in MINISYMS and SYNTH_COUNT
-   is the number of these that are synthetic.  Synthetic symbols,
-   if any are present, always come at the end of the MINISYMS.
+   SYMCOUNT is the number of symbols in MINISYMS.
 
    SIZE is the size of a symbol in MINISYMS.  */
 
@@ -1036,14 +1039,12 @@ print_symbols (bfd *         abfd,
               bfd_boolean   is_dynamic,
               void *        minisyms,
               long          symcount,
-              long          synth_count,
               unsigned int  size,
               bfd *         archive_bfd)
 {
   asymbol *store;
   bfd_byte *from;
   bfd_byte *fromend;
-  bfd_byte *fromsynth;
 
   store = bfd_make_empty_symbol (abfd);
   if (store == NULL)
@@ -1051,7 +1052,6 @@ print_symbols (bfd *         abfd,
 
   from = (bfd_byte *) minisyms;
   fromend = from + symcount * size;
-  fromsynth = (bfd_byte *) minisyms + ((symcount - synth_count) * size);
 
   for (; from < fromend; from += size)
     {
@@ -1061,7 +1061,7 @@ print_symbols (bfd *         abfd,
       if (sym == NULL)
        bfd_fatal (bfd_get_filename (abfd));
 
-      print_symbol (abfd, sym, (bfd_vma) 0, archive_bfd, from >= fromsynth);
+      print_symbol (abfd, sym, (bfd_vma) 0, archive_bfd);
     }
 }
 
@@ -1071,7 +1071,6 @@ static void
 display_rel_file (bfd *abfd, bfd *archive_bfd)
 {
   long symcount;
-  long synth_count = 0;
   void *minisyms;
   unsigned int size;
   struct size_sym *symsizes;
@@ -1110,6 +1109,7 @@ display_rel_file (bfd *abfd, bfd *archive_bfd)
       asymbol **dyn_syms = NULL;
       long static_count = 0;
       long dyn_count = 0;
+      long synth_count;
 
       if (dynamic)
        {
@@ -1177,9 +1177,9 @@ display_rel_file (bfd *abfd, bfd *archive_bfd)
     }
 
   if (! sort_by_size)
-    print_symbols (abfd, dynamic, minisyms, symcount, synth_count, size, archive_bfd);
+    print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd);
   else
-    print_size_symbols (abfd, dynamic, symsizes, symcount, synth_count, archive_bfd);
+    print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd);
 
   free (minisyms);
   free (symsizes);