# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1297645206 0
# Node ID 82703ea0d4bc52688a4bd7e1283a63d3a5ca4fb5
# Parent  3439c902908c43991075d101e2344f78db870063
RH676659: Pass -export-dynamic option to linker not gcc.

2011-02-13  Andrew John Hughes  <ahughes@redhat.com>

	* NEWS: Updated.

2011-02-11  Omair Majid  <omajid@redhat.com>

	RH676659: Pass -export-dynamic option to linker not gcc.
	* Makefile.am: Add new patch.
	* patches/rh676659-gcc-export-dynamic.patch:
	Pass -Wl,-export-dynamic rather than -export-dynamic.

diff -r 3439c902908c -r 82703ea0d4bc ChangeLog
--- a/ChangeLog	Sun Feb 13 19:06:09 2011 +0000
+++ b/ChangeLog	Mon Feb 14 01:00:06 2011 +0000
@@ -1,3 +1,14 @@
+2011-02-13  Andrew John Hughes  <ahughes@redhat.com>
+
+	* NEWS: Updated.
+
+2011-02-11  Omair Majid  <omajid@redhat.com>
+
+	RH676659: Pass -export-dynamic option to linker not gcc.
+	* Makefile.am: Add new patch.
+	* patches/rh676659-gcc-export-dynamic.patch:
+	Pass -Wl,-export-dynamic rather than -export-dynamic.
+
 2011-02-13  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS: Updated.
diff -r 3439c902908c -r 82703ea0d4bc Makefile.am
--- a/Makefile.am	Sun Feb 13 19:06:09 2011 +0000
+++ b/Makefile.am	Mon Feb 14 01:00:06 2011 +0000
@@ -334,7 +334,8 @@
 	patches/openjdk/6795356-proxylazyvalue-leak.patch \
 	patches/openjdk/6687968-pngimagereader_mem_leak.patch \
 	patches/openjdk/6541476-png-iTXt-chunk.patch \
-	patches/openjdk/6782079-png_metadata_oom.patch
+	patches/openjdk/6782079-png_metadata_oom.patch \
+	patches/rh676659-gcc-export-dynamic.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 3439c902908c -r 82703ea0d4bc NEWS
--- a/NEWS	Sun Feb 13 19:06:09 2011 +0000
+++ b/NEWS	Mon Feb 14 01:00:06 2011 +0000
@@ -19,6 +19,8 @@
   - S6985453, CVE-2010-4471: Java2D font-related system property leak
   - S6927050, CVE-2010-4470: JAXP untrusted component state manipulation
   - Vulnerability in permissions assigned to applets with multiple JARs
+* Bug fixes
+  - RH676659: Pass -export-dynamic flag to linker using -Wl, as option in gcc 4.6+ is broken
 
 New in release 1.9.6 (2011-02-09):
 
diff -r 3439c902908c -r 82703ea0d4bc patches/rh676659-gcc-export-dynamic.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/rh676659-gcc-export-dynamic.patch	Mon Feb 14 01:00:06 2011 +0000
@@ -0,0 +1,12 @@
+diff -r 55b9f498dbce make/linux/makefiles/gcc.make
+--- openjdk/hotspot/make/linux/makefiles/gcc.make	Thu Feb 10 16:24:29 2011 -0800
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	Fri Feb 11 18:09:21 2011 -0500
+@@ -196,7 +196,7 @@
+ SHARED_FLAG = -shared
+ 
+ # Keep symbols even they are not used
+-AOUT_FLAGS += -export-dynamic
++AOUT_FLAGS += -Wl,-export-dynamic
+ 
+ #------------------------------------------------------------------------
+ # Debug flags