Mercurial > hg > release > icedtea7-2.6
changeset 12:69774809541a
2007-06-08 Gary Benson <gbenson@redhat.com>
* icedtea-ports.patch (control/make/hotspot-rules.gmk):
Correctly recognize ix86.
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Fri, 08 Jun 2007 11:44:22 -0400 |
| parents | 9f637db6488f |
| children | 3669e7bbc802 |
| files | ChangeLog icedtea-ports.patch |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 08 10:11:25 2007 -0400 +++ b/ChangeLog Fri Jun 08 11:44:22 2007 -0400 @@ -1,3 +1,8 @@ +2007-06-08 Gary Benson <gbenson@redhat.com> + + * icedtea-ports.patch (control/make/hotspot-rules.gmk): + Correctly recognize ix86. + 2007-06-08 Gary Benson <gbenson@redhat.com> * acinclude.m4 (SET_ARCH_DIRS):
--- a/icedtea-ports.patch Fri Jun 08 10:11:25 2007 -0400 +++ b/icedtea-ports.patch Fri Jun 08 11:44:22 2007 -0400 @@ -297,14 +297,16 @@ generic_export: $(EXPORT_LIST) diff -r 10dfd4e883b1 control/make/hotspot-rules.gmk --- openjdk/control/make/hotspot-rules.gmk Wed May 30 17:05:50 2007 -0400 -+++ openjdk/control/make/hotspot-rules.gmk Mon Jun 04 13:19:59 2007 +0100 -@@ -75,6 +75,11 @@ ifeq ($(DEBUG_NAME), fastdebug) ++++ openjdk/control/make/hotspot-rules.gmk Fri Jun 08 16:29:22 2007 +0100 +@@ -75,6 +75,13 @@ ifeq ($(DEBUG_NAME), fastdebug) HOTSPOT_TARGET = all_fastdebug endif +# Use the portable interpreter for platforms without a JIT -+ifeq ($(wildcard $(HOTSPOT_TOPDIR)/src/cpu/$(ARCH)/vm/$(ARCH).ad),) -+ HOTSPOT_TARGET := $(HOTSPOT_TARGET)core ++ifneq ($(ARCH), i586) ++ ifeq ($(wildcard $(HOTSPOT_TOPDIR)/src/cpu/$(ARCH)/vm/$(ARCH).ad),) ++ HOTSPOT_TARGET := $(HOTSPOT_TARGET)core ++ endif +endif + HOTSPOT_MAKE_ARGS += ALT_SLASH_JAVA=$(SLASH_JAVA)