X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Felfcomm.h;h=abf84b5cb9e8d7edf6c40d5c2eafd6fa664a7136;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=6ffd0c17b546a2cfdf46a44c97ebbb298d419707;hpb=6f2750feaf2827ef8a1a0a5b2f90c1e9a6cabbd1;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/elfcomm.h b/binutils/elfcomm.h
index 6ffd0c17b5..abf84b5cb9 100644
--- a/binutils/elfcomm.h
+++ b/binutils/elfcomm.h
@@ -1,5 +1,5 @@
 /* elfcomm.h -- include file of common code for ELF format file.
-   Copyright (C) 2010-2016 Free Software Foundation, Inc.
+   Copyright (C) 2010-2020 Free Software Foundation, Inc.
 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
    Modifications by Nick Clifton <nickc@redhat.com>
@@ -26,27 +26,20 @@
 
 #include "aout/ar.h"
 
-void error (const char *, ...) ATTRIBUTE_PRINTF_1;
-void warn (const char *, ...) ATTRIBUTE_PRINTF_1;
+extern void error (const char *, ...) ATTRIBUTE_PRINTF_1;
+extern void warn (const char *, ...) ATTRIBUTE_PRINTF_1;
 
-#if defined HAVE_LONG_LONG && SIZEOF_LONG_LONG > SIZEOF_LONG
-/* We can't use any bfd types here since readelf may define BFD64 and
-   objdump may not.  */
-#define HOST_WIDEST_INT	long long
-#else
-#define HOST_WIDEST_INT long
-#endif
 typedef unsigned HOST_WIDEST_INT elf_vma;
 
 extern void (*byte_put) (unsigned char *, elf_vma, int);
 extern void byte_put_little_endian (unsigned char *, elf_vma, int);
 extern void byte_put_big_endian (unsigned char *, elf_vma, int);
 
-extern elf_vma (*byte_get) (unsigned char *, int);
-extern elf_vma byte_get_signed (unsigned char *, int);
-extern elf_vma byte_get_little_endian (unsigned char *, int);
-extern elf_vma byte_get_big_endian (unsigned char *, int);
-extern void byte_get_64 (unsigned char *, elf_vma *, elf_vma *);
+extern elf_vma (*byte_get) (const unsigned char *, int);
+extern elf_vma byte_get_signed (const unsigned char *, int);
+extern elf_vma byte_get_little_endian (const unsigned char *, int);
+extern elf_vma byte_get_big_endian (const unsigned char *, int);
+extern void byte_get_64 (const unsigned char *, elf_vma *, elf_vma *);
 
 #define BYTE_PUT(field, val)	byte_put (field, val, sizeof (field))
 #define BYTE_GET(field)		byte_get (field, sizeof (field))
@@ -71,8 +64,8 @@ struct archive_info
   unsigned long longnames_size;         /* Size of the long file names table.  */
   unsigned long nested_member_origin;   /* Origin in the nested archive of the current member.  */
   unsigned long next_arhdr_offset;      /* Offset of the next archive header.  */
-  bfd_boolean is_thin_archive;          /* TRUE if this is a thin archive.  */
-  bfd_boolean uses_64bit_indicies;      /* TRUE if the index table uses 64bit entries.  */
+  int is_thin_archive;                  /* 1 if this is a thin archive.  */
+  int uses_64bit_indices;               /* 1 if the index table uses 64bit entries.  */
   struct ar_hdr arhdr;                  /* Current archive header.  */
 };
 
@@ -81,7 +74,7 @@ extern char *adjust_relative_path (const char *, const char *, unsigned long);
 
 /* Read the symbol table and long-name table from an archive.  */
 extern int setup_archive (struct archive_info *, const char *, FILE *,
-			  bfd_boolean, bfd_boolean);
+			  off_t, int, int);
 
 /* Open and setup a nested archive, if not already open.  */
 extern int setup_nested_archive (struct archive_info *, const char *);