Update check for invalid values in pe_bfd_read_buildid function.

[deliverable/binutils-gdb.git] / bfd / i386linux.c

diff --git a/bfd/i386linux.c b/bfd/i386linux.c
index 65ae5c9c6df82c714192c0a2649a1040b5ef9e05..4b7f486c08a0d0f9625144c3c34fd89bb4a24de7 100644 (file)
--- a/bfd/i386linux.c
+++ b/bfd/i386linux.c
@@ -1,7 +1,5 @@
 /* BFD back-end for linux flavored i386 a.out binaries.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 1992-2017 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -40,7 +38,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386linux_,OP)
+#define MY(OP) CONCAT2 (i386_aout_linux_,OP)
 #define TARGETNAME "a.out-i386-linux"
 
 extern const bfd_target MY(vec);
@@ -72,11 +70,11 @@ i386linux_write_object_contents (bfd *abfd)
   struct external_exec exec_bytes;
   struct internal_exec *execp = exec_hdr (abfd);
 
-  N_SET_MACHTYPE (*execp, M_386);
+  N_SET_MACHTYPE (execp, M_386);
 
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
 
-  WRITE_HEADERS(abfd, execp);
+  WRITE_HEADERS (abfd, execp);
 
   return TRUE;
 }
@@ -320,7 +318,7 @@ linux_add_one_symbol (struct bfd_link_info *info,
 
   insert = FALSE;
 
-  if (! info->relocatable
+  if (! bfd_link_relocatable (info)
       && linux_hash_table (info)->dynobj == NULL
       && strcmp (name, SHARABLE_CONFLICTS) == 0
       && (flags & BSF_CONSTRUCTOR) != 0
@@ -415,14 +413,14 @@ linux_tally_symbols (struct linux_link_hash_entry *h, void * data)
        alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
 
       if (p == NULL || alloc == NULL)
-       (*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
-                              name);
+       _bfd_error_handler (_("Output file requires shared library `%s'\n"),
+                           name);
       else
        {
          strcpy (alloc, name);
          p = strrchr (alloc, '_');
          *p++ = '\0';
-         (*_bfd_error_handler)
+         _bfd_error_handler
            (_("Output file requires shared library `%s.so.%s'\n"),
             alloc, p);
          free (alloc);
@@ -609,7 +607,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
       if (f->h->root.root.type != bfd_link_hash_defined
          && f->h->root.root.type != bfd_link_hash_defweak)
        {
-         (*_bfd_error_handler)
+         _bfd_error_handler
            (_("Symbol %s not defined for fixups\n"),
             f->h->root.root.root.string);
          continue;
@@ -659,7 +657,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
          if (f->h->root.root.type != bfd_link_hash_defined
              && f->h->root.root.type != bfd_link_hash_defweak)
            {
-             (*_bfd_error_handler)
+             _bfd_error_handler
                (_("Symbol %s not defined for fixups\n"),
                 f->h->root.root.root.string);
              continue;
@@ -684,7 +682,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
 
   if (linux_hash_table (info)->fixup_count != fixups_written)
     {
-      (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
+      _bfd_error_handler (_("Warning: fixup count mismatch\n"));
       while (linux_hash_table (info)->fixup_count > fixups_written)
        {
          bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);