changeset in /hg/icedtea: 2008-04-16 Gary Benson <gbenson at redh...
Gary Benson
gbenson at redhat.com
Thu May 29 14:13:09 PDT 2008
changeset 3f3dd2815005 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3f3dd2815005
description:
2008-04-16 Gary Benson <gbenson at redhat.com>
* patches/icedtea-core-build.patch: Install libjvm.so in server
rather than in core.
* jvm.cfg.in: Updated with new libjvm.so location.
diffstat:
3 files changed, 56 insertions(+), 192 deletions(-)
ChangeLog | 6
jvm.cfg.in | 5
patches/icedtea-core-build.patch | 237 +++++++-------------------------------
diffs (353 lines):
diff -r fb0a7535db1f -r 3f3dd2815005 ChangeLog
--- a/ChangeLog Tue Apr 15 10:44:43 2008 -0400
+++ b/ChangeLog Wed Apr 16 10:34:20 2008 -0400
@@ -1,3 +1,9 @@ 2008-04-15 Gary Benson <gbenson at redhat
+2008-04-16 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-core-build.patch: Install libjvm.so in server
+ rather than in core.
+ * jvm.cfg.in: Updated with new libjvm.so location.
+
2008-04-15 Gary Benson <gbenson at redhat.com>
Yi Zhan <yi.zhan at intel.com>
diff -r fb0a7535db1f -r 3f3dd2815005 jvm.cfg.in
--- a/jvm.cfg.in Tue Apr 15 10:44:43 2008 -0400
+++ b/jvm.cfg.in Wed Apr 16 10:34:20 2008 -0400
@@ -36,10 +36,9 @@
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
# and may not be available in a future release.
#
--core KNOWN
--client IGNORE
--server IGNORE
+-server KNOWN
-hotspot ERROR
-classic WARN
+-client IGNORE
-native ERROR
-green ERROR
diff -r fb0a7535db1f -r 3f3dd2815005 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Tue Apr 15 10:44:43 2008 -0400
+++ b/patches/icedtea-core-build.patch Wed Apr 16 10:34:20 2008 -0400
@@ -15,185 +15,51 @@ diff -u openjdk.orig/hotspot/build/linux
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_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+@@ -97,6 +97,7 @@ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusa
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
-@@ -111,3 +117,4 @@
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
++ifndef ICEDTEA_CORE_BUILD
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+@@ -111,3 +112,4 @@ else
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
endif
endif
+endif
-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
-@@ -202,3 +202,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
+@@ -95,9 +95,11 @@ endif # INCLUDE_SA
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)
+ # Hotspot client is only available on 32-bit builds
++ifndef ICEDTEA_CORE_BUILD
+ ifeq ($(ARCH_DATA_MODEL), 32)
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
$(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
++endif
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
-
-@@ -122,8 +152,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
-@@ -154,17 +183,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)
+@@ -161,6 +163,7 @@ 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
++ifndef ICEDTEA_CORE_BUILD
+ ifeq ($(ARCH_DATA_MODEL), 32)
--IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-+ifeq ($(INCLUDE_SERVER), true)
-+ IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
-+endif
+ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
+@@ -190,6 +193,8 @@ endif # 32bit solaris
+ endif # 32bit solaris
+
+ endif # 32bit
+
-+ifeq ($(INCLUDE_CORE), true)
-+ IMPORT_LIST += $(LIB_LOCATION)/$(CORE_LOCATION)/$(LIBJSIG_NAME)
-+endif
++endif # ICEDTEA_CORE_BUILD
-+ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), solaris)
- # solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris
+ # NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
-@@ -198,11 +235,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) $@
-
-@@ -227,6 +278,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
@@ -228,9 +94,10 @@ diff -ru openjdk.orig/corba/make/common/
JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
---- penjdk6//hotspot/make/Makefile 2008-02-12 04:14:16.000000000 -0500
-+++ openjdk/hotspot/make/Makefile 2008-02-14 17:37:48.000000000 -0500
-@@ -90,6 +90,15 @@
+diff -r 79d639c8a75f openjdk/hotspot/make/Makefile
+--- openjdk/hotspot/make/Makefile Wed Apr 16 08:42:01 2008 +0100
++++ openjdk/hotspot/make/Makefile Wed Apr 16 08:49:31 2008 +0100
+@@ -90,6 +90,15 @@ all_debug: jvmg jvmg1 docs export_de
all_debug: jvmg jvmg1 docs export_debug
all_optimized: optimized optimized1 docs export_optimized
@@ -246,49 +113,51 @@ diff -ru openjdk.orig/corba/make/common/
# Do everything
world: all create_jdk
-@@ -112,6 +121,10 @@
+@@ -111,6 +120,10 @@ endif
+ $(C2_VM_TARGETS):
$(CD) $(GAMMADIR)/make; \
$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
-
++
+$(CORE_VM_TARGETS):
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
+
# Build compiler1 (client) rule, different for platforms
generic_build1:
- $(MKDIR) -p $(OUTPUTDIR)
-@@ -154,6 +167,12 @@
+@@ -153,6 +166,12 @@ else
+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
$(MAKE_ARGS) $(VM_TARGET)
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:
-@@ -183,10 +202,16 @@
+@@ -182,11 +201,19 @@ XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
+ XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
++ifdef ICEDTEA_CORE_BUILD
++C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
++else
C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+CORE_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
++endif
C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
-+CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR)
--# Misc files and generated files need to come from C1 or C2 area
-+# Misc files and generated files need to come from the correct area
+ # Misc files and generated files need to come from C1 or C2 area
+ifdef ICEDTEA_CORE_BUILD
-+ MISC_DIR=$(CORE_DIR)
-+ GEN_DIR=$(CORE_BASE_DIR)/generated
++ MISC_DIR=$(C2_DIR)
++ GEN_DIR=$(C2_BASE_DIR)/generated
+else
ifeq ($(ARCH_DATA_MODEL), 32)
MISC_DIR=$(C1_DIR)
GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -194,6 +219,7 @@
+@@ -194,6 +221,7 @@ else
MISC_DIR=$(C2_DIR)
GEN_DIR=$(C2_BASE_DIR)/generated
endif
@@ -296,26 +165,16 @@ diff -ru openjdk.orig/corba/make/common/
# Bin files (windows)
ifeq ($(OSNAME),windows)
-@@ -231,6 +257,10 @@
- ifneq ($(OSNAME),windows)
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.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)
- $(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so
- $(install-file)
- $(EXPORT_CLIENT_DIR)/64/%.so: $(C1_DIR)/%.so
-@@ -264,6 +294,7 @@
+@@ -264,6 +292,7 @@ endif
# Xusage file
$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_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)
++$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
$(prep-target)
$(RM) $@.temp
$(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
---- penjdk6/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-12 04:14:24.000000000 -0500
+diff -r 79d639c8a75f openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-12 04:14:24.000000000 -0500
+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-14 17:39:45.000000000 -0500
@@ -92,8 +92,12 @@
#ifdef TIERED
More information about the distro-pkg-dev
mailing list