changeset in /hg/icedtea: 2007-09-13 Christan Thalinger <twist...

[Christian Thalinger]

changeset 2698d7b2eed8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2698d7b2eed8
description:
	2007-09-13  Christan Thalinger  <twisti at complang.tuwien.ac.at>

		* patches/icedtea-cacao-instrument-Makefile.patch: New file.

diffstat:

2 files changed, 17 insertions(+)
ChangeLog                                       |    4 ++++
patches/icedtea-cacao-instrument-Makefile.patch |   13 +++++++++++++

diffs (28 lines):

diff -r 8b0be2eafb18 -r 2698d7b2eed8 ChangeLog
--- a/ChangeLog	Wed Sep 12 23:13:50 2007 +0200
+++ b/ChangeLog	Thu Sep 13 11:52:25 2007 +0200
@@ -1,3 +1,7 @@ 2007-09-12  Christan Thalinger  <twisti@
+2007-09-13  Christan Thalinger  <twisti at complang.tuwien.ac.at>
+
+	* patches/icedtea-cacao-instrument-Makefile.patch: New file.
+
 2007-09-12  Christan Thalinger  <twisti at complang.tuwien.ac.at>
 
 	* Makefile.am: Added WITH_CACAO stuff.
diff -r 8b0be2eafb18 -r 2698d7b2eed8 patches/icedtea-cacao-instrument-Makefile.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao-instrument-Makefile.patch	Thu Sep 13 11:52:25 2007 +0200
@@ -0,0 +1,13 @@
+Index: j2se/make/java/instrument/Makefile
+===================================================================
+--- j2se/make/java/instrument/Makefile	(revision 250)
++++ openjdk/j2se/make/java/instrument/Makefile	(working copy)
+@@ -109,7 +109,7 @@ else
+     LDFLAGS += -R \$$ORIGIN/jli
+   endif
+   ifeq ($(PLATFORM), linux)
+-    LDFLAGS += -z origin
++    LDFLAGS += -Xlinker -z -Xlinker origin
+     LDFLAGS += -Wl,--allow-shlib-undefined
+     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
+   endif