File icedtea6-replace-gcc-stack-marking.patch of Package java-1_6_0-openjdk.import5329

# HG changeset patch
# User Omair Majid <omajid@redhat.com>
# Date 1304632673 14400
# Node ID 012505ce3d0d03fa54072e9189f555b239278f8c
# Parent  50ed8053ec2f1f65f5d88f9f24826c8c15bc1771
Backport S7019808. Replace gcc-stack-markings.patch with upstream's fix

2011-05-05  Omair Majid  <omajid@redhat.com>

       * Makefile.am (ICEDTEA_PATCHES): Replace patches/gcc-stack-markings.patch
       with patches/openjdk/7019808-stack_noexec.patch.
       * patches/gcc-stack-markings.patch: Remove
       * patches/openjdk/7019808-stack_noexec.patch: Fix from upstream.

Index: icedtea6-1.10.2/Makefile.am
===================================================================
--- icedtea6-1.10.2.orig/Makefile.am	2011-05-25 18:35:41.452875471 +0200
+++ icedtea6-1.10.2/Makefile.am	2011-06-14 14:45:04.116091426 +0200
@@ -276,7 +276,7 @@
 	patches/java2d-stroker-internal-close-joint.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 \
Index: icedtea6-1.10.2/patches/gcc-stack-markings.patch
===================================================================
--- icedtea6-1.10.2.orig/patches/gcc-stack-markings.patch	2011-05-25 18:34:31.327069382 +0200
+++ /dev/null	1970-01-01 00:00:00.000000000 +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
Index: icedtea6-1.10.2/patches/openjdk/7019808-stack_noexec.patch
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ icedtea6-1.10.2/patches/openjdk/7019808-stack_noexec.patch	2011-06-14 14:45:04.118091426 +0200
@@ -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.