diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-02-04 22:13:20 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-02-04 22:13:20 +0000 |
| commit | b8df40b734d3df9979fd578556fa1d70f2ada743 (patch) | |
| tree | ba33735d41593ea1abc8140011952a572c1a6feb /libc/sysdeps/s390 | |
| parent | e1bdacc1e71d0c59aa53f7ea1de37c3f8912d3b8 (diff) | |
Merge changes between r12321 and r12643 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@12751 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/s390')
| -rw-r--r-- | libc/sysdeps/s390/stackinfo.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libc/sysdeps/s390/stackinfo.h b/libc/sysdeps/s390/stackinfo.h index 7e09c85b9..058dff6ba 100644 --- a/libc/sysdeps/s390/stackinfo.h +++ b/libc/sysdeps/s390/stackinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,7 +22,13 @@ #ifndef _STACKINFO_H #define _STACKINFO_H 1 +#include <elf.h> + /* On s390 the stack grows down. */ #define _STACK_GROWS_DOWN 1 +/* Default to an executable stack. PF_X can be overridden if PT_GNU_STACK is + * present, but it is presumed absent. */ +#define DEFAULT_STACK_PERMS (PF_R|PF_W|PF_X) + #endif /* stackinfo.h */ |