Skip to content

R
riscv-gcc-1
Commit c6c621d4 by Geoffrey Keating Committed by Geoffrey Keating
Options

darwin.h (ENABLE_EXECUTE_STACK): New, use getpagesize not __sysctl. 

	* config/darwin.h (ENABLE_EXECUTE_STACK): New, use getpagesize not
	__sysctl.
	* config/rs6000/darwin.h (ENABLE_EXECUTE_STACK): Remove.
	* config/i386/darwin.h (ENABLE_EXECUTE_STACK): Remove.

From-SVN: r117274
parent f3ed85f6
Showing with 45 additions and 94 deletions
gcc/ChangeLog
2006-09-27 Geoffrey Keating <geoffk@apple.com>
* config/darwin.h (ENABLE_EXECUTE_STACK): New, use getpagesize not
__sysctl.
* config/rs6000/darwin.h (ENABLE_EXECUTE_STACK): Remove.
* config/i386/darwin.h (ENABLE_EXECUTE_STACK): Remove.
2006-09-28 Kaz Kojima <kkojima@gcc.gnu.org> 2006-09-28 Kaz Kojima <kkojima@gcc.gnu.org>
* config/sh/sh.md (divsi_inv_m0): Remove unused variable. * config/sh/sh.md (divsi_inv_m0): Remove unused variable.
......
gcc/config/darwin.h
...@@ -886,4 +886,42 @@ void add_framework_path (char *); ...@@ -886,4 +886,42 @@ void add_framework_path (char *);
#define TARGET_ASM_OUTPUT_ANCHOR NULL #define TARGET_ASM_OUTPUT_ANCHOR NULL
#endif #endif
/* Attempt to turn on execute permission for the stack. This may be
used by INITIALIZE_TRAMPOLINE of the target needs it (that is,
if the target machine can change execute permissions on a page).
There is no way to query the execute permission of the stack, so
we always issue the mprotect() call.
Unfortunately it is not possible to make this namespace-clean.
Also note that no errors should be emitted by this code; it is
considered dangerous for library calls to send messages to
stdout/stderr. */
#define ENABLE_EXECUTE_STACK \
extern void __enable_execute_stack (void *); \
void \
__enable_execute_stack (void *addr) \
{ \
extern int mprotect (void *, size_t, int); \
extern int getpagesize (void); \
static int size; \
static long mask; \
\
char *page, *end; \
\
if (size == 0) \
{ \
size = getpagesize(); \
mask = ~((long) size - 1); \
} \
\
page = (char *) (((long) addr) & mask); \
end = (char *) ((((long) (addr + (TARGET_64BIT ? 48 : 40))) & mask) + size); \
\
/* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */ \
(void) mprotect (page, end - page, 7); \
}
#endif /* CONFIG_DARWIN_H */ #endif /* CONFIG_DARWIN_H */
gcc/config/i386/darwin.h
...@@ -204,53 +204,6 @@ extern void darwin_x86_file_end (void); ...@@ -204,53 +204,6 @@ extern void darwin_x86_file_end (void);
: (n) >= 11 && (n) <= 18 ? (n) + 1 \ : (n) >= 11 && (n) <= 18 ? (n) + 1 \
: (n)) : (n))
/* Attempt to turn on execute permission for the stack. This may be
used by INITIALIZE_TRAMPOLINE of the target needs it (that is,
if the target machine can change execute permissions on a page).
There is no way to query the execute permission of the stack, so
we always issue the mprotect() call.
Note that we go out of our way to use namespace-non-invasive calls
here. Unfortunately, there is no libc-internal name for mprotect().
Also note that no errors should be emitted by this code; it is
considered dangerous for library calls to send messages to
stdout/stderr. */
#define ENABLE_EXECUTE_STACK \
extern void __enable_execute_stack (void *); \
void \
__enable_execute_stack (void *addr) \
{ \
extern int mprotect (void *, size_t, int); \
extern int __sysctl (int *, unsigned int, void *, size_t *, \
void *, size_t); \
\
static int size; \
static long mask; \
\
char *page, *end; \
\
if (size == 0) \
{ \
int mib[2]; \
size_t len; \
\
mib[0] = 6; /* CTL_HW */ \
mib[1] = 7; /* HW_PAGESIZE */ \
len = sizeof (size); \
(void) __sysctl (mib, 2, &size, &len, NULL, 0); \
mask = ~((long) size - 1); \
} \
\
page = (char *) (((long) addr) & mask); \
end = (char *) ((((long) (addr + TRAMPOLINE_SIZE)) & mask) + size); \
\
/* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */ \
(void) mprotect (page, end - page, 7); \
}
#undef REGISTER_TARGET_PRAGMAS #undef REGISTER_TARGET_PRAGMAS
#define REGISTER_TARGET_PRAGMAS() DARWIN_REGISTER_TARGET_PRAGMAS() #define REGISTER_TARGET_PRAGMAS() DARWIN_REGISTER_TARGET_PRAGMAS()
......
gcc/config/rs6000/darwin.h
...@@ -441,50 +441,3 @@ do { \ ...@@ -441,50 +441,3 @@ do { \
(TARGET_64BIT \ (TARGET_64BIT \
|| (darwin_macosx_version_min \ || (darwin_macosx_version_min \
&& strverscmp (darwin_macosx_version_min, "10.3") >= 0)) && strverscmp (darwin_macosx_version_min, "10.3") >= 0))
/* Attempt to turn on execute permission for the stack. This may be
used by INITIALIZE_TRAMPOLINE of the target needs it (that is,
if the target machine can change execute permissions on a page).
There is no way to query the execute permission of the stack, so
we always issue the mprotect() call.
Note that we go out of our way to use namespace-non-invasive calls
here. Unfortunately, there is no libc-internal name for mprotect().
Also note that no errors should be emitted by this code; it is
considered dangerous for library calls to send messages to
stdout/stderr. */
#define ENABLE_EXECUTE_STACK \
extern void __enable_execute_stack (void *); \
void \
__enable_execute_stack (void *addr) \
{ \
extern int mprotect (void *, size_t, int); \
extern int __sysctl (int *, unsigned int, void *, size_t *, \
void *, size_t); \
\
static int size; \
static long mask; \
\
char *page, *end; \
\
if (size == 0) \
{ \
int mib[2]; \
size_t len; \
\
mib[0] = 6; /* CTL_HW */ \
mib[1] = 7; /* HW_PAGESIZE */ \
len = sizeof (size); \
(void) __sysctl (mib, 2, &size, &len, NULL, 0); \
mask = ~((long) size - 1); \
} \
\
page = (char *) (((long) addr) & mask); \
end = (char *) ((((long) (addr + (TARGET_64BIT ? 48 : 40))) & mask) + size); \
\
/* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */ \
(void) mprotect (page, end - page, 7); \
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment