Mercurial > hg > release > icedtea-1.10

changeset 804:43edef9724f0 cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-02-13 Gary Benson <gbenson@redhat.com> * acinclude.m4 (SET_CORE_BUILD): New check. * configure.ac: Call the above. * Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Add ICEDTEA_CORE_BUILD. (hotspot): Updated libjvm.so location. * configure, Makefile.in: Regenerated. * patches/icedtea-ports.patch: Use zero on ppc and ppc64. Removed everything relating to the ppc-specific port. Moved several hunks into icedtea-core-build.patch. * patches/icedtea-core-build.patch: Completely reworked. * ports/hotspot/build/linux/makefiles/ppc.make: Use zero. * ports/hotspot/build/linux/makefiles/ppc64.make: Likewise. * ports/hotspot/build/linux/platform_ppc: Likewise. * ports/hotspot/build/linux/platform_ppc64: Likewise. * ports/jdk/src/solaris/bin/alpha/jvm.cfg: Change default to core. * ports/jdk/src/solaris/bin/arm/jvm.cfg: Likewise. * ports/jdk/src/solaris/bin/mips/jvm.cfg: Likewise. * ports/jdk/src/solaris/bin/ppc/jvm.cfg: Likewise. * ports/jdk/src/solaris/bin/ppc64/jvm.cfg: Likewise. * ports/jdk/src/solaris/bin/s390/jvm.cfg: Likewise. * ports/jdk/src/solaris/bin/s390x/jvm.cfg: Likewise.
author Gary Benson <gbenson@redhat.com>
date Wed, 13 Feb 2008 08:23:39 -0500
parents e1f5ee2e2c0e
children 8310bd7a3ab2
files ChangeLog Makefile.am Makefile.in acinclude.m4 configure configure.ac patches/icedtea-core-build.patch patches/icedtea-ports.patch ports/hotspot/build/linux/makefiles/ppc.make ports/hotspot/build/linux/makefiles/ppc64.make ports/hotspot/build/linux/platform_ppc ports/hotspot/build/linux/platform_ppc64 ports/jdk/src/solaris/bin/alpha/jvm.cfg ports/jdk/src/solaris/bin/arm/jvm.cfg ports/jdk/src/solaris/bin/mips/jvm.cfg ports/jdk/src/solaris/bin/ppc/jvm.cfg ports/jdk/src/solaris/bin/ppc64/jvm.cfg ports/jdk/src/solaris/bin/s390/jvm.cfg ports/jdk/src/solaris/bin/s390x/jvm.cfg
diffstat 19 files changed, 353 insertions(+), 303 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 11 14:25:34 2008 -0500
+++ b/ChangeLog	Wed Feb 13 08:23:39 2008 -0500
@@ -1,3 +1,30 @@
+2008-02-13  Gary Benson  <gbenson@redhat.com>
+
+	* acinclude.m4 (SET_CORE_BUILD): New check.
+	* configure.ac: Call the above.
+	* Makefile.am
+	(ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Add ICEDTEA_CORE_BUILD.
+	(hotspot): Updated libjvm.so location.
+	* configure, Makefile.in: Regenerated.
+
+	* patches/icedtea-ports.patch: Use zero on ppc and ppc64.
+	Removed everything relating to the ppc-specific port.
+	Moved several hunks into icedtea-core-build.patch.
+	* patches/icedtea-core-build.patch: Completely reworked.
+
+	* ports/hotspot/build/linux/makefiles/ppc.make: Use zero.
+	* ports/hotspot/build/linux/makefiles/ppc64.make: Likewise.
+	* ports/hotspot/build/linux/platform_ppc: Likewise.
+	* ports/hotspot/build/linux/platform_ppc64: Likewise.
+
+	* ports/jdk/src/solaris/bin/alpha/jvm.cfg: Change default to core.
+	* ports/jdk/src/solaris/bin/arm/jvm.cfg: Likewise.
+	* ports/jdk/src/solaris/bin/mips/jvm.cfg: Likewise.
+	* ports/jdk/src/solaris/bin/ppc/jvm.cfg: Likewise.
+	* ports/jdk/src/solaris/bin/ppc64/jvm.cfg: Likewise.
+	* ports/jdk/src/solaris/bin/s390/jvm.cfg: Likewise.
+	* ports/jdk/src/solaris/bin/s390x/jvm.cfg: Likewise.
+
 2008-02-11  Lillian Angel  <langel@redhat.com>
 
 	* patches/icedtea-libraries.patch: Changed to dlopen libjpeg.so.62
--- a/Makefile.am	Mon Feb 11 14:25:34 2008 -0500
+++ b/Makefile.am	Wed Feb 13 08:23:39 2008 -0500
@@ -63,7 +63,8 @@
 	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
-	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
+	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -103,7 +104,8 @@
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
 	"GENSRCDIR=$(abs_top_srcdir)/generated" \
-	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
+	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -509,8 +511,8 @@
 	rm -f stamps/icedtea-ecj.stamp
 	rm -f stamps/icedtea-against-ecj.stamp
 	$(MAKE) hotspot-helper
-	cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/client/libjvm.so \
-	   openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/client
+	cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
+	   openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
 	@echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
 
 hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
--- a/Makefile.in	Mon Feb 11 14:25:34 2008 -0500
+++ b/Makefile.in	Wed Feb 13 08:23:39 2008 -0500
@@ -108,6 +108,7 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
+ICEDTEA_CORE_BUILD = @ICEDTEA_CORE_BUILD@
 INSTALL = @INSTALL@
 INSTALL_ARCH_DIR = @INSTALL_ARCH_DIR@
 INSTALL_DATA = @INSTALL_DATA@
@@ -969,8 +970,8 @@
 	rm -f stamps/icedtea-ecj.stamp
 	rm -f stamps/icedtea-against-ecj.stamp
 	$(MAKE) hotspot-helper
-	cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/client/libjvm.so \
-	   openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/client
+	cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
+	   openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
 	@echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
 
 hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
--- a/acinclude.m4	Mon Feb 11 14:25:34 2008 -0500
+++ b/acinclude.m4	Wed Feb 13 08:23:39 2008 -0500
@@ -18,6 +18,18 @@
   AC_SUBST(INSTALL_ARCH_DIR)
 ])
 
+AC_DEFUN([SET_CORE_BUILD],
+[
+  if test -f "ports/hotspot/build/linux/platform_${BUILD_ARCH_DIR}" && \
+     grep -q "arch.*=.*zero" "ports/hotspot/build/linux/platform_${BUILD_ARCH_DIR}"
+  then
+    ICEDTEA_CORE_BUILD=yes
+  else
+    ICEDTEA_CORE_BUILD=
+  fi
+  AC_SUBST(ICEDTEA_CORE_BUILD)
+])
+
 AC_DEFUN([FIND_JAVAC],
 [
   user_specified_javac=
--- a/configure	Mon Feb 11 14:25:34 2008 -0500
+++ b/configure	Wed Feb 13 08:23:39 2008 -0500
@@ -720,6 +720,7 @@
 WITH_ICEDTEA_FALSE
 BUILD_ARCH_DIR
 INSTALL_ARCH_DIR
+ICEDTEA_CORE_BUILD
 JAVA
 JAVAC
 JAVAH
@@ -4988,6 +4989,16 @@
 
 
 
+
+  if test -f "ports/hotspot/build/linux/platform_${BUILD_ARCH_DIR}" && \
+     grep -q "arch.*=.*zero" "ports/hotspot/build/linux/platform_${BUILD_ARCH_DIR}"
+  then
+    ICEDTEA_CORE_BUILD=yes
+  else
+    ICEDTEA_CORE_BUILD=
+  fi
+
+
 if test "${with_icedtea}" == true
 then
   JAVA=$SYSTEM_ICEDTEA_DIR/bin/java
@@ -10827,6 +10838,7 @@
 WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim
 BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
 INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
+ICEDTEA_CORE_BUILD!$ICEDTEA_CORE_BUILD$ac_delim
 JAVA!$JAVA$ac_delim
 JAVAC!$JAVAC$ac_delim
 JAVAH!$JAVAH$ac_delim
@@ -10884,7 +10896,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac	Mon Feb 11 14:25:34 2008 -0500
+++ b/configure.ac	Wed Feb 13 08:23:39 2008 -0500
@@ -96,6 +96,7 @@
 AM_CONDITIONAL(WITH_ICEDTEA, test "${with_icedtea}" == true)
 
 SET_ARCH_DIRS
+SET_CORE_BUILD
 if test "${with_icedtea}" == true
 then
   JAVA=$SYSTEM_ICEDTEA_DIR/bin/java
--- a/patches/icedtea-core-build.patch	Mon Feb 11 14:25:34 2008 -0500
+++ b/patches/icedtea-core-build.patch	Wed Feb 13 08:23:39 2008 -0500
@@ -1,12 +1,11 @@
 diff -ru openjdk.orig/control/make/hotspot-rules.gmk openjdk/control/make/hotspot-rules.gmk
 --- openjdk.orig/control/make/hotspot-rules.gmk	2007-10-12 08:45:09.000000000 +0100
 +++ openjdk/make/hotspot-rules.gmk	2007-11-08 09:40:57.000000000 +0000
-@@ -72,6 +72,11 @@
+@@ -72,6 +72,10 @@
    HOTSPOT_TARGET = all_fastdebug
  endif
  
-+# Use the special build targets on PPC for now
-+ifneq ($(filter ppc ppc64,$(ARCH)),)
++ifdef ICEDTEA_CORE_BUILD
 +  HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
 +endif
 +
@@ -56,7 +55,7 @@
  # Export file rule
  generic_export: $(EXPORT_LIST)
  export_product:
-@@ -207,17 +226,24 @@
+@@ -207,11 +226,17 @@
  C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
  C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
  KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
@@ -67,40 +66,63 @@
 +CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR)
  
 -# Misc files and generated files need to come from C1 or C2 area
--ifeq ($(ARCH_DATA_MODEL), 32)
--  MISC_DIR=$(C1_DIR)
--  GEN_DIR=$(C1_BASE_DIR)/generated
 +# Misc files and generated files need to come from the correct area
-+ifneq ($(filter ppc ppc64,$(ARCH)),)
++ifdef ICEDTEA_CORE_BUILD
 +  MISC_DIR=$(CORE_DIR)
 +  GEN_DIR=$(CORE_BASE_DIR)/generated
- else
--  MISC_DIR=$(C2_DIR)
--  GEN_DIR=$(C2_BASE_DIR)/generated
-+  ifeq ($(ARCH_DATA_MODEL), 32)
-+    MISC_DIR=$(C1_DIR)
-+    GEN_DIR=$(C1_BASE_DIR)/generated
-+  else
-+    MISC_DIR=$(C2_DIR)
-+    GEN_DIR=$(C2_BASE_DIR)/generated
-+  endif
++else
+ ifeq ($(ARCH_DATA_MODEL), 32)
+   MISC_DIR=$(C1_DIR)
+   GEN_DIR=$(C1_BASE_DIR)/generated
+@@ -219,6 +244,7 @@
+   MISC_DIR=$(C2_DIR)
+   GEN_DIR=$(C2_BASE_DIR)/generated
  endif
++endif
  
  # Bin files (windows)
-@@ -264,8 +290,13 @@
- ifneq ($(OSNAME),windows)
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
+ ifeq ($(OSNAME),windows)
+@@ -272,6 +298,10 @@
  	$(install-file)
-+ifneq ($(filter ppc ppc64,$(ARCH)),)
-+$(EXPORT_CLIENT_DIR)/%.so:       $(CORE_DIR)/%.so
+ $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
+ 	$(install-file)
++$(EXPORT_CORE_DIR)/%.so:         $(CORE_DIR)/%.so
++	$(install-file)
++$(EXPORT_CORE_DIR)/64/%.so:      $(CORE_DIR)/%.so
 +	$(install-file)
+ endif
+ 
+ # Jar file (sa-jdi.jar)
+@@ -296,7 +326,7 @@
+ 	$(install-file)
+ 
+ # Xusage file
+-$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
++$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt $(EXPORT_CORE_DIR)/Xusage.txt: $(XUSAGE)
+ 	$(prep-target)
+ 	$(RM) $@.temp
+ 	$(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
+diff -u openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2008-01-31 14:19:00.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-02-01 15:57:40.000000000 +0000
+@@ -93,6 +93,12 @@
+ VM_DEBUG=jvmg
+ 
+ EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
++ifdef ICEDTEA_CORE_BUILD
++EXPORT_CORE_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/core
++EXPORT_LIST += $(EXPORT_CORE_DIR)/Xusage.txt
++EXPORT_LIST += $(EXPORT_CORE_DIR)/libjsig.so
++EXPORT_LIST += $(EXPORT_CORE_DIR)/libjvm.so 
 +else
- $(EXPORT_CLIENT_DIR)/%.so:       $(C1_DIR)/%.so
- 	$(install-file)
+ EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+@@ -111,3 +117,4 @@
+       EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+     endif
+ endif
 +endif
- $(EXPORT_CLIENT_DIR)/64/%.so:    $(C1_DIR)/%.so
- 	$(install-file)
- $(EXPORT_SERVER_DIR)/%.so:       $(C2_DIR)/%.so
 diff -ru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
 --- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2007-10-12 08:46:18.000000000 +0100
 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2007-11-08 09:40:57.000000000 +0000
@@ -117,3 +139,196 @@
  #endif // TIERED
  #endif // KERNEL
  
+diff -ru openjdk.orig/jdk/make/common/shared/Defs-linux.gmk openjdk/jdk/make/common/shared/Defs-linux.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs-linux.gmk	2008-01-31 14:20:37.000000000 +0000
++++ openjdk/jdk/make/common/shared/Defs-linux.gmk	2008-02-04 10:06:07.000000000 +0000
+@@ -177,3 +177,13 @@
+ endif
+ HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
+ 
++# HOTSPOT_CORE_PATH: location of core jvm library file.
++ifdef ICEDTEA_CORE_BUILD
++  ifdef ALT_HOTSPOT_CORE_PATH
++    HOTSPOT_CORE_PATH :=$(call FullPath,$(ALT_HOTSPOT_CORE_PATH))
++  else
++    HOTSPOT_CORE_PATH   =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/core
++  endif
++  HOTSPOT_CORE_PATH:=$(call AltCheckValue,HOTSPOT_CORE_PATH)
++endif
++
+diff -ru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
+--- openjdk.orig/jdk/make/java/redist/Makefile	2008-01-31 14:20:37.000000000 +0000
++++ openjdk/jdk/make/java/redist/Makefile	2008-02-04 10:11:04.000000000 +0000
+@@ -40,6 +40,7 @@
+ 
+ SERVER_LOCATION = server
+ CLIENT_LOCATION = client
++CORE_LOCATION   = core
+ 
+ DB_SUFFIX = _db
+ 
+@@ -67,8 +68,7 @@
+ INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
+ 
+ # List of files coming from outside this workspace
+-IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
+-              $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
++IMPORT_LIST = 
+ 
+ # INCLUDE_SA is false on platforms where SA is not supported.
+ # On platforms where it is supported, we want to allow it to
+@@ -94,12 +94,42 @@
+   endif
+ endif # INCLUDE_SA
+ 
+-# Hotspot client is only available on 32-bit builds
+-ifeq ($(ARCH_DATA_MODEL), 32)
++# Include the client VM on platforms where it is supported.
++INCLUDE_CLIENT := $(shell if [ -r $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME) ]; then \
++                            $(ECHO) true; \
++                          else \
++                            $(ECHO) false; \
++                          fi)
++
++ifeq ($(INCLUDE_CLIENT), true)
+   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
+                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
+ endif
+ 
++# Include the server VM on platforms where it is supported.
++INCLUDE_SERVER := $(shell if [ -r $(HOTSPOT_SERVER_PATH)/$(JVM_NAME) ]; then \
++                            $(ECHO) true; \
++                          else \
++                            $(ECHO) false; \
++                          fi)
++
++ifeq ($(INCLUDE_SERVER), true)
++  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
++                 $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
++endif
++
++# Include the core VM on platforms where it is supported.
++INCLUDE_CORE := $(shell if [ -r $(HOTSPOT_CORE_PATH)/$(JVM_NAME) ]; then \
++                            $(ECHO) true; \
++                          else \
++                            $(ECHO) false; \
++                          fi)
++
++ifeq ($(INCLUDE_CORE), true)
++  IMPORT_LIST += $(LIB_LOCATION)/$(CORE_LOCATION)/$(JVM_NAME) \
++                 $(LIB_LOCATION)/$(CORE_LOCATION)/Xusage.txt
++endif
++
+ ifeq ($(PLATFORM), windows)
+ #  Windows     vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  Windows
+ 
+@@ -119,8 +149,7 @@
+ 	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
+ 	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME)
+ 
+-# Hotspot client is only available on 32-bit builds
+-ifeq ($(ARCH_DATA_MODEL), 32)
++ifeq ($(INCLUDE_CLIENT), true)
+   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
+                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME)
+ endif
+@@ -151,17 +180,25 @@
+ #  NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  NOT Windows
+ 
+ IMPORT_LIST += \
+-        $(LIB_LOCATION)/$(LIBJSIG_NAME) \
+-	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
++        $(LIB_LOCATION)/$(LIBJSIG_NAME)
+ 
+ ifeq ($(PLATFORM), solaris)
+   IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
+ endif 
+ 
+-ifeq ($(ARCH_DATA_MODEL), 32)
++ifeq ($(INCLUDE_CLIENT), true)
++  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
++endif
+ 
+-IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
++ifeq ($(INCLUDE_SERVER), true)
++  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
++endif
++
++ifeq ($(INCLUDE_CORE), true)
++  IMPORT_LIST += $(LIB_LOCATION)/$(CORE_LOCATION)/$(LIBJSIG_NAME)
++endif
+ 
++ifeq ($(ARCH_DATA_MODEL), 32)
+ ifeq ($(PLATFORM), solaris)
+ #  solaris   vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  solaris
+ 
+@@ -195,11 +232,25 @@
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
+ 	$(install-import-file)
+ 
+-$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_SERVER_PATH)/$(LIBJSIG_NAME)
++$(LIB_LOCATION)/$(CORE_LOCATION)/$(JVM_NAME): $(HOTSPOT_CORE_PATH)/$(JVM_NAME)
++	$(install-import-file)
++
++ifeq ($(INCLUDE_SERVER), true)
++  LIBJSIG_IMPORT_PATH = $(HOTSPOT_SERVER_PATH)
++else
++ifeq ($(INCLUDE_CLIENT), true)
++  LIBJSIG_IMPORT_PATH = $(HOTSPOT_CLIENT_PATH)
++else
++  LIBJSIG_IMPORT_PATH = $(HOTSPOT_CORE_PATH)
++endif
++endif
++
++$(LIB_LOCATION)/$(LIBJSIG_NAME): $(LIBJSIG_IMPORT_PATH)/$(LIBJSIG_NAME)
+ 	$(install-import-file)
+ 
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
+-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
++$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME) \
++$(LIB_LOCATION)/$(CORE_LOCATION)/$(LIBJSIG_NAME):
+ 	@$(prep-target)
+ 	$(LN) -s ../$(LIBJSIG_NAME) $@
+ 
+@@ -224,6 +275,9 @@
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.txt
+ 	$(install-import-file)
+ 
++$(LIB_LOCATION)/$(CORE_LOCATION)/Xusage.txt : $(HOTSPOT_CORE_PATH)/Xusage.txt
++	$(install-import-file)
++
+ ifeq ($(INCLUDE_SA), true)
+ # The Serviceability Agent is built in the Hotspot workspace.
+ # It contains two files:
+diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk	2007-11-08 11:35:35.000000000 +0000
++++ openjdk/jdk/make/common/Defs-linux.gmk	2007-11-08 11:36:15.000000000 +0000
+@@ -258,7 +258,11 @@ endif
+ # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
+ # the library itself should not.
+ #
+-VM_NAME         = server
++ifneq ($(wildcard $(LIBDIR)/$(LIBARCH)/server/libjvm.so),)
++  VM_NAME       = server
++else
++  VM_NAME       = core
++endif
+ JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
+ JAVALIB         = -ljava $(JVMLIB)
+ 
+diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
+--- openjdk.orig/corba/make/common/Defs-linux.gmk	Tue Feb 05 15:52:33 2008 +0000
++++ openjdk/corba/make/common/Defs-linux.gmk	Mon Feb 11 10:01:46 2008 +0000
+@@ -250,7 +254,11 @@ endif
+ # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
+ # the library itself should not.
+ #
+-VM_NAME         = server
++ifneq ($(wildcard $(BOOTDIR)/jre/lib/$(LIBARCH)/server/libjvm.so),)
++  VM_NAME       = server
++else
++  VM_NAME       = core
++endif
+ JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
+ JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
+ 
--- a/patches/icedtea-ports.patch	Mon Feb 11 14:25:34 2008 -0500
+++ b/patches/icedtea-ports.patch	Wed Feb 13 08:23:39 2008 -0500
@@ -1,20 +1,3 @@
-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 ($(filter ppc ppc64,$(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
@@ -39,7 +22,7 @@
 +  ARCH_DATA_MODEL  = 32
 +  PLATFORM         = linux-ppc
 +  VM_PLATFORM      = linux_ppc
-+  HS_ARCH          = ppc
++  HS_ARCH          = zero
 +endif
 +
 +# ppc64
@@ -48,44 +31,12 @@
 +  MAKE_ARGS        += LP64=1
 +  PLATFORM         = linux-ppc64
 +  VM_PLATFORM      = linux_ppc64
-+  HS_ARCH          = ppc
++  HS_ARCH          = zero
 +endif
 +
  JDK_INCLUDE_SUBDIR=linux
  
  # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
-@@ -94,20 +94,20 @@
- 
- EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
- EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
--EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
--EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
--EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
--ifeq ($(ARCH_DATA_MODEL), 32)
--  EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-+ifneq ($(filter ppc zero,$(HS_ARCH)),)
-   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
-   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
-+else
-+  EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-+  EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
-+  EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+  ifeq ($(ARCH_DATA_MODEL), 32)
-+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
-+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
-+  endif
-   EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
-   EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 
--else
--  ifeq ($(ARCH),ia64)
--    else
--      EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
--      EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
--    endif
- endif
 diff -ru openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
 --- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-11-08 11:36:15.000000000 +0000
@@ -101,43 +52,39 @@
 diff -ru openjdk.orig/hotspot/build/linux/makefiles/sa.make openjdk/hotspot/build/linux/makefiles/sa.make
 --- openjdk.orig/hotspot/build/linux/makefiles/sa.make	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/build/linux/makefiles/sa.make	2007-11-08 11:36:15.000000000 +0000
-@@ -51,10 +51,12 @@
+@@ -51,10 +51,10 @@
  SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
  
  # if $(AGENT_DIR) does not exist, we don't build SA
 -# also, we don't build SA on Itanium.
-+# also, we don't build SA on Itanium, PPC or zero.
++# also, we don't build SA on zero.
  
  all: 
 -	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
-+			     -a "$(SRCARCH)" != "ppc" \
-+			     -a "$(SRCARCH)" != "zero" ] ; then \
++	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "zero" ] ; then \
  	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
  	fi
  
 diff -ru openjdk.orig/hotspot/build/linux/makefiles/saproc.make openjdk/hotspot/build/linux/makefiles/saproc.make
 --- openjdk.orig/hotspot/build/linux/makefiles/saproc.make	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/build/linux/makefiles/saproc.make	2007-11-08 11:36:15.000000000 +0000
-@@ -44,10 +44,12 @@
+@@ -44,10 +44,10 @@
  DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
  
  # if $(AGENT_DIR) does not exist, we don't build SA
 -# also, we don't build SA on Itanium.
-+# also, we don't build SA on Itanium, PPC or zero.
++# also, we don't build SA on zero.
  
  checkAndBuildSA:
 -	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
-+					-a "$(SRCARCH)" != "ppc" \
-+                                       -a "$(SRCARCH)" != "zero" ] ; then \
++	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "zero" ] ; then \
  	   $(MAKE) -f vm.make $(LIBSAPROC); \
  	fi
  
 diff -ru openjdk.orig/hotspot/make/defs.make openjdk/hotspot/make/defs.make
 --- openjdk.orig/hotspot/make/defs.make	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/make/defs.make	2007-11-08 11:36:15.000000000 +0000
-@@ -191,15 +191,18 @@
+@@ -191,15 +191,17 @@
  
    # Use uname output for SRCARCH, but deal with platform differences. If ARCH
    # is not explicitly listed below, it is treated as x86. 
@@ -149,31 +96,25 @@
    ARCH/ia64   = ia64
    ARCH/amd64  = x86
    ARCH/x86_64 = x86
-+  ARCH/ppc    = ppc
-+  ARCH/ppc64  = ppc
++  ARCH/ppc    = zero
++  ARCH/ppc64  = zero
  
 -  # BUILDARCH is usually the same as SRCARCH, except for sparcv9
-+  # BUILDARCH is usually the same as SRCARCH, except for sparcv9,
-+  # ppc64 and zero
++  # BUILDARCH is usually the same as SRCARCH, except for sparcv9 and zero
    BUILDARCH = $(SRCARCH)
    ifeq ($(BUILDARCH), x86)
      ifdef LP64
-@@ -213,6 +216,14 @@
+@@ -213,6 +215,9 @@
        BUILDARCH = sparcv9
      endif
    endif
-+  ifeq ($(BUILDARCH), ppc)
-+    ifdef LP64
-+      BUILDARCH = ppc64
-+    endif
-+  endif
 +  ifeq ($(BUILDARCH), zero)
 +    BUILDARCH = $(ARCH)
 +  endif
  
    # LIBARCH is 1:1 mapping from BUILDARCH
    LIBARCH         = $(LIBARCH/$(BUILDARCH))
-@@ -221,8 +232,10 @@
+@@ -221,8 +226,10 @@
    LIBARCH/sparc   = sparc
    LIBARCH/sparcv9 = sparcv9
    LIBARCH/ia64    = ia64
@@ -268,7 +209,7 @@
 diff -ru openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp openjdk/hotspot/src/share/vm/utilities/macros.hpp
 --- openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/src/share/vm/utilities/macros.hpp	2007-11-08 11:36:15.000000000 +0000
-@@ -176,6 +176,30 @@
+@@ -176,6 +176,14 @@
  #define NOT_SPARC(code) code
  #endif
  
@@ -280,22 +221,6 @@
 +#define NOT_PPC(code) code
 +#endif
 +
-+#ifdef PPC32
-+#define PPC32_ONLY(code) code
-+#define NOT_PPC32(code)
-+#else
-+#define PPC32_ONLY(code)
-+#define NOT_PPC32(code) code
-+#endif
-+
-+#ifdef PPC64
-+#define PPC64_ONLY(code) code
-+#define NOT_PPC64(code)
-+#else
-+#define PPC64_ONLY(code)
-+#define NOT_PPC64(code) code
-+#endif
-+
  #define FIX_THIS(code) report_assertion_failure("FIX_THIS",__FILE__, __LINE__, "")
  
  #define define_pd_global(type, name, value) const type pd_##name = value;
@@ -313,19 +238,6 @@
  CFLAGS_REQUIRED         =  $(CFLAGS_REQUIRED_$(ARCH))
  LDFLAGS_COMMON          += $(LDFLAGS_COMMON_$(ARCH))
  
-@@ -258,7 +262,11 @@ endif
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
- # the library itself should not.
- #
--VM_NAME         = server
-+ifneq ("$(findstring ppc,$(ARCH))", "")
-+  VM_NAME       = client
-+else
-+  VM_NAME       = server
-+endif
- JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
- JAVALIB         = -ljava $(JVMLIB)
- 
 diff -r 37a05a11f281 make/common/shared/Compiler-gcc.gmk
 --- a/jdk/make/common/shared/Compiler-gcc.gmk       Sat Dec 01 00:00:00 2007 +0000
 +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk       Wed Jan 23 14:02:23 2008 +0100
@@ -422,126 +334,6 @@
  endif
  
  
-diff -r e0f34106b206 openjdk-ecj/jdk/make/common/shared/Defs-linux.gmk
---- openjdk/jdk/make/common/shared/Defs-linux.gmk	Wed Nov 21 11:02:08 2007 +0000
-+++ openjdk/jdk/make/common/shared/Defs-linux.gmk	Wed Nov 21 11:26:37 2007 +0000
-@@ -160,14 +160,12 @@ HOTSPOT_IMPORT_PATH:=$(call AltCheckValu
- HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
- 
- # HOTSPOT_CLIENT_PATH: location of client jvm library file.
--ifeq ($(ARCH_DATA_MODEL), 32)
--  ifdef ALT_HOTSPOT_CLIENT_PATH
--    HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
--  else
--    HOTSPOT_CLIENT_PATH   =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
--  endif
--  HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
-+ifdef ALT_HOTSPOT_CLIENT_PATH
-+  HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
-+else
-+  HOTSPOT_CLIENT_PATH   =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
- endif
-+HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
- 
- # HOTSPOT_SERVER_PATH: location of server jvm library file.
- ifdef ALT_HOTSPOT_SERVER_PATH
-diff -ru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
---- openjdk.orig/jdk/make/java/redist/Makefile	2007-10-12 08:54:05.000000000 +0100
-+++ openjdk/jdk/make/java/redist/Makefile	2007-11-08 09:40:57.000000000 +0000
-@@ -67,8 +67,7 @@
- INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
- 
- # List of files coming from outside this workspace
--IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
--              $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
-+IMPORT_LIST = 
- 
- # INCLUDE_SA is false on platforms where SA is not supported.
- # On platforms where it is supported, we want to allow it to
-@@ -94,12 +93,30 @@
-   endif
- endif # INCLUDE_SA
- 
--# Hotspot client is only available on 32-bit builds
--ifeq ($(ARCH_DATA_MODEL), 32)
-+# Include the client VM on platforms where it is supported.
-+INCLUDE_CLIENT := $(shell if [ -r $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME) ]; then \
-+                            $(ECHO) true; \
-+                          else \
-+                            $(ECHO) false; \
-+                          fi)
-+
-+ifeq ($(INCLUDE_CLIENT), true)
-   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
-                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
- endif
- 
-+# Include the server VM on platforms where it is supported.
-+INCLUDE_SERVER := $(shell if [ -r $(HOTSPOT_SERVER_PATH)/$(JVM_NAME) ]; then \
-+                            $(ECHO) true; \
-+                          else \
-+                            $(ECHO) false; \
-+                          fi)
-+
-+ifeq ($(INCLUDE_SERVER), true)
-+  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
-+                 $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
-+endif
-+
- ifeq ($(PLATFORM), windows)
- #  Windows     vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  Windows
- 
-@@ -119,8 +136,7 @@
- 	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
- 	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME)
- 
--# Hotspot client is only available on 32-bit builds
--ifeq ($(ARCH_DATA_MODEL), 32)
-+ifeq ($(INCLUDE_CLIENT), true)
-   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
-                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME)
- endif
-@@ -151,17 +167,21 @@
- #  NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  NOT Windows
- 
- IMPORT_LIST += \
--        $(LIB_LOCATION)/$(LIBJSIG_NAME) \
--	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
-+        $(LIB_LOCATION)/$(LIBJSIG_NAME)
- 
- ifeq ($(PLATFORM), solaris)
-   IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
- endif 
- 
--ifeq ($(ARCH_DATA_MODEL), 32)
-+ifeq ($(INCLUDE_CLIENT), true)
-+  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-+endif
- 
--IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-+ifeq ($(INCLUDE_SERVER), true)
-+  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
-+endif
- 
-+ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), solaris)
- #  solaris   vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  solaris
- 
-@@ -195,7 +215,13 @@ endif # PLATFORM
- $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
- 	$(install-import-file)
- 
--$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_SERVER_PATH)/$(LIBJSIG_NAME)
-+ifeq ($(INCLUDE_SERVER), true)
-+  LIBJSIG_IMPORT_PATH = $(HOTSPOT_SERVER_PATH)
-+else
-+  LIBJSIG_IMPORT_PATH = $(HOTSPOT_CLIENT_PATH)
-+endif
-+
-+$(LIB_LOCATION)/$(LIBJSIG_NAME): $(LIBJSIG_IMPORT_PATH)/$(LIBJSIG_NAME)
- 	$(install-import-file)
- 
- $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
 diff -r 37a05a11f281 make/javax/sound/SoundDefs.gmk
 --- a/jdk/make/javax/sound/SoundDefs.gmk    Sat Dec 01 00:00:00 2007 +0000
 +++ openjdk/jdk/make/javax/sound/SoundDefs.gmk    Wed Jan 23 14:39:17 2008 +0100
@@ -643,19 +435,6 @@
  CFLAGS_REQUIRED         =  $(CFLAGS_REQUIRED_$(ARCH))
  LDFLAGS_COMMON          += $(LDFLAGS_COMMON_$(ARCH))
  
-@@ -250,7 +254,11 @@ endif
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
- # the library itself should not.
- #
--VM_NAME         = server
-+ifneq ("$(findstring ppc,$(ARCH))", "")
-+  VM_NAME       = client
-+else
-+  VM_NAME       = server
-+endif
- JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
- JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
- 
 diff -ru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk-ecj/corba/make/common/shared/Compiler-gcc.gmk
 --- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk	2007-11-09 14:12:27.000000000 +0000
 +++ openjdk/corba/make/common/shared/Compiler-gcc.gmk	2007-11-09 14:13:45.000000000 +0000
--- a/ports/hotspot/build/linux/makefiles/ppc.make	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/hotspot/build/linux/makefiles/ppc.make	Wed Feb 13 08:23:39 2008 -0500
@@ -1,6 +1,6 @@
 #
 # Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# Copyright 2007 Red Hat, Inc.
+# Copyright 2007, 2008 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,6 @@
 #
 #
 
-# Not included in includeDB because it has no dependencies
-Obj_Files += linux_ppc.o
-
 # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
 OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
 # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--- a/ports/hotspot/build/linux/makefiles/ppc64.make	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/hotspot/build/linux/makefiles/ppc64.make	Wed Feb 13 08:23:39 2008 -0500
@@ -1,6 +1,6 @@
 #
 # Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# Copyright 2007 Red Hat, Inc.
+# Copyright 2007, 2008 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,6 @@
 #
 #
 
-# Not included in includeDB because it has no dependencies
-Obj_Files += linux_ppc64.o
-
 # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
 OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
 # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--- a/ports/hotspot/build/linux/platform_ppc	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/hotspot/build/linux/platform_ppc	Wed Feb 13 08:23:39 2008 -0500
@@ -1,12 +1,12 @@
 os_family = linux
 
-arch = ppc
+arch = zero
 
-arch_model = ppc
+arch_model = zero
 
-os_arch = linux_ppc
+os_arch = linux_zero
 
-os_arch_model = linux_ppc
+os_arch_model = linux_zero
 
 lib_arch = ppc
 
@@ -14,4 +14,4 @@
 
 gnu_dis_arch = ppc
 
-sysdefs = -DLINUX -D_GNU_SOURCE -DPPC -DPPC32 -DCC_INTERP -DXXX_EVIL_EVIL_EVIL
+sysdefs = -DLINUX -D_GNU_SOURCE -DPPC -DCC_INTERP -DZERO
--- a/ports/hotspot/build/linux/platform_ppc64	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/hotspot/build/linux/platform_ppc64	Wed Feb 13 08:23:39 2008 -0500
@@ -1,12 +1,12 @@
 os_family = linux
 
-arch = ppc
+arch = zero
 
-arch_model = ppc
+arch_model = zero
 
-os_arch = linux_ppc
+os_arch = linux_zero
 
-os_arch_model = linux_ppc
+os_arch_model = linux_zero
 
 lib_arch = ppc
 
@@ -14,4 +14,4 @@
 
 gnu_dis_arch = ppc
 
-sysdefs = -DLINUX -D_GNU_SOURCE -DPPC -DPPC64 -DCC_INTERP -DXXX_EVIL_EVIL_EVIL
+sysdefs = -DLINUX -D_GNU_SOURCE -DPPC -DCC_INTERP -DZERO
--- a/ports/jdk/src/solaris/bin/alpha/jvm.cfg	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/jdk/src/solaris/bin/alpha/jvm.cfg	Wed Feb 13 08:23:39 2008 -0500
@@ -36,9 +36,10 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client KNOWN
+-core KNOWN
+-client IGNORE
+-server IGNORE
 -hotspot ERROR
 -classic WARN
--server IGNORE
 -native ERROR
 -green ERROR
--- a/ports/jdk/src/solaris/bin/arm/jvm.cfg	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/jdk/src/solaris/bin/arm/jvm.cfg	Wed Feb 13 08:23:39 2008 -0500
@@ -36,9 +36,10 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client KNOWN
+-core KNOWN
+-client IGNORE
+-server IGNORE
 -hotspot ERROR
 -classic WARN
--server IGNORE
 -native ERROR
 -green ERROR
--- a/ports/jdk/src/solaris/bin/mips/jvm.cfg	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/jdk/src/solaris/bin/mips/jvm.cfg	Wed Feb 13 08:23:39 2008 -0500
@@ -36,9 +36,10 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client KNOWN
+-core KNOWN
+-client IGNORE
+-server IGNORE
 -hotspot ERROR
 -classic WARN
--server IGNORE
 -native ERROR
 -green ERROR
--- a/ports/jdk/src/solaris/bin/ppc/jvm.cfg	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/jdk/src/solaris/bin/ppc/jvm.cfg	Wed Feb 13 08:23:39 2008 -0500
@@ -36,9 +36,10 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client KNOWN
+-core KNOWN
+-client IGNORE
+-server IGNORE
 -hotspot ERROR
 -classic WARN
--server IGNORE
 -native ERROR
 -green ERROR
--- a/ports/jdk/src/solaris/bin/ppc64/jvm.cfg	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/jdk/src/solaris/bin/ppc64/jvm.cfg	Wed Feb 13 08:23:39 2008 -0500
@@ -36,9 +36,10 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client KNOWN
+-core KNOWN
+-client IGNORE
+-server IGNORE
 -hotspot ERROR
 -classic WARN
--server IGNORE
 -native ERROR
 -green ERROR
--- a/ports/jdk/src/solaris/bin/s390/jvm.cfg	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/jdk/src/solaris/bin/s390/jvm.cfg	Wed Feb 13 08:23:39 2008 -0500
@@ -36,9 +36,10 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client KNOWN
+-core KNOWN
+-client IGNORE
+-server IGNORE
 -hotspot ERROR
 -classic WARN
--server IGNORE
 -native ERROR
 -green ERROR
--- a/ports/jdk/src/solaris/bin/s390x/jvm.cfg	Mon Feb 11 14:25:34 2008 -0500
+++ b/ports/jdk/src/solaris/bin/s390x/jvm.cfg	Wed Feb 13 08:23:39 2008 -0500
@@ -36,9 +36,10 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client KNOWN
+-core KNOWN
+-client IGNORE
+-server IGNORE
 -hotspot ERROR
 -classic WARN
--server IGNORE
 -native ERROR
 -green ERROR