D23909.1794803928.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D23909.1794803928.diff
View Options

	Index: contrib/elftoolchain/readelf/readelf.c
	===================================================================
	--- contrib/elftoolchain/readelf/readelf.c
	+++ contrib/elftoolchain/readelf/readelf.c
	@@ -3671,6 +3671,7 @@
	{ NT_FREEBSD_FCTL_ASLR_DISABLE, "ASLR_DISABLE" },
	{ NT_FREEBSD_FCTL_PROTMAX_DISABLE, "PROTMAX_DISABLE" },
	{ NT_FREEBSD_FCTL_STKGAP_DISABLE, "STKGAP_DISABLE" },
	+ { NT_FREEBSD_FCTL_WXNEEDED, "WXNEEDED" },
	{ 0, NULL }
	};

	Index: sys/sys/elf_common.h
	===================================================================
	--- sys/sys/elf_common.h
	+++ sys/sys/elf_common.h
	@@ -790,6 +790,7 @@
	#define NT_FREEBSD_FCTL_ASLR_DISABLE 0x00000001
	#define NT_FREEBSD_FCTL_PROTMAX_DISABLE 0x00000002
	#define NT_FREEBSD_FCTL_STKGAP_DISABLE 0x00000004
	+#define NT_FREEBSD_FCTL_WXNEEDED 0x00000008

	/* Values for n_type. Used in core files. */
	#define NT_PRSTATUS 1 /* Process status. */
	Index: tools/tools/controlelf/controlelf.c
	===================================================================
	--- tools/tools/controlelf/controlelf.c
	+++ tools/tools/controlelf/controlelf.c
	@@ -66,6 +66,7 @@
	{ "protmax", NT_FREEBSD_FCTL_PROTMAX_DISABLE,
	"Disable implicit PROT_MAX" },
	{ "stackgap", NT_FREEBSD_FCTL_STKGAP_DISABLE, "Disable stack gap" },
	+ { "wxneeded", NT_FREEBSD_FCTL_WXNEEDED, "Requires W+X mappings" },
	};

	static struct option long_opts[] = {