Mercurial > hg > release > icedtea6-1.5
changeset 1589:60f5ceb2ad2e default tip
2009-08-27 Kees Cook <kees@canonical.com>
* patches/hotspot/default/icedtea-gcc-stack-markings.patch: New.
Adding stack markings to the x86 assembly for not using executable
stack.
| author | doko@ubuntu.com |
|---|---|
| date | Thu, 27 Aug 2009 17:48:27 +0200 |
| parents | ff13d97de406 |
| children | |
| files | ChangeLog Makefile.am patches/hotspot/default/icedtea-gcc-stack-markings.patch |
| diffstat | 3 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Dec 13 22:32:25 2009 +0100 +++ b/ChangeLog Thu Aug 27 17:48:27 2009 +0200 @@ -4,6 +4,12 @@ icedtea-6897844-xshm.patch, icedtea-linux-separate-debuginfo.patch. +2009-08-27 Kees Cook <kees@canonical.com> + + * patches/hotspot/default/icedtea-gcc-stack-markings.patch: New. + Adding stack markings to the x86 assembly for not using executable + stack. + 2009-12-13 Mark Wielaard <mjw@redhat.com> * Makefile.am (stamps/icedtea.stamp): Install jstack.stp.
--- a/Makefile.am Sun Dec 13 22:32:25 2009 +0100 +++ b/Makefile.am Thu Aug 27 17:48:27 2009 +0200 @@ -710,6 +710,7 @@ patches/icedtea-disable-cc-incompatible-sanity-checks.patch \ patches/icedtea-explicit-target-arch.patch \ patches/openjdk/6648816.patch \ + patches/hotspot/$(HSBUILD)/icedtea-gcc-stack-markings.patch \ $(DISTRIBUTION_PATCHES) stamps/extract.stamp: stamps/download.stamp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/default/icedtea-gcc-stack-markings.patch Thu Aug 27 17:48:27 2009 +0200 @@ -0,0 +1,14 @@ +--- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s~ 2009-08-06 01:08:57.000000000 -0700 ++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s 2009-08-06 01:09:27.000000000 -0700 +@@ -650,3 +650,4 @@ _Atomic_cmpxchg_long: + popl %ebx + ret + ++.section .note.GNU-stack, "", @progbits +--- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s~ 2009-08-06 01:08:57.000000000 -0700 ++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s 2009-08-06 01:09:27.000000000 -0700 +@@ -400,3 +400,4 @@ _Atomic_cmpxchg_long: + addq $4,%rdx + jg 4b + ret ++.section .note.GNU-stack, "", @progbits