/hg/icedtea6: Backport S7019808. Replace gcc-stack-markings.patc...

[omajid at icedtea.classpath.org]

changeset 012505ce3d0d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=012505ce3d0d
author: Omair Majid <omajid at redhat.com>
date: Thu May 05 17:57:53 2011 -0400

	Backport S7019808. Replace gcc-stack-markings.patch with upstream's
	fix

	2011-05-05 Omair Majid <omajid at 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.


diffstat:

 ChangeLog                                  |   7 +++++++
 Makefile.am                                |   2 +-
 patches/gcc-stack-markings.patch           |  12 ------------
 patches/openjdk/7019808-stack_noexec.patch |  22 ++++++++++++++++++++++
 4 files changed, 30 insertions(+), 13 deletions(-)

diffs (71 lines):

diff -r 50ed8053ec2f -r 012505ce3d0d ChangeLog
--- a/ChangeLog	Thu May 05 14:26:49 2011 +0200
+++ b/ChangeLog	Thu May 05 17:57:53 2011 -0400
@@ -1,3 +1,10 @@
+2011-05-05  Omair Majid  <omajid at 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.
+
 2011-05-05  Xerxes RÃ¥nby  <xranby at zafena.se>
 
 	CACAO threadlist & threadobject improvements.
diff -r 50ed8053ec2f -r 012505ce3d0d Makefile.am
--- a/Makefile.am	Thu May 05 14:26:49 2011 +0200
+++ b/Makefile.am	Thu May 05 17:57:53 2011 -0400
@@ -262,7 +262,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 50ed8053ec2f -r 012505ce3d0d patches/gcc-stack-markings.patch
--- a/patches/gcc-stack-markings.patch	Thu May 05 14:26:49 2011 +0200
+++ /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 50ed8053ec2f -r 012505ce3d0d patches/openjdk/7019808-stack_noexec.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7019808-stack_noexec.patch	Thu May 05 17:57:53 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.