changeset in /hg/icedtea: 2008-02-18 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 1d258e380781 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1d258e380781
description:
	2008-02-18  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-zero.patch: Correctly locate the platform file.

diffstat:

2 files changed, 20 insertions(+), 1 deletion(-)
ChangeLog                  |    4 ++++
patches/icedtea-zero.patch |   17 ++++++++++++++++-

diffs (42 lines):

diff -r fce4a5258537 -r 1d258e380781 ChangeLog
--- a/ChangeLog	Mon Feb 18 08:04:20 2008 -0500
+++ b/ChangeLog	Mon Feb 18 08:13:08 2008 -0500
@@ -1,3 +1,7 @@ 2008-02-18  Gary Benson  <gbenson at redhat
+2008-02-18  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-zero.patch: Correctly locate the platform file.
+
 2008-02-18  Gary Benson  <gbenson at redhat.com>
 
 	* configure.ac: Check for libffi whenever building with zero.
diff -r fce4a5258537 -r 1d258e380781 patches/icedtea-zero.patch
--- a/patches/icedtea-zero.patch	Mon Feb 18 08:04:20 2008 -0500
+++ b/patches/icedtea-zero.patch	Mon Feb 18 08:13:08 2008 -0500
@@ -93,7 +93,7 @@ diff -ru openjdk/hotspot/src/share/vm/ut
    LIBS_VM                  += $(STATIC_STDCXX) $(LIBS)
  endif
 +ifeq ($(SRCARCH), zero)
-+LIBS_VM += -lffi
++LIBS_VM += $(LIBFFI_LIBS)
 +endif
 +
  
@@ -109,3 +109,18 @@ diff -ru openjdk/hotspot/src/share/vm/ut
  CFLAGS += $(VM_PICFLAG)
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
+diff -r 8e9761ee6dd6 openjdk/hotspot/build/linux/makefiles/buildtree.make
+--- openjdk/hotspot/build/linux/makefiles/buildtree.make	Mon Feb 18 11:56:36 2008 +0000
++++ openjdk/hotspot/build/linux/makefiles/buildtree.make	Mon Feb 18 12:03:06 2008 +0000
+@@ -60,7 +60,11 @@ QUIETLY$(MAKE_VERBOSE)	= @
+ # For now, until the compiler is less wobbly:
+ TESTFLAGS	= -Xbatch -showversion
+ 
++ifeq ($(ARCH), zero)
++PLATFORM_FILE	= $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(BUILDARCH)
++else
+ PLATFORM_FILE	= $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(ARCH)
++endif
+ 
+ ifdef FORCE_TIERED
+ ifeq		($(VARIANT),tiered)