From 23d28bfe80ebd227936d746e9e4f25afc28c8fb2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 1 Aug 2005 17:43:33 +0000 Subject: [PATCH] host-linux.c (linux_gt_pch_get_address): Add new name randomize_va_space for virtual address randomization control. * config/host-linux.c (linux_gt_pch_get_address): Add new name randomize_va_space for virtual address randomization control. From-SVN: r102636 --- gcc/ChangeLog | 5 +++++ gcc/config/host-linux.c | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 297fca10fb1..042da8678bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-08-01 Ian Lance Taylor + + * config/host-linux.c (linux_gt_pch_get_address): Add new name + randomize_va_space for virtual address randomization control. + 2005-08-01 Steven Bosscher * common.opt (flag_ipa_cp): Put in right place to maintain 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) { -- 2.30.2