changeset in /hg/icedtea: 2007-11-22 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 94c2e42c06f5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=94c2e42c06f5
description:
	2007-11-22  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-core-build.patch
		* patches/icedtea-ports.patch: Rearrange such that removing
		the core build patch will cause a compiler 1 build.

diffstat:

3 files changed, 43 insertions(+), 7 deletions(-)
ChangeLog                        |    6 ++++++
patches/icedtea-core-build.patch |   27 ++++++++++++++++++++-------
patches/icedtea-ports.patch      |   17 +++++++++++++++++

diffs (101 lines):

diff -r fa015cc6070f -r 94c2e42c06f5 ChangeLog
--- a/ChangeLog	Thu Nov 22 03:20:24 2007 -0500
+++ b/ChangeLog	Thu Nov 22 03:25:43 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-22  Gary Benson  <gbenson at redhat
+2007-11-22  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch
+	* patches/icedtea-ports.patch: Rearrange such that removing
+	the core build patch will cause a compiler 1 build.
+
 2007-11-22  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-core-build.patch
diff -r fa015cc6070f -r 94c2e42c06f5 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Thu Nov 22 03:20:24 2007 -0500
+++ b/patches/icedtea-core-build.patch	Thu Nov 22 03:25:43 2007 -0500
@@ -14,8 +14,8 @@ diff -ru openjdk.orig/control/make/hotsp
  HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
  HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
 diff -ru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile	2007-10-12 08:45:12.000000000 +0100
-+++ openjdk/hotspot/make/Makefile	2007-11-08 09:40:57.000000000 +0000
+--- openjdk.orig/hotspot/make/Makefile	2007-10-30 08:46:19.000000000 +0000
++++ openjdk/hotspot/make/Makefile	2007-11-21 16:10:20.000000000 +0000
 @@ -91,6 +91,15 @@
  all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
  all_optimized: optimized optimized1 optimizedkernel docs export_optimized
@@ -38,12 +38,25 @@ diff -ru openjdk.orig/hotspot/make/Makef
  
 +$(CORE_VM_TARGETS):
 +	$(CD) $(GAMMADIR)/make; \
-+	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
++	$(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
 +
  # Build compiler1 (client) rule, different for platforms
  generic_build1:
  	$(MKDIR) -p $(OUTPUTDIR)
-@@ -207,17 +220,24 @@
+@@ -177,6 +190,12 @@
+ 	@$(ECHO) "No kernel ($(VM_TARGET)) for OS_NAME=$(OSNAME)"
+ endif
+ 
++generic_buildcore:
++	$(MKDIR) -p $(OUTPUTDIR)
++	$(CD) $(OUTPUTDIR); \
++	    $(MAKE) -f $(ABS_OS_MAKEFILE) \
++		      $(MAKE_ARGS) $(VM_TARGET)
++
+ # Export file rule
+ generic_export: $(EXPORT_LIST)
+ export_product:
+@@ -207,17 +226,24 @@
  C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
  C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
  KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
@@ -74,7 +87,7 @@ diff -ru openjdk.orig/hotspot/make/Makef
  endif
  
  # Bin files (windows)
-@@ -264,8 +284,13 @@
+@@ -264,8 +290,13 @@
  ifneq ($(OSNAME),windows)
  $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
  	$(install-file)
@@ -97,10 +110,10 @@ diff -ru openjdk.orig/hotspot/src/share/
  #else
 +#if defined(COMPILER1) || defined(COMPILER2)
    #define VMTYPE COMPILER1_PRESENT("Client")   \
-                  COMPILER2_PRESENT("Server")   
+                  COMPILER2_PRESENT("Server")
 +#else
 +  #define VMTYPE "Core"
 +#endif // COMPILER1 || COMPILER2
  #endif // TIERED
  #endif // KERNEL
-
+ 
diff -r fa015cc6070f -r 94c2e42c06f5 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch	Thu Nov 22 03:20:24 2007 -0500
+++ b/patches/icedtea-ports.patch	Thu Nov 22 03:25:43 2007 -0500
@@ -1,3 +1,20 @@ diff -ru openjdk.orig/hotspot/build/linu
+diff -ru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
+--- openjdk.orig/hotspot/make/Makefile	2007-11-21 14:49:24.000000000 +0000
++++ openjdk/hotspot/make/Makefile	2007-11-21 14:50:04.000000000 +0000
+@@ -167,9 +167,13 @@
+                       BuildUser=$(USERNAME) \
+ 		      $(MAKE_ARGS) $(VM_TARGET)
+ else
++  ifeq ($(findstring ppc,$(ARCH)),)
+ 	$(CD) $(OUTPUTDIR); \
+ 	    $(MAKE) -f $(ABS_OS_MAKEFILE) \
+ 		      $(MAKE_ARGS) $(VM_TARGET)
++  else
++	@$(ECHO) "No compiler2 ($(VM_TARGET)) for ARCH=$(ARCH)"
++  endif
+ endif
+ 
+ generic_buildkernel:
 diff -ru openjdk.orig/hotspot/build/linux/makefiles/buildtree.make openjdk/hotspot/build/linux/makefiles/buildtree.make
 --- openjdk.orig/hotspot/build/linux/makefiles/buildtree.make	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/build/linux/makefiles/buildtree.make	2007-11-08 11:36:15.000000000 +0000