Silence ARI for valid calls to abort

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

diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 7dada1cbf5315983873361a20086eedb9b335414..608d80cd40c766b9451d305f6c4b66793175d643 100644 (file)
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -1,14 +1,12 @@
 /* Assorted BFD support routines, only used internally.
 /* Assorted BFD support routines, only used internally.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2019 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,7 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 #include "sysdep.h"
 #include "bfd.h"
 
 #include "sysdep.h"
 #include "bfd.h"


@@ -41,21 +40,87 @@ DESCRIPTION
        completeness.
 */
 
        completeness.
 */
 

+bfd_boolean
+_bfd_bool_bfd_false (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+bfd_boolean
+_bfd_bool_bfd_asymbol_false (bfd *abfd ATTRIBUTE_UNUSED,
+                            asymbol *sym ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+

 /* A routine which is used in target vectors for unsupported
    operations.  */
 
 bfd_boolean
 /* A routine which is used in target vectors for unsupported
    operations.  */
 
 bfd_boolean

-bfd_false (bfd *ignore ATTRIBUTE_UNUSED)
+_bfd_bool_bfd_false_error (bfd *ignore ATTRIBUTE_UNUSED)

 {
   bfd_set_error (bfd_error_invalid_operation);
   return FALSE;
 }
 
 {
   bfd_set_error (bfd_error_invalid_operation);
   return FALSE;
 }
 

+bfd_boolean
+_bfd_bool_bfd_link_false_error (bfd *abfd,
+                               struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return _bfd_bool_bfd_false_error (abfd);
+}
+

 /* A routine which is used in target vectors for supported operations
    which do not actually do anything.  */
 
 bfd_boolean
 /* A routine which is used in target vectors for supported operations
    which do not actually do anything.  */
 
 bfd_boolean

-bfd_true (bfd *ignore ATTRIBUTE_UNUSED)
+_bfd_bool_bfd_true (bfd *ignore ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_bool_bfd_link_true (bfd *abfd ATTRIBUTE_UNUSED,
+                        struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_bool_bfd_bfd_true (bfd *ibfd ATTRIBUTE_UNUSED,
+                       bfd *obfd ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_bool_bfd_uint_true (bfd *abfd ATTRIBUTE_UNUSED,
+                        unsigned int flags ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_bool_bfd_asection_bfd_asection_true (bfd *ibfd ATTRIBUTE_UNUSED,
+                                         asection *isec ATTRIBUTE_UNUSED,
+                                         bfd *obfd ATTRIBUTE_UNUSED,
+                                         asection *osec ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_bool_bfd_asymbol_bfd_asymbol_true (bfd *ibfd ATTRIBUTE_UNUSED,
+                                       asymbol *isym ATTRIBUTE_UNUSED,
+                                       bfd *obfd ATTRIBUTE_UNUSED,
+                                       asymbol *osym ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_bool_bfd_ptr_true (bfd *abfd ATTRIBUTE_UNUSED,
+                       void *ptr ATTRIBUTE_UNUSED)

 {
   return TRUE;
 }
 {
   return TRUE;
 }


@@ -64,26 +129,26 @@ bfd_true (bfd *ignore ATTRIBUTE_UNUSED)
    operations which return a pointer value.  */
 
 void *
    operations which return a pointer value.  */
 
 void *

-bfd_nullvoidptr (bfd *ignore ATTRIBUTE_UNUSED)
+_bfd_ptr_bfd_null_error (bfd *ignore ATTRIBUTE_UNUSED)

 {
   bfd_set_error (bfd_error_invalid_operation);
   return NULL;
 }
 
 int
 {
   bfd_set_error (bfd_error_invalid_operation);
   return NULL;
 }
 
 int

-bfd_0 (bfd *ignore ATTRIBUTE_UNUSED)
+_bfd_int_bfd_0 (bfd *ignore ATTRIBUTE_UNUSED)

 {
   return 0;
 }
 
 unsigned int
 {
   return 0;
 }
 
 unsigned int

-bfd_0u (bfd *ignore ATTRIBUTE_UNUSED)
+_bfd_uint_bfd_0 (bfd *ignore ATTRIBUTE_UNUSED)

 {
    return 0;
 }
 
 long
 {
    return 0;
 }
 
 long

-bfd_0l (bfd *ignore ATTRIBUTE_UNUSED)
+_bfd_long_bfd_0 (bfd *ignore ATTRIBUTE_UNUSED)

 {
   return 0;
 }
 {
   return 0;
 }


@@ -92,14 +157,26 @@ bfd_0l (bfd *ignore ATTRIBUTE_UNUSED)
    operations which return -1 on error.  */
 
 long
    operations which return -1 on error.  */
 
 long

-_bfd_n1 (bfd *ignore_abfd ATTRIBUTE_UNUSED)
+_bfd_long_bfd_n1_error (bfd *ignore_abfd ATTRIBUTE_UNUSED)

 {
   bfd_set_error (bfd_error_invalid_operation);
   return -1;
 }
 
 void
 {
   bfd_set_error (bfd_error_invalid_operation);
   return -1;
 }
 
 void

-bfd_void (bfd *ignore ATTRIBUTE_UNUSED)
+_bfd_void_bfd (bfd *ignore ATTRIBUTE_UNUSED)
+{
+}
+
+void
+_bfd_void_bfd_link (bfd *abfd ATTRIBUTE_UNUSED,
+                   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+}
+
+void
+_bfd_void_bfd_asection (bfd *abfd ATTRIBUTE_UNUSED,
+                       asection *sec ATTRIBUTE_UNUSED)

 {
 }
 
 {
 }
 


@@ -120,6 +197,15 @@ _bfd_norelocs_canonicalize_reloc (bfd *abfd ATTRIBUTE_UNUSED,
   return 0;
 }
 
   return 0;
 }
 

+void
+_bfd_norelocs_set_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+                        asection *sec ATTRIBUTE_UNUSED,
+                        arelent **relptr ATTRIBUTE_UNUSED,
+                        unsigned int count ATTRIBUTE_UNUSED)
+{
+  /* Do nothing.  */
+}
+

 bfd_boolean
 _bfd_nocore_core_file_matches_executable_p
   (bfd *ignore_core_bfd ATTRIBUTE_UNUSED,
 bfd_boolean
 _bfd_nocore_core_file_matches_executable_p
   (bfd *ignore_core_bfd ATTRIBUTE_UNUSED,


@@ -149,6 +235,16 @@ _bfd_nocore_core_file_failing_signal (bfd *ignore_abfd ATTRIBUTE_UNUSED)
   return 0;
 }
 
   return 0;
 }
 

+/* Routine to handle the core_file_pid entry point for targets without
+   core file support.  */
+
+int
+_bfd_nocore_core_file_pid (bfd *ignore_abfd ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_invalid_operation);
+  return 0;
+}
+

 const bfd_target *
 _bfd_dummy_target (bfd *ignore_abfd ATTRIBUTE_UNUSED)
 {
 const bfd_target *
 _bfd_dummy_target (bfd *ignore_abfd ATTRIBUTE_UNUSED)
 {


@@ -158,19 +254,26 @@ _bfd_dummy_target (bfd *ignore_abfd ATTRIBUTE_UNUSED)
 \f
 /* Allocate memory using malloc.  */
 
 \f
 /* Allocate memory using malloc.  */
 

+#ifndef SSIZE_MAX
+#define SSIZE_MAX ((size_t) -1 >> 1)
+#endif
+

 void *
 bfd_malloc (bfd_size_type size)
 {
   void *ptr;
 void *
 bfd_malloc (bfd_size_type size)
 {
   void *ptr;

+  size_t sz = (size_t) size;

 
 

-  if (size != (size_t) size)
+  if (size != sz
+      /* This is to pacify memory checkers like valgrind.  */
+      || sz > SSIZE_MAX)

     {
       bfd_set_error (bfd_error_no_memory);
       return NULL;
     }
 
     {
       bfd_set_error (bfd_error_no_memory);
       return NULL;
     }
 

-  ptr = malloc ((size_t) size);
-  if (ptr == NULL && (size_t) size != 0)
+  ptr = malloc (sz);
+  if (ptr == NULL && sz != 0)

     bfd_set_error (bfd_error_no_memory);
 
   return ptr;
     bfd_set_error (bfd_error_no_memory);
 
   return ptr;


@@ -181,8 +284,6 @@ bfd_malloc (bfd_size_type size)
 void *
 bfd_malloc2 (bfd_size_type nmemb, bfd_size_type size)
 {
 void *
 bfd_malloc2 (bfd_size_type nmemb, bfd_size_type size)
 {

-  void *ptr;
-

   if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
       && size != 0
       && nmemb > ~(bfd_size_type) 0 / size)
   if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
       && size != 0
       && nmemb > ~(bfd_size_type) 0 / size)


@@ -191,19 +292,7 @@ bfd_malloc2 (bfd_size_type nmemb, bfd_size_type size)
       return NULL;
     }
 
       return NULL;
     }
 

-  size *= nmemb;
-
-  if (size != (size_t) size)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
-
-  ptr = malloc ((size_t) size);
-  if (ptr == NULL && (size_t) size != 0)
-    bfd_set_error (bfd_error_no_memory);
-
-  return ptr;
+  return bfd_malloc (size * nmemb);

 }
 
 /* Reallocate memory using realloc.  */
 }
 
 /* Reallocate memory using realloc.  */


@@ -212,19 +301,22 @@ void *
 bfd_realloc (void *ptr, bfd_size_type size)
 {
   void *ret;
 bfd_realloc (void *ptr, bfd_size_type size)
 {
   void *ret;

+  size_t sz = (size_t) size;
+
+  if (ptr == NULL)
+    return bfd_malloc (size);

 
 

-  if (size != (size_t) size)
+  if (size != sz
+      /* This is to pacify memory checkers like valgrind.  */
+      || sz > SSIZE_MAX)

     {
       bfd_set_error (bfd_error_no_memory);
       return NULL;
     }
 
     {
       bfd_set_error (bfd_error_no_memory);
       return NULL;
     }
 

-  if (ptr == NULL)
-    ret = malloc ((size_t) size);
-  else
-    ret = realloc (ptr, (size_t) size);
+  ret = realloc (ptr, sz);

 
 

-  if (ret == NULL && (size_t) size != 0)
+  if (ret == NULL && sz != 0)

     bfd_set_error (bfd_error_no_memory);
 
   return ret;
     bfd_set_error (bfd_error_no_memory);
 
   return ret;


@@ -235,8 +327,6 @@ bfd_realloc (void *ptr, bfd_size_type size)
 void *
 bfd_realloc2 (void *ptr, bfd_size_type nmemb, bfd_size_type size)
 {
 void *
 bfd_realloc2 (void *ptr, bfd_size_type nmemb, bfd_size_type size)
 {

-  void *ret;
-

   if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
       && size != 0
       && nmemb > ~(bfd_size_type) 0 / size)
   if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
       && size != 0
       && nmemb > ~(bfd_size_type) 0 / size)


@@ -245,21 +335,19 @@ bfd_realloc2 (void *ptr, bfd_size_type nmemb, bfd_size_type size)
       return NULL;
     }
 
       return NULL;
     }
 

-  size *= nmemb;
+  return bfd_realloc (ptr, size * nmemb);
+}

 
 

-  if (size != (size_t) size)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
+/* Reallocate memory using realloc.
+   If this fails the pointer is freed before returning.  */

 
 

-  if (ptr == NULL)
-    ret = malloc ((size_t) size);
-  else
-    ret = realloc (ptr, (size_t) size);
+void *
+bfd_realloc_or_free (void *ptr, bfd_size_type size)
+{
+  void *ret = bfd_realloc (ptr, size);

 
 

-  if (ret == NULL && (size_t) size != 0)
-    bfd_set_error (bfd_error_no_memory);
+  if (ret == NULL && ptr != NULL)
+    free (ptr);

 
   return ret;
 }
 
   return ret;
 }


@@ -269,23 +357,10 @@ bfd_realloc2 (void *ptr, bfd_size_type nmemb, bfd_size_type size)
 void *
 bfd_zmalloc (bfd_size_type size)
 {
 void *
 bfd_zmalloc (bfd_size_type size)
 {

-  void *ptr;
-
-  if (size != (size_t) size)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
+  void *ptr = bfd_malloc (size);

 
 

-  ptr = malloc ((size_t) size);
-
-  if ((size_t) size != 0)
-    {
-      if (ptr == NULL)
-       bfd_set_error (bfd_error_no_memory);
-      else
-       memset (ptr, 0, (size_t) size);
-    }
+  if (ptr != NULL && size > 0)
+    memset (ptr, 0, (size_t) size);

 
   return ptr;
 }
 
   return ptr;
 }


@@ -296,32 +371,14 @@ bfd_zmalloc (bfd_size_type size)
 void *
 bfd_zmalloc2 (bfd_size_type nmemb, bfd_size_type size)
 {
 void *
 bfd_zmalloc2 (bfd_size_type nmemb, bfd_size_type size)
 {

-  void *ptr;
+  void *ptr = bfd_malloc2 (nmemb, size);

 
 

-  if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
-      && size != 0
-      && nmemb > ~(bfd_size_type) 0 / size)
+  if (ptr != NULL)

     {
     {

-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
+      size_t sz = nmemb * size;

 
 

-  size *= nmemb;
-
-  if (size != (size_t) size)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
-
-  ptr = malloc ((size_t) size);
-
-  if ((size_t) size != 0)
-    {
-      if (ptr == NULL)
-       bfd_set_error (bfd_error_no_memory);
-      else
-       memset (ptr, 0, (size_t) size);
+      if (sz > 0)
+       memset (ptr, 0, sz);

     }
 
   return ptr;
     }
 
   return ptr;


@@ -357,8 +414,8 @@ bfd_write_bigendian_4byte_int (bfd *abfd, unsigned int i)
 
 /* FIXME: Should these take a count argument?
    Answer (gnu@cygnus.com):  No, but perhaps they should be inline
 
 /* FIXME: Should these take a count argument?
    Answer (gnu@cygnus.com):  No, but perhaps they should be inline

-                             functions in swap.h #ifdef __GNUC__.
-                             Gprof them later and find out.  */
+                            functions in swap.h #ifdef __GNUC__.
+                            Gprof them later and find out.  */

 
 /*
 FUNCTION
 
 /*
 FUNCTION


@@ -392,9 +449,9 @@ DESCRIPTION
 .#define bfd_put_signed_8 \
 .  bfd_put_8
 .#define bfd_get_8(abfd, ptr) \
 .#define bfd_put_signed_8 \
 .  bfd_put_8
 .#define bfd_get_8(abfd, ptr) \

-.  (*(unsigned char *) (ptr) & 0xff)
+.  ((bfd_vma) *(const unsigned char *) (ptr) & 0xff)

 .#define bfd_get_signed_8(abfd, ptr) \
 .#define bfd_get_signed_8(abfd, ptr) \

-.  (((*(unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80)
+.  ((((bfd_signed_vma) *(const unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80)

 .
 .#define bfd_put_16(abfd, val, ptr) \
 .  BFD_SEND (abfd, bfd_putx16, ((val),(ptr)))
 .
 .#define bfd_put_16(abfd, val, ptr) \
 .  BFD_SEND (abfd, bfd_putx16, ((val),(ptr)))


@@ -405,6 +462,20 @@ DESCRIPTION
 .#define bfd_get_signed_16(abfd, ptr) \
 .  BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
 .
 .#define bfd_get_signed_16(abfd, ptr) \
 .  BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
 .

+.#define bfd_put_24(abfd, val, ptr) \
+.  do                                  \
+.    if (bfd_big_endian (abfd))                \
+.      bfd_putb24 ((val), (ptr));      \
+.    else                              \
+.      bfd_putl24 ((val), (ptr));      \
+.  while (0)
+.
+.bfd_vma bfd_getb24 (const void *p);
+.bfd_vma bfd_getl24 (const void *p);
+.
+.#define bfd_get_24(abfd, ptr) \
+.  (bfd_big_endian (abfd) ? bfd_getb24 (ptr) : bfd_getl24 (ptr))
+.

 .#define bfd_put_32(abfd, val, ptr) \
 .  BFD_SEND (abfd, bfd_putx32, ((val),(ptr)))
 .#define bfd_put_signed_32 \
 .#define bfd_put_32(abfd, val, ptr) \
 .  BFD_SEND (abfd, bfd_putx32, ((val),(ptr)))
 .#define bfd_put_signed_32 \


@@ -424,7 +495,7 @@ DESCRIPTION
 .  BFD_SEND (abfd, bfd_getx_signed_64, (ptr))
 .
 .#define bfd_get(bits, abfd, ptr)                      \
 .  BFD_SEND (abfd, bfd_getx_signed_64, (ptr))
 .
 .#define bfd_get(bits, abfd, ptr)                      \

-.  ((bits) == 8 ? (bfd_vma) bfd_get_8 (abfd, ptr)      \
+.  ((bits) == 8 ? bfd_get_8 (abfd, ptr)                        \

 .   : (bits) == 16 ? bfd_get_16 (abfd, ptr)            \
 .   : (bits) == 32 ? bfd_get_32 (abfd, ptr)            \
 .   : (bits) == 64 ? bfd_get_64 (abfd, ptr)            \
 .   : (bits) == 16 ? bfd_get_16 (abfd, ptr)            \
 .   : (bits) == 32 ? bfd_get_32 (abfd, ptr)            \
 .   : (bits) == 64 ? bfd_get_64 (abfd, ptr)            \


@@ -432,9 +503,9 @@ DESCRIPTION
 .
 .#define bfd_put(bits, abfd, val, ptr)                 \
 .  ((bits) == 8 ? bfd_put_8  (abfd, val, ptr)          \
 .
 .#define bfd_put(bits, abfd, val, ptr)                 \
 .  ((bits) == 8 ? bfd_put_8  (abfd, val, ptr)          \

-.   : (bits) == 16 ? bfd_put_16 (abfd, val, ptr)               \
-.   : (bits) == 32 ? bfd_put_32 (abfd, val, ptr)               \
-.   : (bits) == 64 ? bfd_put_64 (abfd, val, ptr)               \
+.   : (bits) == 16 ? bfd_put_16 (abfd, val, ptr)       \
+.   : (bits) == 32 ? bfd_put_32 (abfd, val, ptr)       \
+.   : (bits) == 64 ? bfd_put_64 (abfd, val, ptr)       \

 .   : (abort (), (void) 0))
 .
 */
 .   : (abort (), (void) 0))
 .
 */


@@ -511,44 +582,43 @@ DESCRIPTION
 .*/
 
 /* Sign extension to bfd_signed_vma.  */
 .*/
 
 /* Sign extension to bfd_signed_vma.  */

-#define COERCE16(x) (((bfd_signed_vma) (x) ^ 0x8000) - 0x8000)
-#define COERCE32(x) (((bfd_signed_vma) (x) ^ 0x80000000) - 0x80000000)
-#define EIGHT_GAZILLION ((bfd_int64_t) 1 << 63)
+#define COERCE16(x) (((bfd_vma) (x) ^ 0x8000) - 0x8000)
+#define COERCE32(x) (((bfd_vma) (x) ^ 0x80000000) - 0x80000000)

 #define COERCE64(x) \
 #define COERCE64(x) \

-  (((bfd_int64_t) (x) ^ EIGHT_GAZILLION) - EIGHT_GAZILLION)
+  (((bfd_uint64_t) (x) ^ ((bfd_uint64_t) 1 << 63)) - ((bfd_uint64_t) 1 << 63))

 
 bfd_vma
 bfd_getb16 (const void *p)
 {
 
 bfd_vma
 bfd_getb16 (const void *p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   return (addr[0] << 8) | addr[1];
 }
 
 bfd_vma
 bfd_getl16 (const void *p)
 {
   return (addr[0] << 8) | addr[1];
 }
 
 bfd_vma
 bfd_getl16 (const void *p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   return (addr[1] << 8) | addr[0];
 }
 
 bfd_signed_vma
 bfd_getb_signed_16 (const void *p)
 {
   return (addr[1] << 8) | addr[0];
 }
 
 bfd_signed_vma
 bfd_getb_signed_16 (const void *p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   return COERCE16 ((addr[0] << 8) | addr[1]);
 }
 
 bfd_signed_vma
 bfd_getl_signed_16 (const void *p)
 {
   return COERCE16 ((addr[0] << 8) | addr[1]);
 }
 
 bfd_signed_vma
 bfd_getl_signed_16 (const void *p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   return COERCE16 ((addr[1] << 8) | addr[0]);
 }
 
 void
 bfd_putb16 (bfd_vma data, void *p)
 {
   return COERCE16 ((addr[1] << 8) | addr[0]);
 }
 
 void
 bfd_putb16 (bfd_vma data, void *p)
 {

-  bfd_byte *addr = p;
+  bfd_byte *addr = (bfd_byte *) p;

   addr[0] = (data >> 8) & 0xff;
   addr[1] = data & 0xff;
 }
   addr[0] = (data >> 8) & 0xff;
   addr[1] = data & 0xff;
 }


@@ -556,15 +626,57 @@ bfd_putb16 (bfd_vma data, void *p)
 void
 bfd_putl16 (bfd_vma data, void *p)
 {
 void
 bfd_putl16 (bfd_vma data, void *p)
 {

-  bfd_byte *addr = p;
+  bfd_byte *addr = (bfd_byte *) p;

   addr[0] = data & 0xff;
   addr[1] = (data >> 8) & 0xff;
 }
 
   addr[0] = data & 0xff;
   addr[1] = (data >> 8) & 0xff;
 }
 

+void
+bfd_putb24 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = (bfd_byte *) p;
+  addr[0] = (data >> 16) & 0xff;
+  addr[1] = (data >> 8) & 0xff;
+  addr[2] = data & 0xff;
+}
+
+void
+bfd_putl24 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = (bfd_byte *) p;
+  addr[0] = data & 0xff;
+  addr[1] = (data >> 8) & 0xff;
+  addr[2] = (data >> 16) & 0xff;
+}
+
+bfd_vma
+bfd_getb24 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  unsigned long v;
+
+  v =  (unsigned long) addr[0] << 16;
+  v |= (unsigned long) addr[1] << 8;
+  v |= (unsigned long) addr[2];
+  return v;
+}
+
+bfd_vma
+bfd_getl24 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  unsigned long v;
+
+  v = (unsigned long) addr[0];
+  v |= (unsigned long) addr[1] << 8;
+  v |= (unsigned long) addr[2] << 16;
+  return v;
+}
+

 bfd_vma
 bfd_getb32 (const void *p)
 {
 bfd_vma
 bfd_getb32 (const void *p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   unsigned long v;
 
   v = (unsigned long) addr[0] << 24;
   unsigned long v;
 
   v = (unsigned long) addr[0] << 24;


@@ -577,7 +689,7 @@ bfd_getb32 (const void *p)
 bfd_vma
 bfd_getl32 (const void *p)
 {
 bfd_vma
 bfd_getl32 (const void *p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   unsigned long v;
 
   v = (unsigned long) addr[0];
   unsigned long v;
 
   v = (unsigned long) addr[0];


@@ -590,7 +702,7 @@ bfd_getl32 (const void *p)
 bfd_signed_vma
 bfd_getb_signed_32 (const void *p)
 {
 bfd_signed_vma
 bfd_getb_signed_32 (const void *p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   unsigned long v;
 
   v = (unsigned long) addr[0] << 24;
   unsigned long v;
 
   v = (unsigned long) addr[0] << 24;


@@ -603,7 +715,7 @@ bfd_getb_signed_32 (const void *p)
 bfd_signed_vma
 bfd_getl_signed_32 (const void *p)
 {
 bfd_signed_vma
 bfd_getl_signed_32 (const void *p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   unsigned long v;
 
   v = (unsigned long) addr[0];
   unsigned long v;
 
   v = (unsigned long) addr[0];


@@ -617,7 +729,7 @@ bfd_uint64_t
 bfd_getb64 (const void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT
 bfd_getb64 (const void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   bfd_uint64_t v;
 
   v  = addr[0]; v <<= 8;
   bfd_uint64_t v;
 
   v  = addr[0]; v <<= 8;


@@ -640,7 +752,7 @@ bfd_uint64_t
 bfd_getl64 (const void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT
 bfd_getl64 (const void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   bfd_uint64_t v;
 
   v  = addr[7]; v <<= 8;
   bfd_uint64_t v;
 
   v  = addr[7]; v <<= 8;


@@ -664,7 +776,7 @@ bfd_int64_t
 bfd_getb_signed_64 (const void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT
 bfd_getb_signed_64 (const void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   bfd_uint64_t v;
 
   v  = addr[0]; v <<= 8;
   bfd_uint64_t v;
 
   v  = addr[0]; v <<= 8;


@@ -687,7 +799,7 @@ bfd_int64_t
 bfd_getl_signed_64 (const void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT
 bfd_getl_signed_64 (const void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   bfd_uint64_t v;
 
   v  = addr[7]; v <<= 8;
   bfd_uint64_t v;
 
   v  = addr[7]; v <<= 8;


@@ -709,7 +821,7 @@ bfd_getl_signed_64 (const void *p ATTRIBUTE_UNUSED)
 void
 bfd_putb32 (bfd_vma data, void *p)
 {
 void
 bfd_putb32 (bfd_vma data, void *p)
 {

-  bfd_byte *addr = p;
+  bfd_byte *addr = (bfd_byte *) p;

   addr[0] = (data >> 24) & 0xff;
   addr[1] = (data >> 16) & 0xff;
   addr[2] = (data >>  8) & 0xff;
   addr[0] = (data >> 24) & 0xff;
   addr[1] = (data >> 16) & 0xff;
   addr[2] = (data >>  8) & 0xff;


@@ -719,7 +831,7 @@ bfd_putb32 (bfd_vma data, void *p)
 void
 bfd_putl32 (bfd_vma data, void *p)
 {
 void
 bfd_putl32 (bfd_vma data, void *p)
 {

-  bfd_byte *addr = p;
+  bfd_byte *addr = (bfd_byte *) p;

   addr[0] = data & 0xff;
   addr[1] = (data >>  8) & 0xff;
   addr[2] = (data >> 16) & 0xff;
   addr[0] = data & 0xff;
   addr[1] = (data >>  8) & 0xff;
   addr[2] = (data >> 16) & 0xff;


@@ -730,7 +842,7 @@ void
 bfd_putb64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT
 bfd_putb64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT

-  bfd_byte *addr = p;
+  bfd_byte *addr = (bfd_byte *) p;

   addr[0] = (data >> (7*8)) & 0xff;
   addr[1] = (data >> (6*8)) & 0xff;
   addr[2] = (data >> (5*8)) & 0xff;
   addr[0] = (data >> (7*8)) & 0xff;
   addr[1] = (data >> (6*8)) & 0xff;
   addr[2] = (data >> (5*8)) & 0xff;


@@ -748,7 +860,7 @@ void
 bfd_putl64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT
 bfd_putl64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
 {
 #ifdef BFD_HOST_64_BIT

-  bfd_byte *addr = p;
+  bfd_byte *addr = (bfd_byte *) p;

   addr[7] = (data >> (7*8)) & 0xff;
   addr[6] = (data >> (6*8)) & 0xff;
   addr[5] = (data >> (5*8)) & 0xff;
   addr[7] = (data >> (7*8)) & 0xff;
   addr[6] = (data >> (6*8)) & 0xff;
   addr[5] = (data >> (5*8)) & 0xff;


@@ -765,7 +877,7 @@ bfd_putl64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
 void
 bfd_put_bits (bfd_uint64_t data, void *p, int bits, bfd_boolean big_p)
 {
 void
 bfd_put_bits (bfd_uint64_t data, void *p, int bits, bfd_boolean big_p)
 {

-  bfd_byte *addr = p;
+  bfd_byte *addr = (bfd_byte *) p;

   int i;
   int bytes;
 
   int i;
   int bytes;
 


@@ -775,9 +887,9 @@ bfd_put_bits (bfd_uint64_t data, void *p, int bits, bfd_boolean big_p)
   bytes = bits / 8;
   for (i = 0; i < bytes; i++)
     {
   bytes = bits / 8;
   for (i = 0; i < bytes; i++)
     {

-      int index = big_p ? bytes - i - 1 : i;
+      int addr_index = big_p ? bytes - i - 1 : i;

 
 

-      addr[index] = data & 0xff;
+      addr[addr_index] = data & 0xff;

       data >>= 8;
     }
 }
       data >>= 8;
     }
 }


@@ -785,7 +897,7 @@ bfd_put_bits (bfd_uint64_t data, void *p, int bits, bfd_boolean big_p)
 bfd_uint64_t
 bfd_get_bits (const void *p, int bits, bfd_boolean big_p)
 {
 bfd_uint64_t
 bfd_get_bits (const void *p, int bits, bfd_boolean big_p)
 {

-  const bfd_byte *addr = p;
+  const bfd_byte *addr = (const bfd_byte *) p;

   bfd_uint64_t data;
   int i;
   int bytes;
   bfd_uint64_t data;
   int i;
   int bytes;


@@ -797,9 +909,9 @@ bfd_get_bits (const void *p, int bits, bfd_boolean big_p)
   bytes = bits / 8;
   for (i = 0; i < bytes; i++)
     {
   bytes = bits / 8;
   for (i = 0; i < bytes; i++)
     {

-      int index = big_p ? i : bytes - i - 1;
+      int addr_index = big_p ? i : bytes - i - 1;

 
 

-      data = (data << 8) | addr[index];
+      data = (data << 8) | addr[addr_index];

     }
 
   return data;
     }
 
   return data;


@@ -818,8 +930,31 @@ _bfd_generic_get_section_contents (bfd *abfd,
   if (count == 0)
     return TRUE;
 
   if (count == 0)
     return TRUE;
 

-  sz = section->rawsize ? section->rawsize : section->size;
-  if (offset + count > sz)
+  if (section->compress_status != COMPRESS_SECTION_NONE)
+    {
+      _bfd_error_handler
+       /* xgettext:c-format */
+       (_("%pB: unable to get decompressed section %pA"),
+        abfd, section);
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* We do allow reading of a section after bfd_final_link has
+     written the contents out to disk.  In that situation, rawsize is
+     just a stale version of size, so ignore it.  Otherwise we must be
+     reading an input section, where rawsize, if different to size,
+     is the on-disk size.  */
+  if (abfd->direction != write_direction && section->rawsize != 0)
+    sz = section->rawsize;
+  else
+    sz = section->size;
+  if (offset + count < count
+      || offset + count > sz
+      || (abfd->my_archive != NULL
+         && !bfd_is_thin_archive (abfd->my_archive)
+         && ((ufile_ptr) section->filepos + offset + count
+             > arelt_size (abfd))))

     {
       bfd_set_error (bfd_error_invalid_operation);
       return FALSE;
     {
       bfd_set_error (bfd_error_invalid_operation);
       return FALSE;


@@ -870,8 +1005,16 @@ _bfd_generic_get_section_contents_in_window
       w->data = w->i->data;
       return bfd_get_section_contents (abfd, section, w->data, offset, count);
     }
       w->data = w->i->data;
       return bfd_get_section_contents (abfd, section, w->data, offset, count);
     }

-  sz = section->rawsize ? section->rawsize : section->size;
-  if (offset + count > sz
+  if (abfd->direction != write_direction && section->rawsize != 0)
+    sz = section->rawsize;
+  else
+    sz = section->size;
+  if (offset + count < count
+      || offset + count > sz
+      || (abfd->my_archive != NULL
+         && !bfd_is_thin_archive (abfd->my_archive)
+         && ((ufile_ptr) section->filepos + offset + count
+             > arelt_size (abfd)))

       || ! bfd_get_file_window (abfd, section->filepos + offset, count, w,
                                TRUE))
     return FALSE;
       || ! bfd_get_file_window (abfd, section->filepos + offset, count, w,
                                TRUE))
     return FALSE;


@@ -919,8 +1062,12 @@ bfd_log2 (bfd_vma x)
 {
   unsigned int result = 0;
 
 {
   unsigned int result = 0;
 

-  while ((x = (x >> 1)) != 0)
+  if (x <= 1)
+    return result;
+  --x;
+  do

     ++result;
     ++result;

+  while ((x >>= 1) != 0);

   return result;
 }
 
   return result;
 }
 


@@ -932,53 +1079,30 @@ bfd_generic_is_local_label_name (bfd *abfd, const char *name)
   return name[0] == locals_prefix;
 }
 
   return name[0] == locals_prefix;
 }
 

-/*  Can be used from / for bfd_merge_private_bfd_data to check that
-    endianness matches between input and output file.  Returns
-    TRUE for a match, otherwise returns FALSE and emits an error.  */
-bfd_boolean
-_bfd_generic_verify_endian_match (bfd *ibfd, bfd *obfd)
-{
-  if (ibfd->xvec->byteorder != obfd->xvec->byteorder
-      && ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN
-      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
-    {
-      const char *msg;
-
-      if (bfd_big_endian (ibfd))
-       msg = _("%B: compiled for a big endian system and target is little endian");
-      else
-       msg = _("%B: compiled for a little endian system and target is big endian");
-
-      (*_bfd_error_handler) (msg, ibfd);
-
-      bfd_set_error (bfd_error_wrong_format);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-

 /* Give a warning at runtime if someone compiles code which calls
    old routines.  */
 
 void
 /* Give a warning at runtime if someone compiles code which calls
    old routines.  */
 
 void

-warn_deprecated (const char *what,
-                const char *file,
-                int line,
-                const char *func)
+_bfd_warn_deprecated (const char *what,
+                     const char *file,
+                     int line,
+                     const char *func)

 {
   /* Poor man's tracking of functions we've already warned about.  */
   static size_t mask = 0;
 
   if (~(size_t) func & ~mask)
     {
 {
   /* Poor man's tracking of functions we've already warned about.  */
   static size_t mask = 0;
 
   if (~(size_t) func & ~mask)
     {

+      fflush (stdout);

       /* Note: separate sentences in order to allow
         for translation into other languages.  */
       if (func)
       /* Note: separate sentences in order to allow
         for translation into other languages.  */
       if (func)

+       /* xgettext:c-format */

        fprintf (stderr, _("Deprecated %s called at %s line %d in %s\n"),
                 what, file, line, func);
       else
        fprintf (stderr, _("Deprecated %s called\n"), what);
        fprintf (stderr, _("Deprecated %s called at %s line %d in %s\n"),
                 what, file, line, func);
       else
        fprintf (stderr, _("Deprecated %s called\n"), what);

+      fflush (stderr);

       mask |= ~(size_t) func;
     }
 }
       mask |= ~(size_t) func;
     }
 }


@@ -986,9 +1110,9 @@ warn_deprecated (const char *what,
 /* Helper function for reading uleb128 encoded data.  */
 
 bfd_vma
 /* Helper function for reading uleb128 encoded data.  */
 
 bfd_vma

-read_unsigned_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
-                     bfd_byte *buf,
-                     unsigned int *bytes_read_ptr)
+_bfd_read_unsigned_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
+                          bfd_byte *buf,
+                          unsigned int *bytes_read_ptr)

 {
   bfd_vma result;
   unsigned int num_read;
 {
   bfd_vma result;
   unsigned int num_read;


@@ -1011,12 +1135,51 @@ read_unsigned_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
   return result;
 }
 
   return result;
 }
 

+/* Read in a LEB128 encoded value from ABFD starting at DATA.
+   If SIGN is true, return a signed LEB128 value.
+   If LENGTH_RETURN is not NULL, return in it the number of bytes read.
+   No bytes will be read at address END or beyond.  */
+
+bfd_vma
+_bfd_safe_read_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
+                      bfd_byte *data,
+                      unsigned int *length_return,
+                      bfd_boolean sign,
+                      const bfd_byte * const end)
+{
+  bfd_vma result = 0;
+  unsigned int num_read = 0;
+  unsigned int shift = 0;
+  unsigned char byte = 0;
+
+  while (data < end)
+    {
+      byte = bfd_get_8 (abfd, data);
+      data++;
+      num_read++;
+
+      result |= ((bfd_vma) (byte & 0x7f)) << shift;
+
+      shift += 7;
+      if ((byte & 0x80) == 0)
+       break;
+    }
+
+  if (length_return != NULL)
+    *length_return = num_read;
+
+  if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
+    result |= -((bfd_vma) 1 << shift);
+
+  return result;
+}
+

 /* Helper function for reading sleb128 encoded data.  */
 
 bfd_signed_vma
 /* Helper function for reading sleb128 encoded data.  */
 
 bfd_signed_vma

-read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
-                   bfd_byte *buf,
-                   unsigned int *bytes_read_ptr)
+_bfd_read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
+                        bfd_byte *buf,
+                        unsigned int *bytes_read_ptr)

 {
   bfd_vma result;
   unsigned int shift;
 {
   bfd_vma result;
   unsigned int shift;


@@ -1041,16 +1204,6 @@ read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
   return result;
 }
 
   return result;
 }
 

-bfd_boolean
-_bfd_generic_find_line (bfd *abfd ATTRIBUTE_UNUSED,
-                      asymbol **symbols ATTRIBUTE_UNUSED,
-                      asymbol *symbol ATTRIBUTE_UNUSED,
-                      const char **filename_ptr ATTRIBUTE_UNUSED,
-                      unsigned int *linenumber_ptr ATTRIBUTE_UNUSED)
-{
-  return FALSE;
-}
-

 bfd_boolean
 _bfd_generic_init_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED,
                                        asection *isec ATTRIBUTE_UNUSED,
 bfd_boolean
 _bfd_generic_init_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED,
                                        asection *isec ATTRIBUTE_UNUSED,