/hg/icedtea6: Replace rh676659-gcc-export-dynamic.patch with ups...

[omajid at icedtea.classpath.org]

changeset 9f374bb0cb94 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9f374bb0cb94
author: Omair Majid <omajid at redhat.com>
date: Fri May 06 10:59:07 2011 -0400

	Replace rh676659-gcc-export-dynamic.patch with upstream's fix.

	2011-05-06 Omair Majid <omajid at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Replace
	patches/rh676659-gcc-export-dynamic.patch with the upstream fix
	patches/openjdk/7041156-gcc_export_dynamic.patch.
	       * patches/openjdk/7041156-gcc_export_dynamic.patch: New file.
	       * patches/rh676659-gcc-export-dynamic.patch: Remove file.


diffstat:

 ChangeLog                                        |   8 ++++++++
 Makefile.am                                      |   2 +-
 patches/openjdk/7041156-gcc_export_dynamic.patch |  21 +++++++++++++++++++++
 patches/rh676659-gcc-export-dynamic.patch        |  11 -----------
 4 files changed, 30 insertions(+), 12 deletions(-)

diffs (69 lines):

diff -r 90783fa340bb -r 9f374bb0cb94 ChangeLog
--- a/ChangeLog	Thu May 05 18:40:02 2011 -0400
+++ b/ChangeLog	Fri May 06 10:59:07 2011 -0400
@@ -1,3 +1,11 @@
+2011-05-06  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Replace
+	patches/rh676659-gcc-export-dynamic.patch with the upstream fix
+	patches/openjdk/7041156-gcc_export_dynamic.patch.
+	* patches/openjdk/7041156-gcc_export_dynamic.patch: New file.
+	* patches/rh676659-gcc-export-dynamic.patch: Remove file.
+
 2011-05-05  Omair Majid  <omajid at redhat.com>
 
 	* patches/shark-build-hotspot.patch,
diff -r 90783fa340bb -r 9f374bb0cb94 Makefile.am
--- a/Makefile.am	Thu May 05 18:40:02 2011 -0400
+++ b/Makefile.am	Fri May 06 10:59:07 2011 -0400
@@ -305,7 +305,7 @@
 	patches/openjdk/4493128-CubicCurve2D.patch \
 	patches/openjdk/4645692-CubicCurve2D.solveCubic.patch \
 	patches/no-static-linking.patch \
-	patches/rh676659-gcc-export-dynamic.patch \
+	patches/openjdk/7041156-gcc_export_dynamic.patch \
 	patches/g344659-sparc_fix.patch \
 	patches/openjdk/6728834-blurred-lcd-aa-text.patch \
 	patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \
diff -r 90783fa340bb -r 9f374bb0cb94 patches/openjdk/7041156-gcc_export_dynamic.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7041156-gcc_export_dynamic.patch	Fri May 06 10:59:07 2011 -0400
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User dsamersoff
+# Date 1304432695 -14400
+# Node ID 250642c729b42043ea99e5e4e27d153b0c766da0
+# Parent  405c634f4aaa2e91cc87598c60a4ece6e345e5b1
+7041156: gcc 4.6 doesn't recognise -export-dynamic option
+Summary: Since -export-dynamic is a linker option, the correct way to pass it is -Xlinker -export-dynamic
+Reviewed-by: dsamersoff, dholmes
+Contributed-by: omajid at redhat.com
+
+diff -r 405c634f4aaa -r 250642c729b4 make/linux/makefiles/gcc.make
+--- openjdk/hotspot/make/linux/makefiles/gcc.make	Mon May 02 14:53:49 2011 -0700
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	Tue May 03 18:24:55 2011 +0400
+@@ -205,7 +205,7 @@
+ SHARED_FLAG = -shared
+ 
+ # Keep symbols even they are not used
+-AOUT_FLAGS += -export-dynamic
++AOUT_FLAGS += -Xlinker -export-dynamic
+ 
+ #------------------------------------------------------------------------
+ # Debug flags
diff -r 90783fa340bb -r 9f374bb0cb94 patches/rh676659-gcc-export-dynamic.patch
--- a/patches/rh676659-gcc-export-dynamic.patch	Thu May 05 18:40:02 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-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