summaryrefslogtreecommitdiff
path: root/ld/ldexp.c
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2022-02-14 16:02:45 -0800
committerH.J. Lu <hjl.tools@gmail.com>2022-02-14 17:39:34 -0800
commita1faa5ea8629adfcd60c2cc0d3b533ed3ab34ee2 (patch)
treeb9f08d64f4f3f0b63f8b3829b455a041a5edbc43 /ld/ldexp.c
parent62e2e6d120fc2e374da5f36a4218a38cea857004 (diff)
downloadbinutils-gdb-a1faa5ea8629adfcd60c2cc0d3b533ed3ab34ee2.tar.gz
Revert "PR28824, relro security issues, x86 keep COMMONPAGESIZE relro"
This reverts commit 31b4d3a16f200bf04db8439a63b72bba7af4e1be.
Diffstat (limited to 'ld/ldexp.c')
-rw-r--r--ld/ldexp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ld/ldexp.c b/ld/ldexp.c
index 90760e0a8ca..c18b8284ca5 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -485,10 +485,7 @@ fold_segment_align (etree_value_type *lhs)
seg->base = expld.result.value;
seg->commonpagesize = commonpage;
seg->maxpagesize = maxpage;
- if (config.relro_use_commonpagesize)
- seg->relropagesize = commonpage;
- else
- seg->relropagesize = maxpage;
+ seg->relropagesize = maxpage;
seg->relro_end = 0;
}
else