summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2017-11-24 15:41:23 -0500
committerSimon Marchi <simon.marchi@ericsson.com>2017-11-24 15:43:51 -0500
commit4e25ac038efbe5293885cc75d8a3e08b23da7cc9 (patch)
tree9d229bb7ece3584f33b3f9124703331cc0ddc534 /include
parent0fbc35681ff0825be97802efcccf953bc4573a45 (diff)
Revert "elf: Properly compute offsets of note descriptor and next note"
This reverts commit 650444eb540f9fd85e821567a3f943b4bc41b8be. With this patch, running the GDB test case gdb.base/auxv.exp is stuck in an infinite loop, consuming memory to the point that it renders the machine unusable. I am reverting it so we can take our time to investigate while not killing all the developers' machines.
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog7
-rw-r--r--include/elf/external.h16
2 files changed, 0 insertions, 23 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index a7668678f8..670456cece 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,10 +1,3 @@
-2017-11-24 H.J. Lu <hongjiu.lu@intel.com>
-
- PR binutils/22444
- * elf/external.h (ELF_ALIGN_UP): New.
- (ELF_NOTE_DESC_OFFSET): Likewise.
- (ELF_NOTE_NEXT_OFFSET): Likewise.
-
2017-11-16 Tamar Christina <tamar.christina@arm.com>
* opcode/aarch64.h: (AARCH64_FEATURE_F16_FML): New.
diff --git a/include/elf/external.h b/include/elf/external.h
index eb0a53a9a9..d65bae0b21 100644
--- a/include/elf/external.h
+++ b/include/elf/external.h
@@ -183,22 +183,6 @@ 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 */