changeset in /hg/icedtea6: 2008-06-24 Gary Benson <gbenson at red...
Gary Benson
gbenson at redhat.com
Tue Jun 24 00:23:33 PDT 2008
changeset bfe0f7884fa5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bfe0f7884fa5
description:
2008-06-24 Gary Benson <gbenson at redhat.com>
* acinclude.m4
(SET_CORE_BUILD): Removed.
(SET_CORE_OR_SHARK_BUILD): New macro.
* configure.ac
Replaced call to SET_CORE_BUILD with SET_CORE_OR_SHARK_BUILD.
(LLVM_CFLAGS): New substitution.
(LLVM_LDFLAGS): Likewise.
(LLVM_LIBS): Likewise.
* configure: Regenerated.
* Makefile.am
(ICEDTEA_ENV): Pass flags for Shark.
(ICEDTEA_ENV_ECJ): Likewise.
(stamps/ports.stamp): Link in Shark files.
(stamps/ports-ecj.stamp): Likewise.
(ICEDTEA_PATCHES): Apply Shark patches.
(hotspot): Fix libjvm.so location.
* Makefile.in: Regenerated.
* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp
(code_fill_byte): Implement for Shark.
* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp
(decode): Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
(zeroframe): New accessor method.
(zero_entryframe): Likewise.
(zero_interpreterframe): Likewise.
(zero_sharkframe): Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
(is_interpreted_frame): Use the above.
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
(frame): Set _pc to a dummy value for entry frames.
(sender_sp): Use new accessor methods.
(get_interpreterState): Likewise.
(entry_frame_call_wrapper): Likewise.
(interpreter_frame_locals_addr): Remove now-unnecessary assertion.
(interpreter_frame_cache_addr): Likewise.
(interpreter_frame_mdx_addr): Likewise.
(interpreter_frame_tos_address): Likewise.
(interpreter_frame_bcx_addr): Updated for Shark.
(interpreter_frame_method_addr): Likewise.
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
(check_verified_entry_alignment): Implement for Shark.
* ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
(print_word): Add basic support for Shark frames.
* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp
(base_offset): New method.
(top_offset): Likewise.
(sp_offset): Likewise.
(SHARK_FRAME): New enum entry.
(is_shark_frame): New method.
* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp
(call_stub_return_pc): New method.
(returns_to_call_stub): Updated for new semantics.
* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
(zero_stack_offset): New method.
(top_zero_frame_offset): Likewise.
* patches/icedtea-shark-build.patch: New file.
* patches/icedtea-shark.patch: Likewise.
* ports/hotspot/build/linux/makefiles/shark.make: New file.
* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
* ports/hotspot/src/share/vm/includeDB_shark: Likewise.
* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.inline.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkType.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/shark_globals.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/shark_globals.hpp: Likewise.
diffstat:
41 files changed, 5225 insertions(+), 372 deletions(-)
ChangeLog | 85
Makefile.am | 36
Makefile.in | 45
acinclude.m4 | 26
aclocal.m4 | 70
configure | 842 +++++---
configure.ac | 14
patches/icedtea-shark-build.patch | 276 ++
patches/icedtea-shark.patch | 283 ++
ports/hotspot/build/linux/makefiles/shark.make | 31
ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 4
ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp | 10
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 5
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 24
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 28
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 4
ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp | 64
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 63
ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 11
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 26
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 7
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14
ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 10
ports/hotspot/src/share/vm/includeDB_shark | 173 +
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 54
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 1008 ++++++++++
ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 312 +++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 208 ++
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 227 ++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 149 +
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 80
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 214 ++
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 211 ++
ports/hotspot/src/share/vm/shark/sharkState.cpp | 277 ++
ports/hotspot/src/share/vm/shark/sharkState.hpp | 159 +
ports/hotspot/src/share/vm/shark/sharkState.inline.hpp | 44
ports/hotspot/src/share/vm/shark/sharkType.cpp | 99
ports/hotspot/src/share/vm/shark/sharkType.hpp | 147 +
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 177 +
ports/hotspot/src/share/vm/shark/shark_globals.cpp | 29
ports/hotspot/src/share/vm/shark/shark_globals.hpp | 51
diffs (truncated from 6858 to 500 lines):
diff -r f8d0f74a34a2 -r bfe0f7884fa5 ChangeLog
--- a/ChangeLog Mon Jun 23 15:33:06 2008 +0100
+++ b/ChangeLog Tue Jun 24 03:23:10 2008 -0400
@@ -1,3 +1,88 @@ 2008-06-23 Andrew John Hughes <gnu_and
+2008-06-24 Gary Benson <gbenson at redhat.com>
+
+ * acinclude.m4
+ (SET_CORE_BUILD): Removed.
+ (SET_CORE_OR_SHARK_BUILD): New macro.
+ * configure.ac
+ Replaced call to SET_CORE_BUILD with SET_CORE_OR_SHARK_BUILD.
+ (LLVM_CFLAGS): New substitution.
+ (LLVM_LDFLAGS): Likewise.
+ (LLVM_LIBS): Likewise.
+ * configure: Regenerated.
+
+ * Makefile.am
+ (ICEDTEA_ENV): Pass flags for Shark.
+ (ICEDTEA_ENV_ECJ): Likewise.
+ (stamps/ports.stamp): Link in Shark files.
+ (stamps/ports-ecj.stamp): Likewise.
+ (ICEDTEA_PATCHES): Apply Shark patches.
+ (hotspot): Fix libjvm.so location.
+ * Makefile.in: Regenerated.
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp
+ (code_fill_byte): Implement for Shark.
+ * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp
+ (decode): Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
+ (zeroframe): New accessor method.
+ (zero_entryframe): Likewise.
+ (zero_interpreterframe): Likewise.
+ (zero_sharkframe): Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
+ (is_interpreted_frame): Use the above.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
+ (frame): Set _pc to a dummy value for entry frames.
+ (sender_sp): Use new accessor methods.
+ (get_interpreterState): Likewise.
+ (entry_frame_call_wrapper): Likewise.
+ (interpreter_frame_locals_addr): Remove now-unnecessary assertion.
+ (interpreter_frame_cache_addr): Likewise.
+ (interpreter_frame_mdx_addr): Likewise.
+ (interpreter_frame_tos_address): Likewise.
+ (interpreter_frame_bcx_addr): Updated for Shark.
+ (interpreter_frame_method_addr): Likewise.
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
+ (check_verified_entry_alignment): Implement for Shark.
+ * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
+ (print_word): Add basic support for Shark frames.
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp
+ (base_offset): New method.
+ (top_offset): Likewise.
+ (sp_offset): Likewise.
+ (SHARK_FRAME): New enum entry.
+ (is_shark_frame): New method.
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp
+ (call_stub_return_pc): New method.
+ (returns_to_call_stub): Updated for new semantics.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+ (zero_stack_offset): New method.
+ (top_zero_frame_offset): Likewise.
+
+ * patches/icedtea-shark-build.patch: New file.
+ * patches/icedtea-shark.patch: Likewise.
+
+ * ports/hotspot/build/linux/makefiles/shark.make: New file.
+ * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/includeDB_shark: Likewise.
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.inline.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkType.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/shark_globals.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/shark_globals.hpp: Likewise.
+
2008-06-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
* ChangeLog: Correct PATCHES typo.
diff -r f8d0f74a34a2 -r bfe0f7884fa5 Makefile.am
--- a/Makefile.am Mon Jun 23 15:33:06 2008 +0100
+++ b/Makefile.am Tue Jun 24 03:23:10 2008 -0400
@@ -74,6 +74,11 @@ if ZERO_BUILD
ICEDTEA_ZERO_BUILD = yes
else
ICEDTEA_ZERO_BUILD =
+endif
+if SHARK_BUILD
+ ICEDTEA_SHARK_BUILD = yes
+else
+ ICEDTEA_SHARK_BUILD =
endif
ICEDTEA_ENV = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
@@ -96,6 +101,7 @@ ICEDTEA_ENV = \
"LD_LIBRARY_PATH=" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
@@ -103,6 +109,9 @@ ICEDTEA_ENV = \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "LLVM_CFLAGS=$(LLVM_CFLAGS)" \
+ "LLVM_LDFLAGS=$(LLVM_LDFLAGS)" \
+ "LLVM_LIBS=$(LLVM_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
@@ -162,6 +171,7 @@ ICEDTEA_ENV_ECJ = \
"GENSRCDIR=$(abs_top_srcdir)/generated" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
@@ -169,6 +179,9 @@ ICEDTEA_ENV_ECJ = \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "LLVM_CFLAGS=$(LLVM_CFLAGS)" \
+ "LLVM_LDFLAGS=$(LLVM_LDFLAGS)" \
+ "LLVM_LIBS=$(LLVM_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
@@ -235,12 +248,13 @@ clean-download:
# Link ports sources into tree
stamps/ports.stamp: stamps/extract.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+ $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
+ $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
@@ -279,6 +293,13 @@ if ZERO_BUILD
ZERO_PATCHES_COND = $(ZERO_PATCHES)
else
ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
+endif
+
+# If Shark is required, apply shark patch
+if SHARK_BUILD
+ SHARK_PATCH = patches/icedtea-shark.patch
+else
+ SHARK_PATCH =
endif
ICEDTEA_PATCHES = \
@@ -334,6 +355,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-dnd-updatecursor.patch \
patches/icedtea-component.patch \
patches/icedtea-rhino.patch \
+ patches/icedtea-shark-build.patch \
+ $(SHARK_PATCH) \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES)
@@ -419,12 +442,13 @@ clean-extract-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+ $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
+ $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
ln -sf $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
@@ -676,8 +700,8 @@ hotspot:
rm -f stamps/icedtea-ecj.stamp
rm -f stamps/icedtea-against-ecj.stamp
$(MAKE) hotspot-helper
- cp openjdk-ecj/control/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
- openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
+ cp openjdk-ecj/control/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/server/libjvm.so \
+ openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/server
@echo "Hotspot is served:" openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
diff -r f8d0f74a34a2 -r bfe0f7884fa5 Makefile.in
--- a/Makefile.in Mon Jun 23 15:33:06 2008 +0100
+++ b/Makefile.in Tue Jun 24 03:23:10 2008 -0400
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -147,6 +147,10 @@ LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CONFIG = @LLVM_CONFIG@
+LLVM_LDFLAGS = @LLVM_LDFLAGS@
+LLVM_LIBS = @LLVM_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKE = @MAKE@
MAKEINFO = @MAKEINFO@
@@ -292,6 +296,8 @@ JDK_UPDATE_VERSION = 0
@CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
@ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD =
@ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
+ at SHARK_BUILD_FALSE@ICEDTEA_SHARK_BUILD =
+ at SHARK_BUILD_TRUE@ICEDTEA_SHARK_BUILD = yes
ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
@@ -308,12 +314,15 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
"CLASSPATH=" "LD_LIBRARY_PATH=" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "LLVM_CFLAGS=$(LLVM_CFLAGS)" "LLVM_LDFLAGS=$(LLVM_LDFLAGS)" \
+ "LLVM_LIBS=$(LLVM_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
@@ -350,12 +359,15 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
"GENSRCDIR=$(abs_top_srcdir)/generated" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "LLVM_CFLAGS=$(LLVM_CFLAGS)" "LLVM_LDFLAGS=$(LLVM_LDFLAGS)" \
+ "LLVM_LIBS=$(LLVM_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
@@ -396,6 +408,10 @@ NON_ZERO_PATCHES = \
@ZERO_BUILD_FALSE at ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
@ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
+ at SHARK_BUILD_FALSE@SHARK_PATCH =
+
+# If Shark is required, apply shark patch
+ at SHARK_BUILD_TRUE@SHARK_PATCH = patches/icedtea-shark.patch
ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-copy-plugs.patch patches/icedtea-version.patch \
patches/icedtea-text-relocations.patch \
@@ -437,7 +453,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
patches/icedtea-dnd-updatecursor.patch \
patches/icedtea-component.patch patches/icedtea-rhino.patch \
- $(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
+ patches/icedtea-shark-build.patch $(SHARK_PATCH) $(GCC_PATCH) \
+ $(DISTRIBUTION_PATCHES) $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
@@ -582,10 +599,6 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -612,8 +625,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -759,7 +770,7 @@ uninstall-am:
.PHONY: all all-am all-local am--refresh check check-am check-local \
clean clean-generic dist dist-all dist-bzip2 dist-gzip \
- dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-local distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
@@ -833,12 +844,13 @@ clean-download:
# Link ports sources into tree
stamps/ports.stamp: stamps/extract.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+ $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
+ $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
@@ -924,12 +936,13 @@ clean-extract-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+ $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
+ $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
ln -sf $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
@@ -1143,8 +1156,8 @@ hotspot:
rm -f stamps/icedtea-ecj.stamp
rm -f stamps/icedtea-against-ecj.stamp
$(MAKE) hotspot-helper
- cp openjdk-ecj/control/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
- openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
+ cp openjdk-ecj/control/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/server/libjvm.so \
+ openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/server
@echo "Hotspot is served:" openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
diff -r f8d0f74a34a2 -r bfe0f7884fa5 acinclude.m4
--- a/acinclude.m4 Mon Jun 23 15:33:06 2008 +0100
+++ b/acinclude.m4 Tue Jun 24 03:23:10 2008 -0400
@@ -657,13 +657,31 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
AC_CONFIG_FILES([ergo.c])
])
-AC_DEFUN([SET_CORE_BUILD],
-[
+AC_DEFUN([SET_CORE_OR_SHARK_BUILD],
+[
+ AC_MSG_CHECKING(whether to use the Shark JIT)
+ use_shark=no
+ AC_ARG_ENABLE([shark], [AS_HELP_STRING(--enable-shark, use Shark JIT)],
+ [
+ case "${enableval}" in
+ no)
+ ;;
+ *)
+ if test "x${ZERO_BUILD_TRUE}" = x; then
+ use_shark=yes
+ fi
+ ;;
+ esac
+ ])
+ AC_MSG_RESULT($use_shark)
+
if test "x${CACAO}" != "xno"; then
AM_CONDITIONAL(CORE_BUILD, true)
+ AM_CONDITIONAL(SHARK_BUILD, false)
else
- AM_CONDITIONAL(CORE_BUILD, test "x${ZERO_BUILD_TRUE}" = x)
- fi
+ AM_CONDITIONAL(CORE_BUILD, test "x${use_shark}" != xyes)
+ AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
+ fi
])
AC_DEFUN([ENABLE_NETX_PLUGIN],
diff -r f8d0f74a34a2 -r bfe0f7884fa5 aclocal.m4
--- a/aclocal.m4 Mon Jun 23 15:33:06 2008 +0100
+++ b/aclocal.m4 Tue Jun 24 03:23:10 2008 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,10 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
@@ -87,14 +84,16 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -138,9 +137,9 @@ if test $pkg_failed = yes; then
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -175,7 +174,7 @@ fi[]dnl
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -190,7 +189,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -206,10 +205,8 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
More information about the distro-pkg-dev
mailing list