diff options
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 6 | ||||
| -rw-r--r-- | libgcc/enable-execute-stack-mprotect.c | 29 |
2 files changed, 7 insertions, 28 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 9126632..47305ca 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2012-01-02 Jonathan Wakely <jwakely.gcc@gmail.com> + + PR bootstrap/51006 + * enable-execute-stack-mprotect.c (getpagesize): Do not define + for NetBSD. + 2012-01-02 Georg-Johann Lay <avr@gjlay.de> PR target/51345 diff --git a/libgcc/enable-execute-stack-mprotect.c b/libgcc/enable-execute-stack-mprotect.c index 1ad77bd..41b2635 100644 --- a/libgcc/enable-execute-stack-mprotect.c +++ b/libgcc/enable-execute-stack-mprotect.c @@ -1,5 +1,5 @@ /* Implement __enable_execute_stack using mprotect(2). - Copyright (C) 2011 Free Software Foundation, Inc. + Copyright (C) 2011, 2012 Free Software Foundation, Inc. This file is part of GCC. @@ -62,33 +62,6 @@ check_enabling (void) static int need_enable_exec_stack = 1; #endif -#if defined __NetBSD__ -/* Note that we go out of our way to use namespace-non-invasive calls - here. Unfortunately, there is no libc-internal name for mprotect(). */ - -#include <sys/sysctl.h> - -extern int __sysctl (int *, unsigned int, void *, size_t *, void *, size_t); - -static int -getpagesize (void) -{ - static int size; - - if (size == 0) - { - int mib[2]; - size_t len; - - mib[0] = CTL_HW; - mib[1] = HW_PAGESIZE; - len = sizeof (size); - (void) __sysctl (mib, 2, &size, &len, NULL, 0); - } - return size; -} -#endif /* __NetBSD__ */ - /* Attempt to turn on access permissions for the stack. Unfortunately it is not possible to make this namespace-clean.*/ |