Sorry, committed the wrong version of the last patch.

[pf3gnuchains/gcc-fork.git] / gcc / config / host-linux.c

diff --git a/gcc/config/host-linux.c b/gcc/config/host-linux.c
index 0b17c6a..c94f822 100644 (file)
--- a/gcc/config/host-linux.c
+++ b/gcc/config/host-linux.c
@@ -1,11 +1,11 @@
 /* Linux host-specific hook definitions.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
    GCC is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 2, or (at your
+   by the Free Software Foundation; either version 3, or (at your
    option) any later version.
 
    GCC is distributed in the hope that it will be useful, but WITHOUT
@@ -14,14 +14,14 @@
    License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the
-   Free Software Foundation, 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.  */
+   along with GCC; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include <sys/mman.h>
+#include <limits.h>
 #include "hosthooks.h"
 #include "hosthooks-def.h"
 
@@ -84,6 +84,8 @@
 # define TRY_EMPTY_VM_SPACE    0x8000000000
 #elif defined(__sparc__)
 # define TRY_EMPTY_VM_SPACE    0x60000000
+#elif defined(__mc68000__)
+# define TRY_EMPTY_VM_SPACE    0x40000000
 #else
 # define TRY_EMPTY_VM_SPACE    0
 #endif
@@ -113,8 +115,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)
     {