Mercurial > hg > icedtea11
view patches/jamvm/noexecstack.patch @ 2647:b1d858e368bb
PR2523: Add executable stack markings to callNative.S on JamVM
2015-07-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2523: Add executable stack markings
to callNative.S on JamVM
* Makefile.am:
(ICEDTEA_PATCHES): Add patch.
* NEWS: Updated.
* patches/jamvm/noexecstack.patch:
Add notes to assembly files in order to
turn off executable stack.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 01 Apr 2016 00:54:40 +0100 |
| parents | |
| children |
line wrap: on
line source
diff --git a/src/os/linux/arm/callNative.S jamvm/jamvm/src/os/linux/arm/callNative.S index 245afd1..1583023 100644 --- jamvm.orig/jamvm/src/os/linux/arm/callNative.S +++ jamvm/jamvm/src/os/linux/arm/callNative.S @@ -36,3 +36,7 @@ #include "callNativeOABI.S" #endif #endif + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git jamvm.orig/jamvm/src/os/linux/mips/callNative.S jamvm/jamvm/src/os/linux/mips/callNative.S index cede343..90d9163 100644 --- jamvm.orig/jamvm/src/os/linux/mips/callNative.S +++ jamvm/jamvm/src/os/linux/mips/callNative.S @@ -184,3 +184,7 @@ return: j $31 .end callJNIMethod #endif + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git jamvm.orig/jamvm/src/os/linux/powerpc/callNative.S jamvm/jamvm/src/os/linux/powerpc/callNative.S index aa47f6a..763dc0a 100644 --- jamvm.orig/jamvm/src/os/linux/powerpc/callNative.S +++ jamvm/jamvm/src/os/linux/powerpc/callNative.S @@ -281,3 +281,7 @@ return: mr 1,11 blr #endif + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git jamvm.orig/jamvm/src/os/linux/x86_64/callNative.S jamvm/jamvm/src/os/linux/x86_64/callNative.S index 26404e6..9fb5cdf 100644 --- jamvm.orig/jamvm/src/os/linux/x86_64/callNative.S +++ jamvm/jamvm/src/os/linux/x86_64/callNative.S @@ -267,3 +267,7 @@ float_ret: addq $8, %rcx jmp return #endif + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif