/hg/icedtea: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jun 7 13:03:49 PDT 2010
changeset 3902402ed112 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3902402ed112
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Apr 18 17:03:04 2010 +0100
Log all output from configure command invocations to config.log.
2010-04-18 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (FIND_JAR): Log all output to
config.log (AC_CHECK_WITH_HG_REVISION): Likewise.
(IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
changeset 47b2ef04fed4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=47b2ef04fed4
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Apr 19 16:50:36 2010 +0200
Update Shark for LLVM 2.8 API change r100304
2010-04-19 Xerxes R?nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::memset): Update Shark for LLVM 2.8 API change.
LLVM 2.8 added a fifth isVolatile field for memset
introduced with LLVM r100304. (SharkBuilder::CreateMemset):
Likewise
changeset 3e38b1e90480 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3e38b1e90480
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Apr 20 16:11:05 2010 -0400
PR icedtea/474: Commit patch from Paulo Cesar Pereira de Andrade,
incrementing malloc size to account for NULL terminator.
2010-04-20 Deepak Bhole <dbhole at redhat.com>
PR icedtea/474
* plugin/icedteanp/IcedTeaNPPlugin.cc
(plugin_filter_environment): Increment malloc size by one to account
for NULL terminator. Bug# 474.
changeset e32c0b73290f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e32c0b73290f
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Apr 21 11:30:49 2010 -0400
Fixed typo in previous commit
2010-04-21 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc
(plugin_filter_environment): Fix typo in previous commit
changeset 33f2cabc6bca in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=33f2cabc6bca
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Apr 22 11:16:37 2010 +0200
Shark calling static jni methods jclass argument fix.
2010-04-22 Xerxes R?nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
(SharkNativeWrapper::initialize): Shark calling static jni
methods jclass argument fix.
changeset a7281252ac74 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a7281252ac74
author: Matthias Klose <doko at ubuntu.com>
date: Mon Jun 07 17:28:39 2010 +0100
Allow overwriting -samevm in check-langtools, check-jdk targets.
Running the testsuite in -samevm mode currently lets the harness
crash when using shark or cacao as the harness VM. This provides a
way to overwrite the default -samevm mode.
2010-04-24 Matthias Klose <doko at ubuntu.com>
* Makefile.am (check-langtools, check-jdk): Allow
overwriting -samevm with the environment variable
ICEDTEA_JTREG_OTHERVM.
changeset 1eaa1ce55902 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1eaa1ce55902
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 07 17:32:01 2010 +0100
Fix building with --enable-systemtap and GCC 4.5.
2010-04-28 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add patch when SystemTap is enabled
to support building with GCC 4.5.
* patches/systemtap-gcc-4.5.patch: Add cast to NULL (doesn't
apply to DTrace due to differences between SystemTap and
DTrace macros).
changeset 854406ecaf7f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=854406ecaf7f
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 07 21:03:36 2010 +0100
Remove parts of systemtap patch upstreamed in S6893483.
2010-06-07 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-systemtap.patch: Remove parts
upstreamed in 6893483: DTrace probe return values for a
couple JNI methods are wrong
diffstat:
8 files changed, 124 insertions(+), 71 deletions(-)
ChangeLog | 53 ++++++++
Makefile.am | 9 -
acinclude.m4 | 11 -
patches/icedtea-systemtap.patch | 95 +++++----------
patches/systemtap-gcc-4.5.patch | 11 +
plugin/icedteanp/IcedTeaNPPlugin.cc | 2
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 11 +
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 3
diffs (339 lines):
diff -r 108556963776 -r 854406ecaf7f ChangeLog
--- a/ChangeLog Mon Apr 12 17:20:51 2010 -0400
+++ b/ChangeLog Mon Jun 07 21:03:36 2010 +0100
@@ -1,3 +1,56 @@ 2010-04-12 Deepak Bhole <dbhole at redhat.
+2010-06-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-systemtap.patch:
+ Remove parts upstreamed in
+ 6893483: DTrace probe return values for a couple JNI methods are wrong
+
+2010-04-28 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Add patch when SystemTap is enabled to support
+ building with GCC 4.5.
+ * patches/systemtap-gcc-4.5.patch:
+ Add cast to NULL (doesn't apply to DTrace due
+ to differences between SystemTap and DTrace macros).
+
+2010-04-24 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (check-langtools, check-jdk): Allow overwriting -samevm
+ with the environment variable ICEDTEA_JTREG_OTHERVM.
+
+2010-04-22 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
+ (SharkNativeWrapper::initialize): Shark calling static jni
+ methods jclass argument fix.
+
+2010-04-21 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (plugin_filter_environment): Fix typo in previous commit
+
+2010-04-20 Deepak Bhole <dbhole at redhat.com>
+
+ PR icedtea/474
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (plugin_filter_environment): Increment malloc size by one to account for
+ NULL terminator. Bug# 474.
+
+2010-04-19 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::memset): Update Shark for LLVM 2.8 API change.
+ LLVM 2.8 added a fifth isVolatile field for memset
+ introduced with LLVM r100304.
+ (SharkBuilder::CreateMemset): Likewise
+
+2010-04-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (FIND_JAR): Log all output to config.log
+ (AC_CHECK_WITH_HG_REVISION): Likewise.
+ (IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
+
2010-04-12 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed debug printf
diff -r 108556963776 -r 854406ecaf7f Makefile.am
--- a/Makefile.am Mon Apr 12 17:20:51 2010 -0400
+++ b/Makefile.am Mon Jun 07 21:03:36 2010 +0100
@@ -370,7 +370,8 @@ endif
endif
if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
+ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \
+ patches/systemtap-gcc-4.5.patch
endif
if ENABLE_PLUGIN
@@ -2546,7 +2547,8 @@ check-langtools: stamps/jtreg.stamp
mkdir -p test/langtools/JTwork test/langtools/JTreport
$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/langtools/JTwork -r:test/langtools/JTreport \
- -s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+ $${ICEDTEA_JTREG_OTHERVM:--samevm} \
+ -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
$(ICEDTEA_JTREG_OPTIONS) \
-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \
`pwd`/openjdk/langtools/test \
@@ -2559,7 +2561,8 @@ endif
endif
$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/jdk/JTwork -r:test/jdk/JTreport \
- -s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+ $${ICEDTEA_JTREG_OTHERVM:--samevm} \
+ -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
$(ICEDTEA_JTREG_OPTIONS) $(CACAO_EXCLUDE) \
-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
`pwd`/openjdk/jdk/test \
diff -r 108556963776 -r 854406ecaf7f acinclude.m4
--- a/acinclude.m4 Mon Apr 12 17:20:51 2010 -0400
+++ b/acinclude.m4 Mon Jun 07 21:03:36 2010 +0100
@@ -366,7 +366,7 @@ AC_DEFUN([FIND_JAR],
cat >_config.list <<EOF
_config.txt
EOF
- if $JAR cf _config.jar @_config.list 2>&AS_MESSAGE_LOG_FD; then
+ if $JAR cf _config.jar @_config.list >&AS_MESSAGE_LOG_FD 2>&1; then
JAR_KNOWS_ATFILE=1
AC_MSG_RESULT(yes)
else
@@ -374,7 +374,7 @@ EOF
AC_MSG_RESULT(no)
fi
AC_MSG_CHECKING([whether jar supports stdin file arguments])
- if cat _config.list | $JAR cf@ _config.jar 2>&AS_MESSAGE_LOG_FD; then
+ if cat _config.list | $JAR cf@ _config.jar >&AS_MESSAGE_LOG_FD 2>&1; then
JAR_ACCEPTS_STDIN_LIST=1
AC_MSG_RESULT(yes)
else
@@ -383,7 +383,7 @@ EOF
fi
rm -f _config.list _config.jar
AC_MSG_CHECKING([whether jar supports -J options at the end])
- if $JAR cf _config.jar _config.txt -J-Xmx896m 2>&AS_MESSAGE_LOG_FD; then
+ if $JAR cf _config.jar _config.txt -J-Xmx896m >&AS_MESSAGE_LOG_FD 2>&1; then
JAR_KNOWS_J_OPTIONS=1
AC_MSG_RESULT(yes)
else
@@ -1687,7 +1687,7 @@ AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS],
ICEDTEA_REVISION="none";
JDK_REVISION="none";
HOTSPOT_REVISION="none";
- if which ${HG} >/dev/null; then
+ if which ${HG} >&AS_MESSAGE_LOG_FD 2>&1; then
AC_MSG_CHECKING([for IcedTea Mercurial revision ID])
if test -e ${abs_top_srcdir}/.hg ; then
ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} tip --template '{node|short}')`" ;
@@ -1734,8 +1734,7 @@ if test "x${enable_plugin}" = "xyes" ; t
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-
- if $PKG_CONFIG --atleast-version 1.9.2 libxul 2>&AS_MESSAGE_LOG_FD ; then
+ if $PKG_CONFIG --atleast-version 1.9.2 libxul >&AS_MESSAGE_LOG_FD 2>&1; then
xullibs=libxul
else
xullibs="libxul libxul-unstable"
diff -r 108556963776 -r 854406ecaf7f patches/icedtea-systemtap.patch
--- a/patches/icedtea-systemtap.patch Mon Apr 12 17:20:51 2010 -0400
+++ b/patches/icedtea-systemtap.patch Mon Jun 07 21:03:36 2010 +0100
@@ -1,6 +1,6 @@ diff -r 945bf7540697 make/linux/makefile
-diff -r 945bf7540697 make/linux/makefiles/dtrace.make
---- openjdk/hotspot/make/linux/makefiles/dtrace.make Thu Jan 22 14:42:01 2009 -0800
-+++ openjdk/hotspot/make/linux/makefiles/dtrace.make Mon Feb 02 13:47:34 2009 +0100
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/dtrace.make openjdk/hotspot/make/linux/makefiles/dtrace.make
+--- openjdk.orig/hotspot/make/linux/makefiles/dtrace.make 2010-05-14 16:02:53.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/dtrace.make 2010-06-07 17:42:38.000000000 +0100
@@ -25,3 +25,7 @@
# Linux does not build jvm_db
LIBJVM_DB =
@@ -9,9 +9,10 @@ diff -r 945bf7540697 make/linux/makefile
+CFLAGS += -DDTRACE_ENABLED
+
+# It doesn't support HAVE_DTRACE_H though.
---- openjdk/hotspot/src/share/vm/prims/jni.cpp 2009-10-13 15:34:52.499809508 +0200
-+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2009-10-13 15:31:26.117823588 +0200
-@@ -1747,10 +1744,7 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2010-05-14 16:02:53.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2010-06-07 17:42:38.000000000 +0100
+@@ -1753,10 +1753,7 @@
JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \
JNIWrapper("Set" XSTR(Result) "Field"); \
\
@@ -23,7 +24,7 @@ diff -r 945bf7540697 make/linux/makefile
\
oop o = JNIHandles::resolve_non_null(obj); \
klassOop k = o->klass(); \
-@@ -1924,10 +1918,7 @@
+@@ -1930,10 +1927,7 @@
\
JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \
JNIWrapper("SetStatic" XSTR(Result) "Field"); \
@@ -35,36 +36,33 @@ diff -r 945bf7540697 make/linux/makefile
\
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \
assert(id->is_static_field_id(), "invalid static field id"); \
-@@ -2116,7 +2101,7 @@
- DT_RETURN_MARK(GetObjectArrayElement, jobject, (const jobject&)ret);
- objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(array));
- if (a->is_within_bounds(index)) {
-- jobject ret = JNIHandles::make_local(env, a->obj_at(index));
-+ ret = JNIHandles::make_local(env, a->obj_at(index));
- return ret;
- } else {
- char buf[jintAsStringSize];
-@@ -2150,14 +2150,14 @@
-
- #define DEFINE_NEWSCALARARRAY(Return,Allocator,Result) \
- \
-- DT_RETURN_MARK_DECL_FOR(Result, New##Result##Array, Return);\
-+ DT_RETURN_MARK_DECL(New##Result##Array, Return);\
- \
- JNI_ENTRY(Return, \
- jni_New##Result##Array(JNIEnv *env, jsize len)) \
- JNIWrapper("New" XSTR(Result) "Array"); \
- DTRACE_PROBE2(hotspot_jni, New##Result##Array__entry, env, len);\
- Return ret = NULL;\
-- DT_RETURN_MARK_FOR(Result, New##Result##Array, Return, (const Return&)ret);\
-+ DT_RETURN_MARK(New##Result##Array, Return, (const Return&)ret);\
- \
- oop obj= oopFactory::Allocator(len, CHECK_0); \
- ret = (Return) JNIHandles::make_local(env, obj); \
-
-diff -r 945bf7540697 src/share/vm/utilities/dtrace.hpp
---- openjdk/hotspot/src/share/vm/utilities/dtrace.hpp Thu Jan 22 14:42:01 2009 -0800
-+++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp Mon Feb 02 13:47:34 2009 +0100
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2010-06-07 17:41:12.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2010-06-07 17:42:38.000000000 +0100
+@@ -2441,16 +2441,16 @@
+ FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
+ FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
+ } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
+-#ifdef SOLARIS
++#ifdef DTRACE_ENABLED
+ FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true);
+ FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true);
+ FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true);
+ FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true);
+-#else // ndef SOLARIS
++#else // ndef DTRACE_ENABLED
+ jio_fprintf(defaultStream::error_stream(),
+- "ExtendedDTraceProbes flag is only applicable on Solaris\n");
++ "ExtendedDTraceProbes flag is only applicable on dtrace enabled builds\n");
+ return JNI_EINVAL;
+-#endif // ndef SOLARIS
++#endif // ndef DTRACE_ENABLED
+ #ifdef ASSERT
+ } else if (match_option(option, "-XX:+FullGCALot", &tail)) {
+ FLAG_SET_CMDLINE(bool, FullGCALot, true);
+diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp openjdk/hotspot/src/share/vm/utilities/dtrace.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp 2010-05-14 16:02:53.000000000 +0100
++++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp 2010-06-07 17:42:38.000000000 +0100
@@ -1,5 +1,6 @@
/*
* Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
@@ -157,26 +155,3 @@ diff -r 945bf7540697 src/share/vm/utilit
+#define HS_DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\
+ DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)
+#endif
---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-03-04 14:39:43.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-03-04 22:11:37.000000000 +0100
-@@ -2375,16 +2375,16 @@
- FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
- FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
- } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
--#ifdef SOLARIS
-+#ifdef DTRACE_ENABLED
- FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true);
- FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true);
- FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true);
- FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true);
--#else // ndef SOLARIS
-+#else // ndef DTRACE_ENABLED
- jio_fprintf(defaultStream::error_stream(),
-- "ExtendedDTraceProbes flag is only applicable on Solaris\n");
-+ "ExtendedDTraceProbes flag is only applicable on dtrace enabled builds\n");
- return JNI_EINVAL;
--#endif // ndef SOLARIS
-+#endif // ndef DTRACE_ENABLED
- #ifdef ASSERT
- } else if (match_option(option, "-XX:+FullGCALot", &tail)) {
- FLAG_SET_CMDLINE(bool, FullGCALot, true);
diff -r 108556963776 -r 854406ecaf7f patches/systemtap-gcc-4.5.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/systemtap-gcc-4.5.patch Mon Jun 07 21:03:36 2010 +0100
@@ -0,0 +1,11 @@
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 08:51:29.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 09:29:22.000000000 +0100
+@@ -2723,7 +2723,7 @@
+
+ if (!directBufferSupportInitializeEnded) {
+ if (!initializeDirectBufferSupport(env, thread)) {
+- DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL);
++ DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL);
+ return NULL;
+ }
+ }
diff -r 108556963776 -r 854406ecaf7f plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Apr 12 17:20:51 2010 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jun 07 21:03:36 2010 +0100
@@ -1464,7 +1464,7 @@ plugin_filter_environment(void)
plugin_filter_environment(void)
{
gchar **var_names = g_listenv();
- gchar **new_env = (gchar**) malloc(sizeof(gchar*) * g_strv_length (var_names));
+ gchar **new_env = (gchar**) malloc(sizeof(gchar*) * (g_strv_length (var_names) + 1));
int i_var, i_env;
for (i_var = 0, i_env = 0; var_names[i_var] != NULL; i_var++)
diff -r 108556963776 -r 854406ecaf7f ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Mon Apr 12 17:20:51 2010 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Mon Jun 07 21:03:36 2010 +0100
@@ -399,7 +399,13 @@ Value* SharkBuilder::memory_barrier() {
}
Value* SharkBuilder::memset() {
+#if SHARK_LLVM_VERSION >= 28
+ // LLVM 2.8 added a fifth isVolatile field for memset
+ // introduced with LLVM r100304
+ return make_function("llvm.memset.i32", "Cciii", "v");
+#else
return make_function("llvm.memset.i32", "Ccii", "v");
+#endif
}
Value* SharkBuilder::unimplemented() {
@@ -447,7 +453,12 @@ CallInst* SharkBuilder::CreateMemset(Val
Value* value,
Value* len,
Value* align) {
+#if SHARK_LLVM_VERSION >= 28
+ return CreateCall5(memset(), dst, value, len, align,
+ LLVMValue::jint_constant(0));
+#else
return CreateCall4(memset(), dst, value, len, align);
+#endif
}
CallInst* SharkBuilder::CreateUnimplemented(const char* file, int line) {
diff -r 108556963776 -r 854406ecaf7f ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Mon Apr 12 17:20:51 2010 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Mon Jun 07 21:03:36 2010 +0100
@@ -98,7 +98,8 @@ void SharkNativeWrapper::initialize(cons
if (is_static()) {
builder()->CreateStore(
builder()->CreateInlineOop(
- JNIHandles::make_local(target()->method_holder())),
+ JNIHandles::make_local(
+ target()->method_holder()->klass_part()->java_mirror())),
oop_tmp_slot());
param_types.push_back(box_type);
More information about the distro-pkg-dev
mailing list