changeset in /hg/icedtea: 2007-11-22 Gary Benson <gbenson at redh...
Gary Benson
gbenson at redhat.com
Thu Nov 22 00:20:47 PST 2007
changeset fa015cc6070f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fa015cc6070f
description:
2007-11-22 Gary Benson <gbenson at redhat.com>
* patches/icedtea-core-build.patch
* patches/icedtea-ports.patch:
Build libjvm.so as client rather than server
* patches/icedtea-ecj.patch: Remake for the above.
* ports/jdk/src/solaris/bin/ppc/jvm.cfg
* ports/jdk/src/solaris/bin/ppc64/jvm.cfg:
Updated for the above.
diffstat:
6 files changed, 187 insertions(+), 72 deletions(-)
ChangeLog | 10 +
patches/icedtea-core-build.patch | 65 +----------
patches/icedtea-ecj.patch | 6 -
patches/icedtea-ports.patch | 170 +++++++++++++++++++++++++++++--
ports/jdk/src/solaris/bin/ppc/jvm.cfg | 4
ports/jdk/src/solaris/bin/ppc64/jvm.cfg | 4
diffs (355 lines):
diff -r 207c632eea9e -r fa015cc6070f ChangeLog
--- a/ChangeLog Tue Nov 20 08:36:56 2007 -0500
+++ b/ChangeLog Thu Nov 22 03:20:24 2007 -0500
@@ -1,3 +1,13 @@ 2007-11-20 Gary Benson <gbenson at redhat
+2007-11-22 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-core-build.patch
+ * patches/icedtea-ports.patch:
+ Build libjvm.so as client rather than server
+ * patches/icedtea-ecj.patch: Remake for the above.
+ * ports/jdk/src/solaris/bin/ppc/jvm.cfg
+ * ports/jdk/src/solaris/bin/ppc64/jvm.cfg:
+ Updated for the above.
+
2007-11-20 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
diff -r 207c632eea9e -r fa015cc6070f patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Tue Nov 20 08:36:56 2007 -0500
+++ b/patches/icedtea-core-build.patch Thu Nov 22 03:20:24 2007 -0500
@@ -74,20 +74,20 @@ diff -ru openjdk.orig/hotspot/make/Makef
endif
# Bin files (windows)
-@@ -268,8 +288,13 @@
+@@ -264,8 +284,13 @@
+ ifneq ($(OSNAME),windows)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
$(install-file)
++ifneq ($(findstring ppc,$(ARCH)),)
++$(EXPORT_CLIENT_DIR)/%.so: $(CORE_DIR)/%.so
++ $(install-file)
++else
+ $(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so
+ $(install-file)
++endif
$(EXPORT_CLIENT_DIR)/64/%.so: $(C1_DIR)/%.so
$(install-file)
-+ifneq ($(findstring ppc,$(ARCH)),)
-+$(EXPORT_SERVER_DIR)/%.so: $(CORE_DIR)/%.so
-+ $(install-file)
-+else
$(EXPORT_SERVER_DIR)/%.so: $(C2_DIR)/%.so
- $(install-file)
-+endif
- $(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so
- $(install-file)
- endif
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
@@ -104,48 +104,3 @@ diff -ru openjdk.orig/hotspot/src/share/
#endif // TIERED
#endif // KERNEL
-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
-@@ -94,8 +94,14 @@
- 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
-@@ -119,8 +125,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
-@@ -158,10 +163,11 @@
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
- endif
-
--ifeq ($(ARCH_DATA_MODEL), 32)
--
--IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-+ifeq ($(INCLUDE_CLIENT), true)
-+ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-+endif
-
-+ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), solaris)
- # solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris
-
diff -r 207c632eea9e -r fa015cc6070f patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Tue Nov 20 08:36:56 2007 -0500
+++ b/patches/icedtea-ecj.patch Thu Nov 22 03:20:24 2007 -0500
@@ -266,9 +266,9 @@
@$(java-vm-cleanup)
--- openjdk.old/corba/make/common/Defs-linux.gmk 2007-10-12 03:49:13.000000000 -0400
+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2007-10-31 13:57:35.000000000 -0400
-@@ -256,7 +256,7 @@
- #
- VM_NAME = server
+@@ -260,7 +260,7 @@
+ VM_NAME = server
+ endif
JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
-JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
+JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -lgcj $(JVMLIB)
diff -r 207c632eea9e -r fa015cc6070f patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch Tue Nov 20 08:36:56 2007 -0500
+++ b/patches/icedtea-ports.patch Thu Nov 22 03:20:24 2007 -0500
@@ -37,24 +37,28 @@ diff -ru openjdk.orig/hotspot/build/linu
JDK_INCLUDE_SUBDIR=linux
# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
-@@ -94,20 +111,16 @@
+@@ -94,20 +94,20 @@
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
-+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+-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_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
-- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
-+ifneq ($(HS_ARCH), ppc)
++EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
++ifeq ($(HS_ARCH), ppc)
+ 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
++ 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
@@ -267,6 +271,19 @@ diff -ru openjdk.orig/jdk/make/common/De
+LDFLAGS_COMMON_ppc64 += -m64
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 -ru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2007-11-08 11:34:54.000000000 +0000
@@ -330,6 +347,126 @@ diff -r 29c822b7c8b2 openjdk-ecj/jdk/mak
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 -ru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2007-11-08 11:34:54.000000000 +0000
+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2007-11-08 11:36:15.000000000 +0000
@@ -373,6 +510,19 @@ diff -ru openjdk.orig/corba/make/common/
+LDFLAGS_COMMON_ppc64 += -m64
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
diff -r 207c632eea9e -r fa015cc6070f ports/jdk/src/solaris/bin/ppc/jvm.cfg
--- a/ports/jdk/src/solaris/bin/ppc/jvm.cfg Tue Nov 20 08:36:56 2007 -0500
+++ b/ports/jdk/src/solaris/bin/ppc/jvm.cfg Thu Nov 22 03:20:24 2007 -0500
@@ -36,9 +36,9 @@
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
# and may not be available in a future release.
#
--server KNOWN
+-client KNOWN
-hotspot ERROR
-classic WARN
--client IGNORE
+-server IGNORE
-native ERROR
-green ERROR
diff -r 207c632eea9e -r fa015cc6070f ports/jdk/src/solaris/bin/ppc64/jvm.cfg
--- a/ports/jdk/src/solaris/bin/ppc64/jvm.cfg Tue Nov 20 08:36:56 2007 -0500
+++ b/ports/jdk/src/solaris/bin/ppc64/jvm.cfg Thu Nov 22 03:20:24 2007 -0500
@@ -36,9 +36,9 @@
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
# and may not be available in a future release.
#
--server KNOWN
+-client KNOWN
-hotspot ERROR
-classic WARN
--client IGNORE
+-server IGNORE
-native ERROR
-green ERROR
More information about the distro-pkg-dev
mailing list