summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorLuotao Fu <l.fu@pengutronix.de>2009-06-05 21:01:31 +0000
committerLuotao Fu <l.fu@pengutronix.de>2009-06-05 21:01:31 +0000
commit56c84ab4833a4f435a29b4859a3863b73f24f9bd (patch)
treec71055b8d99141a7a77c3eaf7ead8bdb27095adf /rules
parent6ffcf3f6c3f097788af22c622818bab9b27bad68 (diff)
downloadptxdist-56c84ab4833a4f435a29b4859a3863b73f24f9bd.tar.gz
ptxdist-56c84ab4833a4f435a29b4859a3863b73f24f9bd.tar.xz
* fix classpath
* add debug options for jamvm git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10639 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
-rw-r--r--rules/classpath.make2
-rw-r--r--rules/jamvm.in53
-rw-r--r--rules/jamvm.make45
3 files changed, 88 insertions, 12 deletions
diff --git a/rules/classpath.make b/rules/classpath.make
index 158b262ba..db55acecb 100644
--- a/rules/classpath.make
+++ b/rules/classpath.make
@@ -83,7 +83,7 @@ CLASSPATH_AUTOCONF := \
--disable-rpath \
--disable-maintainer-mode \
--disable-debug \
- --disable-load-library \
+ --enable-load-library \
--disable-java-lang-system-explicit-initialization \
--disable-examples \
--enable-tools \
diff --git a/rules/jamvm.in b/rules/jamvm.in
index 6edc49afb..5576faba6 100644
--- a/rules/jamvm.in
+++ b/rules/jamvm.in
@@ -18,4 +18,57 @@ config JAMVM_USE_LIBFFI
help
"enable libffi support"
+menuconfig JAMVM_TRACE
+ bool
+ prompt "enable debug tracers"
+ help
+ enable some tracers for debuggin purpose
+
+if JAMVM_TRACE
+
+config JAMVM_TRACE_ALL
+ bool
+ select JAMVM_TRACE_GC
+ select JAMVM_TRACE_ALLOC
+ select JAMVM_TRACE_FNLZ
+ select JAMVM_TRACE_DLL
+ select JAMVM_TRACE_LOCK
+ select JAMVM_TRACE_THREAD
+ select JAMVM_TRACE_DIRECT
+ select JAMVM_TRACE_INLINING
+ prompt "enalbe all tracers"
+
+config JAMVM_TRACE_GC
+ bool
+ prompt "gc tracing"
+
+config JAMVM_TRACE_ALLOC
+ bool
+ prompt "alloc tracing"
+
+config JAMVM_TRACE_FNLZ
+ bool
+ prompt "fnlz tracing"
+
+config JAMVM_TRACE_DLL
+ bool
+ prompt "dll tracing"
+
+config JAMVM_TRACE_LOCK
+ bool
+ prompt "object locking tracing"
+
+config JAMVM_TRACE_THREAD
+ bool
+ prompt "thread creation tracing"
+
+config JAMVM_TRACE_DIRECT
+ bool
+ prompt "interpreter direct-mode tracing"
+
+config JAMVM_TRACE_INLINING
+ bool
+ prompt "interpeter inlining tracing"
+endif
+
endif
diff --git a/rules/jamvm.make b/rules/jamvm.make
index b1dc97429..569576120 100644
--- a/rules/jamvm.make
+++ b/rules/jamvm.make
@@ -44,16 +44,6 @@ JAMVM_ENV := $(CROSS_ENV)
#
JAMVM_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
- --disable-tracegc \
- --disable-tracealloc \
- --disable-tracefnlz \
- --disable-tracedll \
- --disable-tracelock \
- --disable-tracethread \
- --disable-tracecompact \
- --disable-tracedirect \
- --disable-traceinlining \
- --disable-trace \
--enable-int-threading \
--enable-int-direct \
--enable-int-caching \
@@ -62,7 +52,7 @@ JAMVM_AUTOCONF := \
--disable-int-inlining \
--enable-zip \
--enable-fast-install \
- --with-classpath-install-dir=/usr/classpath
+ --with-classpath-install-dir=/usr
ifdef PTXCONF_JAMVM_USE_LIBFFI
JAMVM_AUTOCONF += --enable-ffi
@@ -70,6 +60,39 @@ else
JAMVM_AUTOCONF += --disable-ffi
endif
+ifndef PTXCONF_JAMVM_TRACE
+JAMVM_AUTOCONF += --disable-trace
+else
+ifdef PTXCONF_JAMVM_TRACE_ALL
+JAMVM_AUTOCONF += --enable-trace
+else
+ifdef PTXCONF_JAMVM_TRACE_GC
+JAMVM_AUTOCONF += --enable-tracegc
+endif
+ifdef PTXCONF_JAMVM_TRACE_ALLOC
+JAMVM_AUTOCONF += --enable-tracealloc
+endif
+ifdef PTXCONF_JAMVM_TRACE_FNLZ
+JAMVM_AUTOCONF += --enable-tracefnlz
+endif
+ifdef PTXCONF_JAMVM_TRACE_DLL
+JAMVM_AUTOCONF += --enable-tracedll
+endif
+ifdef PTXCONF_JAMVM_TRACE_LOCK
+JAMVM_AUTOCONF += --enable-tracelock
+endif
+ifdef PTXCONF_JAMVM_TRACE_THREAD
+JAMVM_AUTOCONF += --enable-tracethread
+endif
+ifdef PTXCONF_JAMVM_TRACE_DIRECT
+JAMVM_AUTOCONF += --enable-tracedirect
+endif
+ifdef PTXCONF_JAMVM_TRACE_INLINING
+JAMVM_AUTOCONF += --enable-traceinlining
+endif
+endif #ifdef PTXCONF_JAMVM_TRACE_ALL
+endif #ifndef PTXCONF_JAMVM_TRACE
+
# FIXME:
# - --enable-int-caching should be disabled on x86_64
# - --enable-int-prefetch should be enabled on powerpc