gdb: Remove hard-coded line number from test

[external/binutils.git] / binutils / nlmconv.c

diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c
index 8c4975d..7e1eaac 100644 (file)
--- a/binutils/nlmconv.c
+++ b/binutils/nlmconv.c
@@ -1,5 +1,5 @@
 /* nlmconv.c -- NLM conversion program
-   Copyright (C) 1993-2015 Free Software Foundation, Inc.
+   Copyright (C) 1993-2017 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -211,6 +211,7 @@ main (int argc, char **argv)
 
   program_name = argv[0];
   xmalloc_set_program_name (program_name);
+  bfd_set_error_program_name (program_name);
 
   expandargv (&argc, &argv);
 
@@ -1057,7 +1058,7 @@ main (int argc, char **argv)
   {
     const int    max_len  = NLM_MODULE_NAME_SIZE - 2;
     const char * filename = lbasename (output_file);
-    
+
     len = strlen (filename);
     if (len > max_len)
       len = max_len;
@@ -1223,7 +1224,7 @@ copy_sections (bfd *inbfd, asection *insec, void *data_ptr)
   const char *inname;
   asection *outsec;
   bfd_size_type size;
-  void *contents;
+  bfd_byte *contents;
   long reloc_size;
   bfd_byte buf[4];
   bfd_size_type add;
@@ -1239,9 +1240,7 @@ copy_sections (bfd *inbfd, asection *insec, void *data_ptr)
     contents = NULL;
   else
     {
-      contents = xmalloc (size);
-      if (! bfd_get_section_contents (inbfd, insec, contents,
-                                     (file_ptr) 0, size))
+      if (!bfd_malloc_and_get_section (inbfd, insec, &contents))
        bfd_fatal (bfd_get_filename (inbfd));
     }
 
@@ -1936,10 +1935,11 @@ powerpc_mangle_relocs (bfd *outbfd, asection *insec,
 
              if (rel->address > contents_size - 4)
                {
-                 non_fatal (_("Out of range relocation: %lx"), rel->address);
+                 non_fatal (_("Out of range relocation: %lx"),
+                            (long) rel->address);
                  break;
                }
-             
+
              assert (rel->howto->size == 2 && rel->howto->pcrel_offset);
              val = bfd_get_32 (outbfd, (bfd_byte *) contents + rel->address);
              val = ((val &~ rel->howto->dst_mask)
@@ -1991,10 +1991,11 @@ powerpc_mangle_relocs (bfd *outbfd, asection *insec,
            case 1:
              if (rel->address > contents_size - 2)
                {
-                 non_fatal (_("Out of range relocation: %lx"), rel->address);
+                 non_fatal (_("Out of range relocation: %lx"),
+                            (long) rel->address);
                  break;
                }
-                      
+
              val = bfd_get_16 (outbfd,
                                (bfd_byte *) contents + rel->address);
              val = ((val &~ rel->howto->dst_mask)
@@ -2013,10 +2014,11 @@ powerpc_mangle_relocs (bfd *outbfd, asection *insec,
              /* PR 17512: file: 0455a112.  */
              if (rel->address > contents_size - 4)
                {
-                 non_fatal (_("Out of range relocation: %lx"), rel->address);
+                 non_fatal (_("Out of range relocation: %lx"),
+                            (long) rel->address);
                  break;
                }
-                      
+
              val = bfd_get_32 (outbfd,
                                (bfd_byte *) contents + rel->address);
              val = ((val &~ rel->howto->dst_mask)
@@ -2078,7 +2080,7 @@ link_inputs (struct string_list *inputs, char *ld, char * mfile)
   for (q = inputs; q != NULL; q = q->next)
     ++c;
 
-  argv = (char **) alloca ((c + 7) * sizeof (char *));
+  argv = (char **) xmalloc ((c + 7) * sizeof (char *));
 
 #ifndef __MSDOS__
   if (ld == NULL)
@@ -2136,6 +2138,8 @@ link_inputs (struct string_list *inputs, char *ld, char * mfile)
 
   pid = pexecute (ld, argv, program_name, (char *) NULL, &errfmt, &errarg,
                  PEXECUTE_SEARCH | PEXECUTE_ONE);
+  free (argv);
+
   if (pid == -1)
     {
       fprintf (stderr, _("%s: execution of %s failed: "), program_name, ld);