Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / include / elf / external.h

diff --git a/include/elf/external.h b/include/elf/external.h
index b6057b5ac45af89686c70088ddb748bd6277508b..230fdabd87aa12df40260ffa6f21adf8785a73a5 100644 (file)
--- a/include/elf/external.h
+++ b/include/elf/external.h
@@ -1,5 +1,5 @@
 /* ELF support for BFD.
-   Copyright (C) 1991-2015 Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 Free Software Foundation, Inc.
 
    Written by Fred Fish @ Cygnus Support, from information published
    in "UNIX System V Release 4, Programmers Guide: ANSI C and
@@ -144,7 +144,8 @@ typedef struct {
 } Elf32_External_Chdr;
 
 typedef struct {
-  unsigned char        ch_type[8];             /* Type of compression */
+  unsigned char        ch_type[4];             /* Type of compression */
+  unsigned char        ch_reserved[4];         /* Padding */
   unsigned char        ch_size[8];             /* Size of uncompressed data in bytes */
   unsigned char        ch_addralign[8];        /* Alignment of uncompressed data  */
 } Elf64_External_Chdr;
@@ -182,6 +183,22 @@ typedef struct {
   char         name[1];                /* Start of the name+desc data */
 } Elf_External_Note;
 
+/* Align an address upward to a boundary, expressed as a number of bytes.
+   E.g. align to an 8-byte boundary with argument of 8.  */
+#define ELF_ALIGN_UP(addr, boundary) \
+  (((bfd_vma) (addr) + ((boundary) - 1)) & ~ (bfd_vma) ((boundary) -1))
+
+/* Compute the offset of the note descriptor from size of note entry's
+   owner string and note alignment.  */
+#define ELF_NOTE_DESC_OFFSET(namesz, align) \
+  ELF_ALIGN_UP (offsetof (Elf_External_Note, name) + (namesz), (align))
+
+/* Compute the offset of the next note entry from size of note entry's
+   owner string, size of the note descriptor and note alignment.  */
+#define ELF_NOTE_NEXT_OFFSET(namesz, descsz, align) \
+  ELF_ALIGN_UP (ELF_NOTE_DESC_OFFSET ((namesz), (align)) + (descsz), \
+               (align))
+
 /* Relocation Entries */
 typedef struct {
   unsigned char r_offset[4];   /* Location at which to apply the action */