changeset in /hg/icedtea6: 2008-12-05 Matthias Klose <doko at ubu...
doko at ubuntu.com
doko at ubuntu.com
Fri Dec 5 05:08:47 PST 2008
changeset 81363fed525c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=81363fed525c
description:
2008-12-05 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-lucene-crash.patch: Update for b14.
* patches/hotspot/original/icedtea-memory-limits.patch: Likewise.
* patches/hotspot/original/icedtea-core-build.patch: Likewise.
* patches/hotspot/original/icedtea-static-libstdc++.patch: Likewise.
* patches/hotspot/original/icedtea-zero-build.patch: Likewise.
* patches/hotspot/original/icedtea-shark-build.patch: Likewise.
* patches/hotspot/original/icedtea-sparc64-linux.patch: Likewise.
* Makefile.am (ICEDTEA_PATCHES): Remove icedtea-hotspot7-tests.patch,
apply patches/icedtea-bytecodeInterpreterWithChecks.patch for original
hotspot build.
* patches/icedtea-hotspot7-tests.patch: Remove.
diffstat:
10 files changed, 254 insertions(+), 7750 deletions(-)
ChangeLog | 14
Makefile.am | 2
patches/hotspot/original/icedtea-core-build.patch | 89
patches/hotspot/original/icedtea-memory-limits.patch | 14
patches/hotspot/original/icedtea-shark-build.patch | 301
patches/hotspot/original/icedtea-sparc64-linux.patch | 107
patches/hotspot/original/icedtea-static-libstdc++.patch | 29
patches/hotspot/original/icedtea-zero-build.patch | 20
patches/icedtea-hotspot7-tests.patch | 7408 ---------------
patches/icedtea-lucene-crash.patch | 20
diffs (truncated from 8198 to 500 lines):
diff -r 644b7ff854fc -r 81363fed525c ChangeLog
--- a/ChangeLog Thu Dec 04 21:38:54 2008 +0100
+++ b/ChangeLog Fri Dec 05 14:08:01 2008 +0100
@@ -1,3 +1,17 @@ 2008-12-04 Matthias Klose <doko at ubuntu
+2008-12-05 Matthias Klose <doko at ubuntu.com>
+
+ * patches/icedtea-lucene-crash.patch: Update for b14.
+ * patches/hotspot/original/icedtea-memory-limits.patch: Likewise.
+ * patches/hotspot/original/icedtea-core-build.patch: Likewise.
+ * patches/hotspot/original/icedtea-static-libstdc++.patch: Likewise.
+ * patches/hotspot/original/icedtea-zero-build.patch: Likewise.
+ * patches/hotspot/original/icedtea-shark-build.patch: Likewise.
+ * patches/hotspot/original/icedtea-sparc64-linux.patch: Likewise.
+ * Makefile.am (ICEDTEA_PATCHES): Remove icedtea-hotspot7-tests.patch,
+ apply patches/icedtea-bytecodeInterpreterWithChecks.patch for original
+ hotspot build.
+ * patches/icedtea-hotspot7-tests.patch: Remove.
+
2008-12-04 Matthias Klose <doko at ubuntu.com>
* patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch: Readd
diff -r 644b7ff854fc -r 81363fed525c Makefile.am
--- a/Makefile.am Thu Dec 04 21:38:54 2008 +0100
+++ b/Makefile.am Fri Dec 05 14:08:01 2008 +0100
@@ -589,7 +589,7 @@ endif
if !WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
- patches/icedtea-hotspot7-tests.patch \
+ patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-sparc.patch
endif
diff -r 644b7ff854fc -r 81363fed525c patches/hotspot/original/icedtea-core-build.patch
--- a/patches/hotspot/original/icedtea-core-build.patch Thu Dec 04 21:38:54 2008 +0100
+++ b/patches/hotspot/original/icedtea-core-build.patch Fri Dec 05 14:08:01 2008 +0100
@@ -1,25 +1,8 @@ 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
-@@ -97,6 +97,7 @@ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusa
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- 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 -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
+--- openjdk/hotspot/make/Makefile.orig 2008-11-25 09:11:57.000000000 +0000
++++ openjdk/hotspot/make/Makefile 2008-12-05 10:25:12.000000000 +0000
+@@ -91,6 +91,15 @@
+ all_debug: jvmg jvmg1 jvmgkernel docs export_debug
+ all_optimized: optimized optimized1 optimizedkernel docs export_optimized
+# Core (non-compiler) targets made available with this Makefile
+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
@@ -33,31 +16,31 @@ diff -r 79d639c8a75f openjdk/hotspot/mak
# Do everything
world: all create_jdk
-@@ -111,6 +120,10 @@ endif
- $(C2_VM_TARGETS):
+@@ -113,6 +122,10 @@
$(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:
-@@ -153,6 +166,12 @@ else
- $(MAKE) -f $(ABS_OS_MAKEFILE) \
++
+ $(KERNEL_VM_TARGETS):
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
+@@ -159,6 +172,12 @@
$(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)
-@@ -182,11 +201,19 @@ XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
++
+ generic_buildkernel:
+ $(MKDIR) -p $(OUTPUTDIR)
+ ifeq ($(OSNAME),windows)
+@@ -205,13 +224,21 @@
XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
@@ -66,8 +49,10 @@ diff -r 79d639c8a75f openjdk/hotspot/mak
+else
C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
+endif
+ KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
+ KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
# Misc files and generated files need to come from C1 or C2 area
+ifdef ICEDTEA_CORE_BUILD
@@ -77,7 +62,7 @@ diff -r 79d639c8a75f openjdk/hotspot/mak
ifeq ($(ARCH_DATA_MODEL), 32)
MISC_DIR=$(C1_DIR)
GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -194,6 +221,7 @@ else
+@@ -219,6 +246,7 @@
MISC_DIR=$(C2_DIR)
GEN_DIR=$(C2_BASE_DIR)/generated
endif
@@ -85,18 +70,9 @@ diff -r 79d639c8a75f openjdk/hotspot/mak
# Bin files (windows)
ifeq ($(OSNAME),windows)
-@@ -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: $(XUSAGE)
- $(prep-target)
- $(RM) $@.temp
- $(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
-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
-@@ -89,8 +89,12 @@
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-11-25 09:12:13.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-05 10:22:42.000000000 +0000
+@@ -95,8 +95,12 @@
#ifdef TIERED
#define VMTYPE "Server"
#else
@@ -109,5 +85,20 @@ diff -r 79d639c8a75f openjdk/hotspot/src
+ #define VMTYPE "Core"
+#endif // COMPILER1 || COMPILER2
#endif // TIERED
+ #endif // KERNEL
- #ifndef HOTSPOT_VM_DISTRO
+--- openjdk/hotspot/build/linux/makefiles/defs.make.orig 2008-11-25 09:11:51.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-12-05 10:22:42.000000000 +0000
+@@ -97,6 +97,7 @@
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+ 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 @@
+ EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+ endif
+ endif
++endif
diff -r 644b7ff854fc -r 81363fed525c patches/hotspot/original/icedtea-memory-limits.patch
--- a/patches/hotspot/original/icedtea-memory-limits.patch Thu Dec 04 21:38:54 2008 +0100
+++ b/patches/hotspot/original/icedtea-memory-limits.patch Fri Dec 05 14:08:01 2008 +0100
@@ -1,12 +1,14 @@
---- penjdk6/hotspot/src/cpu/i486/vm/c2_globals_i486.hpp 2008-02-12 04:14:17.000000000 -0500
-+++ openjdk/hotspot/src/cpu/i486/vm/c2_globals_i486.hpp 2008-02-14 16:32:33.000000000 -0500
-@@ -79,6 +79,6 @@
- define_pd_global(uintx,CodeCacheMinBlockLength, 4);
-
+diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2008-05-23 22:30:44.000000000 +0100
++++ openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2008-05-23 22:30:59.000000000 +0100
+@@ -98,7 +98,7 @@
+
+ // Heap related flags
define_pd_global(uintx, PermSize, ScaleForWordSize(16*M));
-define_pd_global(uintx, MaxPermSize, ScaleForWordSize(64*M));
+define_pd_global(uintx, MaxPermSize, ScaleForWordSize(128*M));
-
+
+ // Ergonomics related flags
define_pd_global(bool, NeverActAsServerClassMachine, false);
--- penjdk6/hotspot/src/share/vm/runtime/globals.hpp 2008-02-12 04:14:24.000000000 -0500
+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2008-02-14 16:34:00.000000000 -0500
diff -r 644b7ff854fc -r 81363fed525c patches/hotspot/original/icedtea-shark-build.patch
--- a/patches/hotspot/original/icedtea-shark-build.patch Thu Dec 04 21:38:54 2008 +0100
+++ b/patches/hotspot/original/icedtea-shark-build.patch Fri Dec 05 14:08:01 2008 +0100
@@ -1,7 +1,80 @@ diff -r 8e41d25d7665 openjdk/hotspot/bui
-diff -r 8e41d25d7665 openjdk/hotspot/build/linux/Makefile
---- openjdk/hotspot/build/linux/Makefile Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/hotspot/build/linux/Makefile Fri Jun 20 13:26:20 2008 +0100
-@@ -152,6 +152,13 @@ endif
+--- openjdk/hotspot/make/Makefile.orig 2008-12-05 10:41:32.000000000 +0000
++++ openjdk/hotspot/make/Makefile 2008-12-05 10:50:53.000000000 +0000
+@@ -100,6 +100,15 @@
+ all_debugcore: jvmgcore docs export_debug
+ all_optimizedcore: optimizedcore docs export_optimized
+
++# Shark (C0) targets made available with this Makefile
++SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
++
++allshark: all_productshark all_fastdebugshark
++all_productshark: productshark docs export_product
++all_fastdebugshark: fastdebugshark docs export_fastdebug
++all_debugshark: jvmgshark docs export_debug
++all_optimizedshark: optimizedshark docs export_optimized
++
+ # Do everything
+ world: all create_jdk
+
+@@ -126,6 +135,10 @@
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
+
++$(SHARK_VM_TARGETS):
++ $(CD) $(GAMMADIR)/make; \
++ $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
++
+ $(KERNEL_VM_TARGETS):
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
+@@ -178,6 +191,12 @@
+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
+ $(MAKE_ARGS) $(VM_TARGET)
+
++generic_buildshark:
++ $(MKDIR) -p $(OUTPUTDIR)
++ $(CD) $(OUTPUTDIR); \
++ $(MAKE) -f $(ABS_OS_MAKEFILE) \
++ $(MAKE_ARGS) $(VM_TARGET)
++
+ generic_buildkernel:
+ $(MKDIR) -p $(OUTPUTDIR)
+ ifeq ($(OSNAME),windows)
+@@ -227,8 +246,12 @@
+ ifdef ICEDTEA_CORE_BUILD
+ C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
+ else
++ifdef ICEDTEA_SHARK_BUILD
++C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
++else
+ C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
+ endif
++endif
+ KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
+ C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
+ C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
+@@ -239,6 +262,10 @@
+ MISC_DIR=$(C2_DIR)
+ GEN_DIR=$(C2_BASE_DIR)/generated
+ else
++ifdef ICEDTEA_SHARK_BUILD
++ 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
+@@ -247,6 +274,7 @@
+ GEN_DIR=$(C2_BASE_DIR)/generated
+ endif
+ endif
++endif
+
+ # Bin files (windows)
+ ifeq ($(OSNAME),windows)
+--- openjdk/hotspot/build/linux/Makefile.orig 2008-11-25 09:11:51.000000000 +0000
++++ openjdk/hotspot/build/linux/Makefile 2008-12-05 10:50:52.000000000 +0000
+@@ -153,6 +153,13 @@
# profiledcore core <os>_<arch>_core/profiled
# productcore core <os>_<arch>_core/product
#
@@ -15,7 +88,7 @@ diff -r 8e41d25d7665 openjdk/hotspot/bui
# What you get with each target:
#
# debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher
-@@ -172,11 +179,13 @@ SUBDIRS_C2 = $(addprefix $(OSNAME
+@@ -171,11 +178,13 @@
SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
@@ -29,7 +102,7 @@ diff -r 8e41d25d7665 openjdk/hotspot/bui
BUILDTREE_MAKE = $(GAMMADIR)/build/$(OSNAME)/makefiles/buildtree.make
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
-@@ -190,6 +199,7 @@ all:
+@@ -191,6 +200,7 @@
@echo " $(TARGETS_C2)"
@echo " $(TARGETS_C1)"
@echo " $(TARGETS_CORE)"
@@ -37,7 +110,7 @@ diff -r 8e41d25d7665 openjdk/hotspot/bui
checks: check_os_version check_j2se_version
-@@ -239,6 +249,10 @@ endif
+@@ -240,6 +250,10 @@
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
$(BUILDTREE) VARIANT=core
@@ -48,20 +121,20 @@ diff -r 8e41d25d7665 openjdk/hotspot/bui
# Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
$(TARGETS_C2): $(SUBDIRS_C2)
-@@ -267,6 +281,12 @@ endif
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
+@@ -270,6 +284,12 @@
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
-+endif
-+
+ endif
+
+$(TARGETS_SHARK): $(SUBDIRS_SHARK)
+ cd $(OSNAME)_$(BUILDARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
+ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
++endif
++
# Just build the tree, and nothing else:
-@@ -299,7 +319,7 @@ include $(GAMMADIR)/build/$(OSNAME)/make
+ tree: $(SUBDIRS_C2)
+ tree1: $(SUBDIRS_C1)
+@@ -300,7 +320,7 @@
#-------------------------------------------------------------------------------
@@ -70,10 +143,61 @@ diff -r 8e41d25d7665 openjdk/hotspot/bui
.PHONY: tree tree1 treecore
.PHONY: all compiler1 compiler2 core
.PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs
-diff -r 8e41d25d7665 openjdk/hotspot/build/linux/makefiles/buildtree.make
---- openjdk/hotspot/build/linux/makefiles/buildtree.make Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/hotspot/build/linux/makefiles/buildtree.make Fri Jun 20 13:26:20 2008 +0100
-@@ -171,8 +171,8 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shar
+--- openjdk/hotspot/build/linux/makefiles/gcc.make.orig 2008-12-05 10:41:34.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/gcc.make 2008-12-05 10:50:52.000000000 +0000
+@@ -60,6 +60,9 @@
+ ifdef ICEDTEA_ZERO_BUILD
+ CFLAGS += $(LIBFFI_CFLAGS)
+ endif
++ifdef ICEDTEA_SHARK_BUILD
++CFLAGS += $(LLVM_CFLAGS)
++endif
+ CFLAGS += $(VM_PICFLAG)
+ CFLAGS += -fno-rtti
+ CFLAGS += -fno-exceptions
+--- openjdk/hotspot/build/linux/makefiles/top.make.orig 2008-11-25 09:11:51.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/top.make 2008-12-05 10:50:52.000000000 +0000
+@@ -73,6 +73,7 @@
+ Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
+ Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
+ Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
++Include_DBs/SHARK = $(Include_DBs/CORE) $(VM)/includeDB_shark
+ Include_DBs = $(Include_DBs/$(TYPE))
+
+ Cached_plat = $(GENERATED)/platform.current
+--- openjdk/hotspot/build/linux/makefiles/vm.make.orig 2008-12-05 10:41:34.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/vm.make 2008-12-05 10:50:53.000000000 +0000
+@@ -128,10 +128,14 @@
+
+ STATIC_CXX = true
+
+-ifeq ($(ZERO_LIBARCH), ppc64)
++ifdef ICEDTEA_SHARK_BUILD
+ STATIC_CXX = false
+ else
+- STATIC_CXX = true
++ ifeq ($(ZERO_LIBARCH), ppc64)
++ STATIC_CXX = false
++ else
++ STATIC_CXX = true
++ endif
+ endif
+
+ ifeq ($(LINK_INTO),AOUT)
+@@ -159,6 +163,10 @@
+ ifdef ICEDTEA_ZERO_BUILD
+ LIBS_VM += $(LIBFFI_LIBS)
+ endif
++ifdef ICEDTEA_SHARK_BUILD
++LFLAGS_VM += $(LLVM_LDFLAGS)
++LIBS_VM += $(LLVM_LIBS)
++endif
+
+ LINK_VM = $(LINK_LIB.c)
+
+--- openjdk/hotspot/build/linux/makefiles/buildtree.make.orig 2008-12-05 10:41:34.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/buildtree.make 2008-12-05 10:50:52.000000000 +0000
+@@ -211,8 +211,8 @@
../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
@echo Creating directory list $@
@@ -84,10 +208,9 @@ diff -r 8e41d25d7665 openjdk/hotspot/bui
\( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; > $@
Makefile: $(BUILDTREE_MAKE)
-diff -r 8e41d25d7665 openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk/hotspot/build/linux/makefiles/defs.make Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/hotspot/build/linux/makefiles/defs.make Fri Jun 20 13:26:39 2008 +0100
-@@ -118,6 +118,7 @@ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libj
+--- openjdk/hotspot/build/linux/makefiles/defs.make.orig 2008-12-05 10:41:34.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-12-05 10:50:52.000000000 +0000
+@@ -110,6 +110,7 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
ifndef ICEDTEA_CORE_BUILD
@@ -95,138 +218,8 @@ diff -r 8e41d25d7665 openjdk/hotspot/bui
ifeq ($(ARCH_DATA_MODEL), 32)
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -133,3 +134,4 @@ else
+@@ -125,3 +126,4 @@
endif
endif
endif
+endif
-diff -r 8e41d25d7665 openjdk/hotspot/build/linux/makefiles/gcc.make
---- openjdk/hotspot/build/linux/makefiles/gcc.make Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make Fri Jun 20 13:26:20 2008 +0100
-@@ -63,6 +63,9 @@ VM_PICFLAG = $(VM_PICFLAG/$(LINK_
-
- ifdef ICEDTEA_ZERO_BUILD
- CFLAGS += $(LIBFFI_CFLAGS)
-+endif
-+ifdef ICEDTEA_SHARK_BUILD
-+CFLAGS += $(LLVM_CFLAGS)
- endif
- CFLAGS += $(VM_PICFLAG)
- CFLAGS += -fno-rtti
-diff -r 8e41d25d7665 openjdk/hotspot/build/linux/makefiles/top.make
---- openjdk/hotspot/build/linux/makefiles/top.make Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/hotspot/build/linux/makefiles/top.make Fri Jun 20 13:26:20 2008 +0100
-@@ -71,6 +71,7 @@ Include_DBs/COMPILER1 = $(Include_DBs/
- Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
- Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
- Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
-+Include_DBs/SHARK = $(Include_DBs/CORE) $(VM)/includeDB_shark
- Include_DBs = $(Include_DBs/$(TYPE))
-
- Cached_plat = $(GENERATED)/platform.current
-diff -r 8e41d25d7665 openjdk/hotspot/build/linux/makefiles/vm.make
---- openjdk/hotspot/build/linux/makefiles/vm.make Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/hotspot/build/linux/makefiles/vm.make Fri Jun 20 13:26:20 2008 +0100
-@@ -149,10 +149,14 @@ mapfile_reorder : mapfile $(REORDERFILE)
- rm -f $@
- cat $^ > $@
-
--ifeq ($(ZERO_LIBARCH), ppc64)
-+ifdef ICEDTEA_SHARK_BUILD
- STATIC_CXX = false
- else
-- STATIC_CXX = true
-+ ifeq ($(ZERO_LIBARCH), ppc64)
-+ STATIC_CXX = false
-+ else
-+ STATIC_CXX = true
-+ endif
- endif
-
- ifeq ($(LINK_INTO),AOUT)
-@@ -179,6 +183,10 @@ endif
- endif
- ifdef ICEDTEA_ZERO_BUILD
- LIBS_VM += $(LIBFFI_LIBS)
-+endif
-+ifdef ICEDTEA_SHARK_BUILD
-+LFLAGS_VM += $(LLVM_LDFLAGS)
-+LIBS_VM += $(LLVM_LIBS)
- endif
-
- LINK_VM = $(LINK_LIB.c)
-diff -r 8e41d25d7665 openjdk/hotspot/make/Makefile
---- openjdk/hotspot/make/Makefile Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/hotspot/make/Makefile Fri Jun 20 13:30:28 2008 +0100
-@@ -99,6 +99,15 @@ all_debugcore: jvmgcore docs export_
- all_debugcore: jvmgcore docs export_debug
- all_optimizedcore: optimizedcore docs export_optimized
-
-+# Shark (C0) targets made available with this Makefile
-+SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
-+
-+allshark: all_productshark all_fastdebugshark
More information about the distro-pkg-dev
mailing list