/hg/icedtea6: 2009-12-08 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset 0a5b1c9b3fcf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0a5b1c9b3fcf
author: Gary Benson <gbenson at redhat.com>
date: Tue Dec 08 16:13:23 2009 +0000

	2009-12-08 Gary Benson <gbenson at redhat.com>

	 * Makefile.am (ICEDTEA_SHARK_BUILD): Set to "yes"
	instead of "true". (ICEDTEA_ENV): Replaced
	ICEDTEA_SHARK_BUILD with SHARK_BUILD. (ICEDTEA_ENV_ECJ):
	Likewise.
		* patches/icedtea-shark-build.patch: Changed to reflect the above.
		* patches/icedtea-shark-build-hotspot.patch: Likewise.


diffstat:

4 files changed, 18 insertions(+), 9 deletions(-)
ChangeLog                                 |    9 +++++++++
Makefile.am                               |    6 +++---
patches/icedtea-shark-build-hotspot.patch |   10 +++++-----
patches/icedtea-shark-build.patch         |    2 +-

diffs (106 lines):

diff -r 833a7998e7f0 -r 0a5b1c9b3fcf ChangeLog
--- a/ChangeLog	Tue Dec 08 13:15:30 2009 +0000
+++ b/ChangeLog	Tue Dec 08 16:13:23 2009 +0000
@@ -1,3 +1,12 @@ 2009-12-08  Gary Benson  <gbenson at redhat
+2009-12-08  Gary Benson  <gbenson at redhat.com>
+
+	* Makefile.am
+	(ICEDTEA_SHARK_BUILD): Set to "yes" instead of "true".
+	(ICEDTEA_ENV): Replaced ICEDTEA_SHARK_BUILD with SHARK_BUILD.
+	(ICEDTEA_ENV_ECJ): Likewise.
+	* patches/icedtea-shark-build.patch: Changed to reflect the above.
+	* patches/icedtea-shark-build-hotspot.patch: Likewise.
+
 2009-12-08  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/make/linux/platform_zero.in: New file.
diff -r 833a7998e7f0 -r 0a5b1c9b3fcf Makefile.am
--- a/Makefile.am	Tue Dec 08 13:15:30 2009 +0000
+++ b/Makefile.am	Tue Dec 08 16:13:23 2009 +0000
@@ -151,7 +151,7 @@ else
   ICEDTEA_ZERO_BUILD =
 endif
 if SHARK_BUILD
-  ICEDTEA_SHARK_BUILD = yes
+  ICEDTEA_SHARK_BUILD = true
 else
   ICEDTEA_SHARK_BUILD =
 endif
@@ -176,7 +176,7 @@ ICEDTEA_ENV = \
 	CLASSPATH="" \
 	LD_LIBRARY_PATH="" \
 	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
-	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
+	SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
 	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
 	ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
 	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
@@ -260,7 +260,7 @@ ICEDTEA_ENV_ECJ = \
 	LD_LIBRARY_PATH="" \
 	GENSRCDIR="$(abs_top_builddir)/generated" \
 	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
-	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
+	SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
 	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
 	ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
 	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
diff -r 833a7998e7f0 -r 0a5b1c9b3fcf patches/icedtea-shark-build-hotspot.patch
--- a/patches/icedtea-shark-build-hotspot.patch	Tue Dec 08 13:15:30 2009 +0000
+++ b/patches/icedtea-shark-build-hotspot.patch	Tue Dec 08 16:13:23 2009 +0000
@@ -119,7 +119,7 @@ diff -Nru openjdk.orig/hotspot/make/linu
  ifdef ICEDTEA_ZERO_BUILD
  CFLAGS += $(LIBFFI_CFLAGS)
  endif
-+ifdef ICEDTEA_SHARK_BUILD
++ifeq ($(SHARK_BUILD), true)
 +CFLAGS += $(LLVM_CFLAGS)
 +endif
  CFLAGS += $(VM_PICFLAG)
@@ -144,7 +144,7 @@ diff -Nru openjdk.orig/hotspot/make/linu
  STATIC_CXX = true
  
 -ifeq ($(ZERO_LIBARCH), ppc64)
-+ifdef ICEDTEA_SHARK_BUILD
++ifeq ($(SHARK_BUILD), true)
    STATIC_CXX = false
  else
 -  STATIC_CXX = true
@@ -160,7 +160,7 @@ diff -Nru openjdk.orig/hotspot/make/linu
  ifdef ICEDTEA_ZERO_BUILD
  LIBS_VM += $(LIBFFI_LIBS)
  endif
-+ifdef ICEDTEA_SHARK_BUILD
++ifeq ($(SHARK_BUILD), true)
 +LFLAGS_VM += $(LLVM_LDFLAGS)
 +LIBS_VM   += $(LLVM_LIBS)
 +endif
@@ -228,7 +228,7 @@ diff -Nru openjdk.orig/hotspot/make/Make
  
  # Misc files and generated files need to come from C1 or C2 area
  ifeq ($(ZERO_BUILD), true)
-+ifdef ICEDTEA_SHARK_BUILD
++ifeq ($(SHARK_BUILD), true)
 +  MISC_DIR=$(SHARK_DIR)
 +  GEN_DIR=$(SHARK_BASE_DIR)/generated
 +else
@@ -242,7 +242,7 @@ diff -Nru openjdk.orig/hotspot/make/Make
  # Shared Library
  ifneq ($(OSNAME),windows)
    ifeq ($(ZERO_BUILD), true)
-+    ifdef ICEDTEA_SHARK_BUILD
++    ifeq ($(SHARK_BUILD), true)
 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so
 +	$(install-file)
 +$(EXPORT_SERVER_DIR)/%.so:       $(SHARK_DIR)/%.so
diff -r 833a7998e7f0 -r 0a5b1c9b3fcf patches/icedtea-shark-build.patch
--- a/patches/icedtea-shark-build.patch	Tue Dec 08 13:15:30 2009 +0000
+++ b/patches/icedtea-shark-build.patch	Tue Dec 08 16:13:23 2009 +0000
@@ -6,7 +6,7 @@ diff -r 8e41d25d7665 openjdk/control/mak
  
  ifeq ($(ZERO_BUILD), true)
 -  HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
-+  ifdef ICEDTEA_SHARK_BUILD
++  ifeq ($(SHARK_BUILD), true)
 +    HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
 +  else
 +    HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero