mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-31 16:57:10 +00:00
revert r341429 "disable BIND_NOW in libc, libthr, and rtld"
r345620 by kib@ fixed the rtld issue that caused a crash at startup during resolution of libc's ifuncs with BIND_NOW. PR: 233333 Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
ad484b8c53
commit
09b47fc1c2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=345625
@ -3490,6 +3490,7 @@ dump_notes(struct readelf *re)
|
||||
|
||||
static struct flag_desc note_feature_ctl_flags[] = {
|
||||
{ NT_FREEBSD_FCTL_ASLR_DISABLE, "ASLR_DISABLE" },
|
||||
{ NT_FREEBSD_FCTL_IMPLIED_MAX_PROT, "IMPLIED_MAX_PROT" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
@ -6,8 +6,6 @@ SHLIBDIR?= /lib
|
||||
|
||||
.include <src.opts.mk>
|
||||
|
||||
# BIND_NOW in libc results in segfault at startup (PR 233333)
|
||||
MK_BIND_NOW= no
|
||||
# Force building of libc_pic.a
|
||||
MK_TOOLCHAIN= yes
|
||||
|
||||
|
@ -9,7 +9,6 @@ PACKAGE= clibs
|
||||
SHLIBDIR?= /lib
|
||||
|
||||
.include <src.opts.mk>
|
||||
MK_BIND_NOW= no
|
||||
MK_SSP= no
|
||||
|
||||
LIB=thr
|
||||
|
@ -6,7 +6,6 @@
|
||||
|
||||
.include <src.opts.mk>
|
||||
PACKAGE= clibs
|
||||
MK_BIND_NOW= no
|
||||
MK_PIE= no # Always position independent using local rules
|
||||
MK_SSP= no
|
||||
|
||||
|
@ -763,7 +763,8 @@ typedef struct {
|
||||
#define NT_FREEBSD_FEATURE_CTL 4
|
||||
|
||||
/* NT_FREEBSD_FEATURE_CTL desc[0] bits */
|
||||
#define NT_FREEBSD_FCTL_ASLR_DISABLE 0x00000001
|
||||
#define NT_FREEBSD_FCTL_ASLR_DISABLE 0x00000001
|
||||
#define NT_FREEBSD_FCTL_IMPLIED_MAX_PROT 0x00000002
|
||||
|
||||
/* Values for n_type. Used in core files. */
|
||||
#define NT_PRSTATUS 1 /* Process status. */
|
||||
|
Loading…
Reference in New Issue
Block a user