aboutsummaryrefslogtreecommitdiff
path: root/gcc/config/host-linux.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/config/host-linux.c')
-rw-r--r--gcc/config/host-linux.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/gcc/config/host-linux.c b/gcc/config/host-linux.c
index a1ec046e036..795bb552234 100644
--- a/gcc/config/host-linux.c
+++ b/gcc/config/host-linux.c
@@ -114,8 +114,13 @@ linux_gt_pch_get_address (size_t size, int fd)
if (TRY_EMPTY_VM_SPACE && addr == (void *) TRY_EMPTY_VM_SPACE)
return addr;
- /* If we didn't, then we need to look to see if randomization is on. */
- f = fopen ("/proc/sys/kernel/exec-shield-randomize", "r");
+ /* If we didn't, then we need to look to see if virtual address
+ randomization is on. That is recorded in
+ kernel.randomize_va_space. An older implementation used
+ kernel.exec-shield-randomize. */
+ f = fopen ("/proc/sys/kernel/randomize_va_space", "r");
+ if (f == NULL)
+ f = fopen ("/proc/sys/kernel/exec-shield-randomize", "r");
randomize_on = false;
if (f != NULL)
{