aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2019-03-28 02:12:32 +0000
committerEd Maste <emaste@FreeBSD.org>2019-03-28 02:12:32 +0000
commit09b47fc1c285e10c47d3f8ceb543974ce1ce1fc8 (patch)
treea2476a554aedceb4ce5ca9d35dabbcc4ce44a9fa
parentad484b8c53380879340b8ca31088e24600aa61f9 (diff)
Notes
-rw-r--r--contrib/elftoolchain/readelf/readelf.c1
-rw-r--r--lib/libc/Makefile2
-rw-r--r--lib/libthr/Makefile1
-rw-r--r--libexec/rtld-elf/Makefile1
-rw-r--r--sys/sys/elf_common.h3
5 files changed, 3 insertions, 5 deletions
diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c
index a53f65f6af775..d6bd3f23830bd 100644
--- a/contrib/elftoolchain/readelf/readelf.c
+++ b/contrib/elftoolchain/readelf/readelf.c
@@ -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 }
};
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index b545a2e81e98e..ea3879ece5922 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -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
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 4a11cdb6c969e..e2e571e134151 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -9,7 +9,6 @@ PACKAGE= clibs
SHLIBDIR?= /lib
.include <src.opts.mk>
-MK_BIND_NOW= no
MK_SSP= no
LIB=thr
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 59e97c93cd835..52befa6a0d415 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -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
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index 2d61e953401a2..1b71b46eadfa6 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -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. */