diff options
| author |   guenther <guenther@openbsd.org> | 2015-11-11 08:21:42 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2015-11-11 08:21:42 +0000 |
| commit | 8d23090c6c6438a385d944285ff9df97b1e13c68 (patch) | |
| tree | 32a41df7613a8329d171c45206f050954290e4ee | |
| parent | the ramdisk more(1) works with pledge "stdio rpath tty" (diff) | |
| download | wireguard-openbsd-8d23090c6c6438a385d944285ff9df97b1e13c68.tar.xz wireguard-openbsd-8d23090c6c6438a385d944285ff9df97b1e13c68.zip | |
Correct several DT_foo (tag id) vs DF_* (flag bit) errors
ok deraadt@ kettenis@
| -rw-r--r-- | gnu/usr.bin/binutils-2.17/bfd/elf64-alpha.c | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils-2.17/ld/emultempl/elf32.em | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.bin/binutils-2.17/bfd/elf64-alpha.c b/gnu/usr.bin/binutils-2.17/bfd/elf64-alpha.c index 865564379ca..d1a7fd0ee82 100644 --- a/gnu/usr.bin/binutils-2.17/bfd/elf64-alpha.c +++ b/gnu/usr.bin/binutils-2.17/bfd/elf64-alpha.c @@ -2601,7 +2601,7 @@ elf64_alpha_calc_dynrel_sizes (struct alpha_elf_link_hash_entry *h, relent->srel->size += entries * sizeof (Elf64_External_Rela) * relent->count; if (relent->reltext) - info->flags |= DT_TEXTREL; + info->flags |= DF_TEXTREL; } } diff --git a/gnu/usr.bin/binutils-2.17/ld/emultempl/elf32.em b/gnu/usr.bin/binutils-2.17/ld/emultempl/elf32.em index f25d2bd8df2..7cacc952519 100644 --- a/gnu/usr.bin/binutils-2.17/ld/emultempl/elf32.em +++ b/gnu/usr.bin/binutils-2.17/ld/emultempl/elf32.em @@ -1941,7 +1941,7 @@ if test -n "$GENERATE_PIE_SCRIPT" ; then if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then echo ' ; else if (link_info.pie && link_info.combreloc' >> e${EMULATION_NAME}.c echo ' && link_info.relro' >> e${EMULATION_NAME}.c -echo ' && (link_info.flags & DT_BIND_NOW)) return' >> e${EMULATION_NAME}.c +echo ' && (link_info.flags & DF_BIND_NOW)) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xdw >> e${EMULATION_NAME}.c echo ' ; else if (link_info.pie && link_info.combreloc && config.data_bss_contig == TRUE) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xdcz >> e${EMULATION_NAME}.c @@ -1957,7 +1957,7 @@ if test -n "$GENERATE_SHLIB_SCRIPT" ; then if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then echo ' ; else if (link_info.shared && link_info.combreloc' >> e${EMULATION_NAME}.c echo ' && link_info.relro' >> e${EMULATION_NAME}.c -echo ' && (link_info.flags & DT_BIND_NOW)) return' >> e${EMULATION_NAME}.c +echo ' && (link_info.flags & DF_BIND_NOW)) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xsw >> e${EMULATION_NAME}.c echo ' ; else if (link_info.shared && link_info.combreloc) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xsc >> e${EMULATION_NAME}.c @@ -1969,7 +1969,7 @@ echo ' ; else if (config.data_bss_contig == TRUE) return' >> e${EMULATION_NAME} sed $sc ldscripts/${EMULATION_NAME}.xz >> e${EMULATION_NAME}.c if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then echo ' ; else if (link_info.combreloc && link_info.relro' >> e${EMULATION_NAME}.c -echo ' && (link_info.flags & DT_BIND_NOW)) return' >> e${EMULATION_NAME}.c +echo ' && (link_info.flags & DF_BIND_NOW)) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xw >> e${EMULATION_NAME}.c echo ' ; else if (link_info.combreloc) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xc >> e${EMULATION_NAME}.c @@ -2003,7 +2003,7 @@ if test -n "$GENERATE_PIE_SCRIPT" ; then if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then cat >>e${EMULATION_NAME}.c <<EOF else if (link_info.pie && link_info.combreloc - && link_info.relro && (link_info.flags & DT_BIND_NOW)) + && link_info.relro && (link_info.flags & DF_BIND_NOW)) return "ldscripts/${EMULATION_NAME}.xdw"; else if (link_info.pie && link_info.combreloc && config.data_bss_contig == TRUE) return "ldscripts/${EMULATION_NAME}.xdcz"; @@ -2022,7 +2022,7 @@ if test -n "$GENERATE_SHLIB_SCRIPT" ; then if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then cat >>e${EMULATION_NAME}.c <<EOF else if (link_info.shared && link_info.combreloc - && link_info.relro && (link_info.flags & DT_BIND_NOW)) + && link_info.relro && (link_info.flags & DF_BIND_NOW)) return "ldscripts/${EMULATION_NAME}.xsw"; else if (link_info.shared && link_info.combreloc) return "ldscripts/${EMULATION_NAME}.xsc"; @@ -2040,7 +2040,7 @@ EOF if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then cat >>e${EMULATION_NAME}.c <<EOF else if (link_info.combreloc && link_info.relro - && (link_info.flags & DT_BIND_NOW)) + && (link_info.flags & DF_BIND_NOW)) return "ldscripts/${EMULATION_NAME}.xw"; else if (link_info.combreloc) return "ldscripts/${EMULATION_NAME}.xc"; |