/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 24 09:46:06 PST 2010
changeset be32f963a8b7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be32f963a8b7
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 17:44:36 2010 +0000
Provide a single rule to build all PulseAudio object files without
explicit source file names.
2010-02-24 Andrew John Hughes <ahughes at redhat.com>
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Pul
seAudioStreamVolumeControl.c: Removed, never built and no
corresponding Java source file.
* Makefile.am: (PULSE_JAVA_NATIVE_SRCS): List of PulseAudio
source files. (PULSE_JAVA_NATIVE_OBJECTS): List of
PulseAudio object files. (PULSE_JAVA_TARGET):
Optional PulseAudio target. (icedtea.stamp): Replace
explicit pulse-java.stamp with PULSE_JAVA_TARGET.
(icedtea-debug.stamp): Likewise. (pulse-java.stamp): Depend
on compiled library rather than headers target.
($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): New target to compile
object files from source files using make substitution.
($(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so): New target
to build the shared library. (pulse-java-jar.stamp): Make
ENABLE_PULSE_JAVA conditional encompass all PulseAudio
targets. (pulse-java-class.stamp): Likewise. (clean-
pulse-java): Likewise. (pulse-java-headers.stamp): Likewise,
and remove unneeded BOOT_DIR conditional (pulse-java-
class.stamp now depends on the appropriate bootstrap
target).
changeset 25ad23f47dfd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=25ad23f47dfd
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 17:45:42 2010 +0000
Merge
diffstat:
48 files changed, 1021 insertions(+), 1613 deletions(-)
ChangeLog | 138 ++++++
Makefile.am | 70 +--
plugin/icedteanp/IcedTeaNPPlugin.cc | 4
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 10
ports/hotspot/make/linux/makefiles/shark.make | 6
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 12
ports/hotspot/src/share/vm/includeDB_shark | 2
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 1
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 157 ++-----
ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 85 +--
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 193 ++------
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 14
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 67 +--
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 129 +----
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 18
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 70 ++-
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 15
ports/hotspot/src/share/vm/shark/sharkConstant.cpp | 9
ports/hotspot/src/share/vm/shark/sharkConstant.hpp | 12
ports/hotspot/src/share/vm/shark/sharkContext.cpp | 17
ports/hotspot/src/share/vm/shark/sharkContext.hpp | 89 +---
ports/hotspot/src/share/vm/shark/sharkEntry.hpp | 21
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 46 --
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 37 -
ports/hotspot/src/share/vm/shark/sharkInliner.cpp | 107 +---
ports/hotspot/src/share/vm/shark/sharkInliner.hpp | 2
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | 34 -
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp | 3
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp | 3
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 50 --
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 51 --
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 12
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 17
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp | 68 +--
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 52 --
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 19
ports/hotspot/src/share/vm/shark/sharkStack.cpp | 65 +-
ports/hotspot/src/share/vm/shark/sharkStack.hpp | 92 +---
ports/hotspot/src/share/vm/shark/sharkState.cpp | 42 -
ports/hotspot/src/share/vm/shark/sharkState.hpp | 65 --
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 13
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 5
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 222 +++-------
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 115 +----
ports/hotspot/src/share/vm/shark/sharkType.hpp | 75 +--
ports/hotspot/src/share/vm/shark/sharkValue.cpp | 168 ++-----
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 65 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c | 67 ---
diffs (truncated from 6623 to 500 lines):
diff -r ede5e9311ef4 -r 25ad23f47dfd ChangeLog
--- a/ChangeLog Sun Feb 21 12:38:45 2010 +0000
+++ b/ChangeLog Wed Feb 24 17:45:42 2010 +0000
@@ -1,3 +1,141 @@ 2010-02-21 Andrew John Hughes <ahughes@
+2010-02-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c:
+ Removed, never built and no corresponding
+ Java source file.
+ * Makefile.am:
+ (PULSE_JAVA_NATIVE_SRCS): List of PulseAudio source
+ files.
+ (PULSE_JAVA_NATIVE_OBJECTS): List of PulseAudio object
+ files.
+ (PULSE_JAVA_TARGET): Optional PulseAudio target.
+ (icedtea.stamp): Replace explicit pulse-java.stamp
+ with PULSE_JAVA_TARGET.
+ (icedtea-debug.stamp): Likewise.
+ (pulse-java.stamp): Depend on compiled library rather than
+ headers target.
+ ($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): New target to compile
+ object files from source files using make substitution.
+ ($(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so): New target
+ to build the shared library.
+ (pulse-java-jar.stamp): Make ENABLE_PULSE_JAVA conditional
+ encompass all PulseAudio targets.
+ (pulse-java-class.stamp): Likewise.
+ (clean-pulse-java): Likewise.
+ (pulse-java-headers.stamp): Likewise, and remove unneeded
+ BOOT_DIR conditional (pulse-java-class.stamp now depends on
+ the appropriate bootstrap target).
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes.
+ * 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/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/sharkCacheDecache.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.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/sharkInliner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInliner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.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/sharkStateScanner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Reformatted
+ with trailing opening braces to match upstream HotSpot.
+ * 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/sharkCacheDecache.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.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/sharkConstant.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkConstant.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkEntry.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/sharkInliner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.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/sharkStateScanner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
+ jpi version.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
+2010-02-22 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
+ and increased timeouts to give slow-loading applets enough time to load.
+
+2010-02-21 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+ (MCPU): Explicitly defined for use by LLVM command line parser.
+ (MAttrs): Likewise.
+ (SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
+ in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+ Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
+ JIT are linked in.
+
2010-02-21 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r ede5e9311ef4 -r 25ad23f47dfd Makefile.am
--- a/Makefile.am Sun Feb 21 12:38:45 2010 +0000
+++ b/Makefile.am Wed Feb 24 17:45:42 2010 +0000
@@ -167,17 +167,14 @@ if ENABLE_PULSE_JAVA
# include the makefile in pulseaudio subdir
PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
+PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio
PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
+PULSE_JAVA_NATIVE_OBJECTS = \
+ $(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
-else
-PULSE_JAVA_DIR =
-PULSE_JAVA_NATIVE_SRCDIR =
-PULSE_JAVA_BUILDDIR =
-PULSE_JAVA_NATIVE_BUILDDIR =
-PULSE_JAVA_JAVA_SRCDIR =
-PULSE_JAVA_CLASS_DIR =
+PULSE_JAVA_TARGET = stamps/pulse-java.stamp
endif
# FIXME (HotSpot): no longer needed
@@ -1320,7 +1317,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
extra-lib/about.jar stamps/cacao.stamp \
- stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
+ stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1421,7 +1418,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
extra-lib/about.jar stamps/cacao.stamp \
- stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
+ stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1608,6 +1605,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
mkdir -p $(NPPLUGIN_DIR) && \
cd $(NPPLUGIN_DIR) && \
$(CXX) $(CXXFLAGS) \
+ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
-DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
-DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
$(GLIB_CFLAGS) \
@@ -1705,21 +1703,21 @@ extra-lib/about.jar: stamps/extra-class-
#FIXME (meta): Need pulse-java meta target
-stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp stamps/pulse-java-headers.stamp
if ENABLE_PULSE_JAVA
+$(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
- $(CC) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/jni-common.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_EventLoop.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_EventLoop.o
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
- $(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o libpulse-java.so
-endif
+ $(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \
+ -o $@ -c $<
+
+$(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
+ $(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
+ -o $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
+
+stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
mkdir -p stamps
touch stamps/pulse-java.stamp
stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
-if ENABLE_PULSE_JAVA
mkdir -p $(PULSE_JAVA_CLASS_DIR);
if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
@@ -1727,48 +1725,36 @@ if ENABLE_PULSE_JAVA
else \
$(ICEDTEA_BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .; \
fi
-endif
mkdir -p stamps
touch stamps/pulse-java-jar.stamp
stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
-if ENABLE_PULSE_JAVA
mkdir -p $(PULSE_JAVA_CLASS_DIR)
(cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR)\
+ $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR) \
-bootclasspath '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
- org/classpath/icedtea/pulseaudio/*.java\
+ org/classpath/icedtea/pulseaudio/*.java \
)
cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
-endif
mkdir -p stamps
touch stamps/pulse-java-class.stamp
-
stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
-if ENABLE_PULSE_JAVA
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
- $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
- $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
- $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
- $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
- fi
-endif
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ org.classpath.icedtea.pulseaudio.EventLoop ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ org.classpath.icedtea.pulseaudio.Stream ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ org.classpath.icedtea.pulseaudio.Operation; \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
mkdir -p stamps
touch stamps/pulse-java-headers.stamp
-
clean-pulse-java:
-if ENABLE_PULSE_JAVA
[ -z "$(PULSE_JAVA_NATIVE_BUILDDIR)" ] || rm -rf $(PULSE_JAVA_NATIVE_BUILDDIR)
[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR)
rm -f stamps/pulse-java*.stamp
diff -r ede5e9311ef4 -r 25ad23f47dfd plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Sun Feb 21 12:38:45 2010 +0000
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Feb 24 17:45:42 2010 +0000
@@ -107,7 +107,7 @@ exception statement from your version. *
"application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \
"application/x-java-applet;version=1.5:class,jar:IcedTea;" \
"application/x-java-applet;version=1.6:class,jar:IcedTea;" \
- "application/x-java-applet;jpi-version=1.6.0_00:class,jar:IcedTea;" \
+ "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \
"application/x-java-bean:class,jar:IcedTea;" \
"application/x-java-bean;version=1.1:class,jar:IcedTea;" \
"application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \
@@ -123,7 +123,7 @@ exception statement from your version. *
"application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \
"application/x-java-bean;version=1.5:class,jar:IcedTea;" \
"application/x-java-bean;version=1.6:class,jar:IcedTea;" \
- "application/x-java-bean;jpi-version=1.6.0_00:class,jar:IcedTea;" \
+ "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \
"application/x-java-vm-npruntime::IcedTea;"
#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
diff -r ede5e9311ef4 -r 25ad23f47dfd plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Sun Feb 21 12:38:45 2010 +0000
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Feb 24 17:45:42 2010 +0000
@@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Applet a;
// Wait for panel to come alive
- int maxWait = 5000; // wait 5 seconds max for panel to come alive
+ int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
int wait = 0;
while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
try {
@@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
private long handle = 0;
private WindowListener windowEventListener = null;
private AppletEventListener appletEventListener = null;
+
+ public static final int APPLET_TIMEOUT = 60000;
/**
* Null constructor to allow instantiation via newInstance()
@@ -616,7 +618,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
if (message.startsWith("handle")) {
PluginDebug.debug("handle command waiting for applet to complete loading.");
- int maxWait = 10000; // wait 10 seconds max for applet to fully load
+ int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
int wait = 0;
while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
(wait < maxWait)) {
@@ -663,7 +665,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
if (message.startsWith("width")) {
// Wait for panel to come alive
- int maxWait = 5000; // wait 5 seconds max for panel to come alive
+ int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
int wait = 0;
while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
try {
@@ -724,7 +726,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Object o;
// Wait for panel to come alive
- int maxWait = 5000; // wait 5 seconds max for panel to come alive
+ int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
int wait = 0;
while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
try {
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/make/linux/makefiles/shark.make Wed Feb 24 17:45:42 2010 +0000
@@ -1,6 +1,6 @@
#
# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 2010 Red Hat, Inc.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -20,10 +20,10 @@
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
-#
+#
#
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
TYPE = SHARK
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Wed Feb 24 17:45:42 2010 +0000
@@ -1,6 +1,6 @@
/*
* Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,11 @@
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
- *
+ *
*/
-//
-// Sets the default values for platform dependent flags used by the
-// Shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler. See globals.hpp for details of what they do.
define_pd_global(bool, BackgroundCompilation, true );
define_pd_global(bool, UseTLAB, true );
@@ -52,7 +50,7 @@ define_pd_global(intx, NewRatio,
define_pd_global(intx, NewRatio, 12 );
define_pd_global(intx, NewSizeThreadIncrease, 4*K );
define_pd_global(intx, InitialCodeCacheSize, 160*K);
-define_pd_global(intx, ReservedCodeCacheSize, 32*M );
+define_pd_global(intx, ReservedCodeCacheSize, 32*M );
define_pd_global(bool, ProfileInterpreter, false);
define_pd_global(intx, CodeCacheExpansionSize, 32*K );
define_pd_global(uintx, CodeCacheMinBlockLength, 1 );
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/share/vm/includeDB_shark Wed Feb 24 17:45:42 2010 +0000
@@ -20,7 +20,7 @@
// Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
// CA 95054 USA or visit www.sun.com if you need additional information or
// have any questions.
-//
+//
//
// NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Wed Feb 24 17:45:42 2010 +0000
@@ -44,6 +44,7 @@
#include <llvm/ExecutionEngine/JITMemoryManager.h>
#include <llvm/Support/CommandLine.h>
#if SHARK_LLVM_VERSION >= 27
+#include <llvm/ExecutionEngine/JIT.h>
#include <llvm/ADT/StringMap.h>
#include <llvm/Support/Debug.h>
#include <llvm/System/Host.h>
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Wed Feb 24 17:45:42 2010 +0000
@@ -28,8 +28,7 @@
using namespace llvm;
-void SharkBlock::parse_bytecode(int start, int limit)
-{
+void SharkBlock::parse_bytecode(int start, int limit) {
SharkValue *a, *b, *c, *d;
int i;
@@ -45,7 +44,7 @@ void SharkBlock::parse_bytecode(int star
if (SharkTraceBytecodes)
tty->print_cr("%4d: %s", bci(), Bytecodes::name(bc()));
-
+
if (has_trap() && trap_bci() == bci()) {
do_trap(trap_request());
return;
@@ -96,7 +95,7 @@ void SharkBlock::parse_bytecode(int star
}
}
break;
- }
+ }
}
switch (bc()) {
@@ -295,25 +294,25 @@ void SharkBlock::parse_bytecode(int star
xpop();
xpop();
break;
- case Bytecodes::_swap:
+ case Bytecodes::_swap:
a = xpop();
b = xpop();
xpush(a);
xpush(b);
- break;
+ break;
case Bytecodes::_dup:
a = xpop();
xpush(a);
xpush(a);
break;
- case Bytecodes::_dup_x1:
+ case Bytecodes::_dup_x1:
a = xpop();
b = xpop();
xpush(a);
xpush(b);
xpush(a);
break;
- case Bytecodes::_dup_x2:
+ case Bytecodes::_dup_x2:
a = xpop();
More information about the distro-pkg-dev
mailing list