diff options
| author | David Turner <digit@android.com> | 2010-04-30 09:04:09 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-04-30 09:04:09 -0700 |
| commit | f68bf0c483879d30c4d97b9eaf8f9eb558ea1c45 (patch) | |
| tree | cbe07ea97dce3e9d76b78c63f2a3464ad57a9ec9 /gcc-4.2.1/gcc/config/arm/libunwind.S | |
| parent | c2511ac51c9e6e6b8cd9900d6159d46718414012 (diff) | |
| parent | 7bbf60e7d1d437a9b07a900c2e4b5e6a431020b1 (diff) | |
| download | toolchain_gcc-f68bf0c483879d30c4d97b9eaf8f9eb558ea1c45.tar.gz toolchain_gcc-f68bf0c483879d30c4d97b9eaf8f9eb558ea1c45.tar.bz2 toolchain_gcc-f68bf0c483879d30c4d97b9eaf8f9eb558ea1c45.zip | |
Merge "Add GNU-stack annotation to Android code."
Diffstat (limited to 'gcc-4.2.1/gcc/config/arm/libunwind.S')
| -rw-r--r-- | gcc-4.2.1/gcc/config/arm/libunwind.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gcc-4.2.1/gcc/config/arm/libunwind.S b/gcc-4.2.1/gcc/config/arm/libunwind.S index 81e4236f6..47625e3c1 100644 --- a/gcc-4.2.1/gcc/config/arm/libunwind.S +++ b/gcc-4.2.1/gcc/config/arm/libunwind.S @@ -26,6 +26,12 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +/* An executable stack is *not* required for these functions. */ +#if defined(__ELF__) && defined(__linux__) +.section .note.GNU-stack,"",%progbits +.previous +#endif + #ifndef __symbian__ #include "lib1funcs.asm" |