Mercurial > hg > release > icedtea-1.10
changeset 826:1d258e380781 cacao
2008-02-18 Gary Benson <gbenson@redhat.com>
* patches/icedtea-zero.patch: Correctly locate the platform file.
author | Gary Benson <gbenson@redhat.com> |
---|---|
date | Mon, 18 Feb 2008 08:13:08 -0500 |
parents | fce4a5258537 |
children | 0eb60a3cf6f0 |
files | ChangeLog patches/icedtea-zero.patch |
diffstat | 2 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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@redhat.com> + + * patches/icedtea-zero.patch: Correctly locate the platform file. + 2008-02-18 Gary Benson <gbenson@redhat.com> * configure.ac: Check for libffi whenever building with zero.
--- 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 @@ LIBS_VM += $(STATIC_STDCXX) $(LIBS) endif +ifeq ($(SRCARCH), zero) -+LIBS_VM += -lffi ++LIBS_VM += $(LIBFFI_LIBS) +endif + @@ -109,3 +109,18 @@ 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)