RFC: Replace gcc-stack-markings.patch in icedtea6 with upstream's fix

[Dr Andrew John Hughes]

On 14:21 Wed 04 May     , Omair Majid wrote:
> Hi,
> 
> The attached patch for icedtea6 replaces 
> patches/gcc-stack-markings.patch with the fix applied upstream [1]. 
> Instead of adding an elf section named .note.GNU-stack, upstream chose 
> to explicitly indicate to the linker that the stack should be marked as 
> non-executable. There should be no functional change as a result of 
> applying this patch (well, unless your linker doesnt support -z 
> noexecstack ...).
> 
> The reason I am applying this is to remove custom patches from icedtea6 
> and to bring icedtea6 and icedtea7 closer together.
> 
> Any thoughts or comments? doko, since you committed the original patch, 
> do you have any particular concerns?
> 
> Cheers,
> Omair
> 
> [1] http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/dddc5753c53a

I vaguely recall the upstream fix now.  Please commit this.

> diff -r 45472ac9981b Makefile.am
> --- a/Makefile.am	Wed May 04 10:11:54 2011 -0400
> +++ b/Makefile.am	Wed May 04 14:15:37 2011 -0400
> @@ -263,7 +263,7 @@
>  	patches/dnd-filelists.patch \
>  	patches/disable-cc-incompatible-sanity-checks.patch \
>  	patches/explicit-target-arch.patch \
> -	patches/gcc-stack-markings.patch \
> +	patches/openjdk/7019808-stack_noexec.patch \
>  	patches/parisc.patch \
>  	patches/sh4-support.patch \
>  	patches/policy-evaluation.patch \
> diff -r 45472ac9981b NEWS
> --- a/NEWS	Wed May 04 10:11:54 2011 -0400
> +++ b/NEWS	Wed May 04 14:15:37 2011 -0400
> @@ -24,6 +24,7 @@
>    - S6986968: Crash on XIM server restart
>    - S7018387: Xrender pipeline may leak GC's
>    - S7036754: Stroked quads sometimes contain NaN
> +  - S7019808: build fails on Fedora 14: SELinux run-time check: execution of stack in libjvm.so
>  * Bug fixes
>    - PR637: make check should exit with an error code if any regression test failed.
>    - G356743: Support libpng 1.5.
> diff -r 45472ac9981b patches/gcc-stack-markings.patch
> --- a/patches/gcc-stack-markings.patch	Wed May 04 10:11:54 2011 -0400
> +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
> @@ -1,14 +0,0 @@
> ---- 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
> diff -r 45472ac9981b patches/openjdk/7019808-stack_noexec.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/openjdk/7019808-stack_noexec.patch	Wed May 04 14:15:37 2011 -0400
> @@ -0,0 +1,23 @@
> +# HG changeset patch
> +# User dsamersoff
> +# Date 1304097180 -14400
> +# Node ID dddc5753c53a063c94c9949c623babe4f946c7e6
> +# Parent  0cddebc420d8b0fff85f4e0071d531e966372b80
> +7019808: build fails on Fedora 14: SELinux run-time check: execution of stack in libjvm.so
> +Summary: executable flag is set in the elf header of libjvm.so during build, instruct ld to don't do it.
> +Reviewed-by: acorn, phh
> +
> +diff -r 0cddebc420d8 -r dddc5753c53a make/linux/makefiles/vm.make
> +--- openjdk/hotspot/make/linux/makefiles/vm.make	Thu Apr 28 08:24:46 2011 -0700
> ++++ openjdk/hotspot/make/linux/makefiles/vm.make	Fri Apr 29 21:13:00 2011 +0400
> +@@ -102,6 +102,10 @@
> + CFLAGS += $(EXTRA_CFLAGS)
> + LFLAGS += $(EXTRA_CFLAGS)
> + 
> ++# Don't set excutable bit on stack segment
> ++# the same could be done by separate execstack command
> ++LFLAGS += -Xlinker -z -Xlinker noexecstack
> ++
> + LIBS += -lm -ldl -lpthread
> + 
> + # By default, link the *.o into the library, not the executable.


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37