summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2023-02-02 00:43:11 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2023-02-02 00:43:11 +0000
commit57da85b7c6be6e1e58fbfabefe8f3da1ec47a210 (patch)
tree760c46302d203c2821fed2904ccdc4591cb6b2cb
parent4d216431b873ac80e4afb0c14c622feca2bfaf57 (diff)
i386 and alpha ld.so also work with X-only text LOAD. There is no
hardware enforcement for this, but uvm can some of it's own tricks on occasion.
-rw-r--r--libexec/ld.so/alpha/ld.script2
-rw-r--r--libexec/ld.so/i386/ld.script2
2 files changed, 2 insertions, 2 deletions
diff --git a/libexec/ld.so/alpha/ld.script b/libexec/ld.so/alpha/ld.script
index 5e24bacb3cf..fadf82951d1 100644
--- a/libexec/ld.so/alpha/ld.script
+++ b/libexec/ld.so/alpha/ld.script
@@ -1,7 +1,7 @@
PHDRS
{
rodata PT_LOAD FILEHDR PHDRS FLAGS (4);
- text PT_LOAD;
+ text PT_LOAD FLAGS(1);
btext PT_LOAD FLAGS (0x08000005);
data PT_LOAD;
random PT_OPENBSD_RANDOMIZE;
diff --git a/libexec/ld.so/i386/ld.script b/libexec/ld.so/i386/ld.script
index 72b894e0085..8a3a1b3edaa 100644
--- a/libexec/ld.so/i386/ld.script
+++ b/libexec/ld.so/i386/ld.script
@@ -1,7 +1,7 @@
PHDRS
{
rodata PT_LOAD FILEHDR PHDRS FLAGS (4);
- text PT_LOAD;
+ text PT_LOAD FLAGS(1);
btext PT_LOAD FLAGS (0x08000005);
data PT_LOAD;
random PT_OPENBSD_RANDOMIZE;