Use dl_iterate_phdr() instead of a linker script.

According to Mike Frysinger [1] it is not reliable to read ELF sections
at runtime, which the previous method involving the linker script was
doing.

Instead, use dl_iterate_phdr() to find the build id.

[1] https://sourceware.org/ml/binutils/2016-12/msg00207.html

1 files changed, 8 insertions, 15 deletions

diff --git a/build-id.h b/build-id.h
index 7a51c1e..03e2684 100644
--- a/build-id.h
+++ b/build-id.h
@@ -22,24 +22,17 @@
  * IN THE SOFTWARE.
  */
 
-#include <elf.h>
-#include <stdio.h>
-#include <string.h>
+#define _GNU_SOURCE
+#include <link.h>
+#include <stdint.h>
 
-#if __x86_64__
-#  define ElfW(type) Elf64_##type
-#else
-#  define ElfW(type) Elf32_##type
-#endif
+struct note;
 
-void
-so_print(void);
-
-const ElfW(Nhdr) *
-build_id_find_nhdr(void);
+const struct note *
+build_id_find_nhdr(const char *name);
 
 ElfW(Word)
-build_id_length(const ElfW(Nhdr) *nhdr);
+build_id_length(const struct note *note);
 
 void
-build_id_read(const ElfW(Nhdr) *nhdr, unsigned char *build_id);
+build_id_read(const struct note *note, unsigned char *build_id);