diff options
| author | martin <martin@NetBSD.org> | 2019-11-26 08:12:26 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2019-11-26 08:12:26 +0000 |
| commit | 59dc6b8211b1d80365e6f08d9e5819cced70ebf0 (patch) | |
| tree | 8b5bf7c4af02c89e4e71cfe7f01fa161df985dc9 /usr.bin | |
| parent | 7ef4182bbbf40e4602e69fa317abb6850101872a (diff) | |
Pull up following revision(s) (requested by nakayama in ticket #469):
lib/libc/tls/tls.c: revision 1.10
lib/libc/tls/tls.c: revision 1.11
lib/libc/tls/tls.c: revision 1.12
lib/libc/tls/tls.c: revision 1.13
libexec/ld.elf_so/tls.c: revision 1.13
libexec/ld.elf_so/tls.c: revision 1.14
libexec/ld.elf_so/Makefile: revision 1.142
lib/libc/tls/Makefile.inc: revision 1.3
usr.bin/ldd/Makefile.elf: revision 1.6
PR 54093: Align static TLS area to max_align_t.
Use alignof and not size_t for platforms with non-natural base
alignments.
Mirror the ld.elf_so logic for handling aligning the TLS size.
Most noticable, recompute the start of the TLS area for variant I
relative to the TCB. This makes a difference when the segment size and
base alignment don't agree.
Fix PR/54074 and PR/54093 completely.
More similar to the ld.elf_so logic, it is necessary to align with
p_align first. Also, invert the #ifdef condition for consistency.
Should fix regression for static linking binaries:
http://releng.netbsd.org/b5reports/sparc/commits-2019.11.html#2019.11.10.23.39.03
http://releng.netbsd.org/b5reports/sparc64/commits-2019.11.html#2019.11.16.04.10.33
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ldd/Makefile.elf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ldd/Makefile.elf b/usr.bin/ldd/Makefile.elf index 3acc9a91686..994152b6c3e 100644 --- a/usr.bin/ldd/Makefile.elf +++ b/usr.bin/ldd/Makefile.elf @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.elf,v 1.5 2013/05/07 13:00:35 christos Exp $ +# $NetBSD: Makefile.elf,v 1.5.30.1 2019/11/26 08:12:27 martin Exp $ # Makefile fragment to build a (32 or 64 bit) libldd_elfxx.a. # Expects CPPFLAGS to have ELFSIZE set, and LIB to be set. @@ -7,4 +7,6 @@ SRCS= ldd_elfxx.c SRCS+= xmalloc.c debug.c expand.c map_object.c load.c search.c \ headers.c paths.c tls.c symver.c +CPPFLAGS.tls.c+= -std=gnu11 + .include "Makefile.common" |
