changeset 1562:52b6f4605e43

Merge.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 27 Jan 2009 02:27:28 +0000
parents 9302e22fea74 (current diff) 8fb35b2a8847 (diff)
children 70396cb4abf8
files .hgignore ChangeLog HACKING IcedTeaPlugin.cc Makefile.am acinclude.m4 configure.ac hotspot.map javac.in overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java patches/hotspot/original/icedtea-shark-build.patch patches/hotspot/original/icedtea-text-relocations.patch patches/hotspot/original/icedtea-version.patch patches/icedtea-hotspot7-build-fixes.patch patches/icedtea-rhino.patch patches/icedtea-zero.patch ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp ports/hotspot/src/share/vm/shark/sharkBlock.cpp ports/hotspot/src/share/vm/shark/sharkFunction.cpp
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jan 27 02:23:20 2009 +0000
+++ b/ChangeLog	Tue Jan 27 02:27:28 2009 +0000
@@ -586,6 +586,18 @@
 
 2008-12-04  Andrew John Hughes  <ahughes@redhat.com>
 
+	* Makefile.am:
+	Prefix make invocations with
+	ARCH_PREFIX.  Pass the host, target and
+	build aliases through to the CACAO sub-configure.
+	* acinclude.m4:
+	Define ARCH_PREFIX to ${LINUX32} for
+	x86 and ppc architectures.
+	* configure.ac:
+	Check for linux32.
+
+2008-12-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	Merge from IcedTea6.
 	* patches/icedtea-ecj-jopt.patch,
 	* patches/icedtea-ecj-pr261.patch,