/hg/icedtea: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 4 07:59:28 PDT 2010
changeset 628ba74f1b0b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=628ba74f1b0b
author: Matthias Klose <doko at ubuntu.com>
date: Thu Jun 03 13:42:03 2010 +0100
Update NEWS for 1.8.
2010-03-17 Matthias Klose <doko at ubuntu.com>
* NEWS: Update for 1.8.
changeset 0ceaac97f06d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0ceaac97f06d
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 03 14:53:04 2010 +0100
Updates for Hitachi SH
2010-03-17 Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
* acinclude.m4 (IT_SET_ARCH_SETTINGS): Define architecture
as sh for all sh* variants.
* patches/sh4-support.patch: Likewise.
changeset d4d99f124924 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d4d99f124924
author: Matthias Klose <doko at ubuntu.com>
date: Thu Jun 03 17:51:26 2010 +0100
More NEWS ...
2010-03-17 Matthias Klose <doko at ubuntu.com>
* NEWS: More news.
changeset 36ef4b3af35c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=36ef4b3af35c
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Mar 18 19:27:35 2010 +0100
Added new regression test to check if the cacerts keytool database
is configured and created properly and if SSL is really working.
2010-03-18 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/jtreg-httpTest.patch: new regression test
to check if the cacerts keytool database is configured and
created properly and if SSL is really working.
changeset b816ca920164 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b816ca920164
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Mar 19 11:40:06 2010 -0400
Fixed Bug# 166: Create FIFO pies in temp dir instead of
~/.icedteaplugin
2010-03-19 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc
(start_jvm_if_needed): Create pipes in a temporary dir instead of
users home directory. (plugin_start_appletviewer):
Pass pipe names to PluginMain when initializing Java.
* plugin/icedteanp/java/sun/applet/PluginMain.java: Receive pipe names
during initialization.
changeset 788424aa74ed in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=788424aa74ed
author: Gary Benson <gbenson at redhat.com>
date: Fri Mar 19 15:50:36 2010 +0000
Shark updates
2010-03-19 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
(SharkBlock::do_field_access): Indentation fixes.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::throw_ArithmeticException): New method.
(SharkBuilder::throw_ClassCastException): Likewise.
(SharkBuilder::frame_address): Likewise.
(SharkBuilder::CreateGetFrameAddress): Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::throw_ArithmeticException): New method.
(SharkBuilder::throw_ClassCastException): Likewise.
(SharkBuilder::frame_address): Likewise.
(SharkBuilder::CreateGetFrameAddress): Likewise.
(SharkBuilder::CreateMemoryBarrier): Actually do something on x86.
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
(SharkNativeWrapper::initialize): Implemented UseMembar code.
* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
(SharkRuntime::throw_ArithmeticException): New method.
(SharkRuntime::throw_ClassCastException): Likewise.
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
(SharkRuntime::throw_ArithmeticException): New method.
(SharkRuntime::throw_ClassCastException): Likewise.
* ports/hotspot/src/share/vm/shark/sharkStack.hpp
(SharkStack::initialize): Added setup_sp_and_method parameter.
(SharkStack::CreateStackOverflowCheck): New method.
(SharkStack::CreateCheckStack): Likewise.
(SharkStack::interpreter_entry_point): Likewise.
(SharkStackWithNormalFrame::interpreter_entry_point): Likewise.
(SharkStackWithNativeFrame::interpreter_entry_point): Likewise.
(SharkStack::CreateHardStackOverflowCheck): Removed.
(SharkStack::CreateSoftStackOverflowCheck): Likewise.
* ports/hotspot/src/share/vm/shark/sharkStack.cpp
(SharkStack::initialize): Added setup_sp_and_method parameter,
and changed to use new stack overflow detection code.
(SharkStack::CreateStackOverflowCheck): New method.
(SharkStack::CreateCheckStack): Likewise.
(SharkStack::CreateHardStackOverflowCheck): Removed.
(SharkStack::CreateSoftStackOverflowCheck): Likewise.
(SharkStackWithNormalFrame::interpreter_entry_point): Likewise.
(SharkStackWithNativeFrame::interpreter_entry_point): Likewise.
(SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated.
(SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
(SharkTopLevelBlock::static_field_ok_in_clinit): New method.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
(SharkTopLevelBlock::scan_for_traps): New trap.
(SharkTopLevelBlock::static_field_ok_in_clinit): New method.
(SharkTopLevelBlock::zero_check_value): Throw arithmetic exception
for divide by zero.
(SharkTopLevelBlock::do_full_instance_check): Throw class cast
exception. (SharkTopLevelBlock::do_monitorexit): Do not
handle exceptions.
* ports/hotspot/src/share/vm/shark/shark_globals.hpp: Make
debugging options available in product builds.
diffstat:
19 files changed, 527 insertions(+), 88 deletions(-)
ChangeLog | 85 ++++++++++
Makefile.am | 3
NEWS | 28 +++
acinclude.m4 | 6
patches/jtreg-httpTest.patch | 37 ++++
patches/sh4-support.patch | 126 +++++++++++++--
plugin/icedteanp/IcedTeaNPPlugin.cc | 58 ++++--
plugin/icedteanp/java/sun/applet/PluginMain.java | 6
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 12 -
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 22 ++
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 6
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 4
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 18 ++
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 6
ports/hotspot/src/share/vm/shark/sharkStack.cpp | 89 +++++++---
ports/hotspot/src/share/vm/shark/sharkStack.hpp | 25 ++
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 65 +++++++
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 5
ports/hotspot/src/share/vm/shark/shark_globals.hpp | 14 -
diffs (truncated from 1089 to 500 lines):
diff -r c19577b915ad -r 788424aa74ed ChangeLog
--- a/ChangeLog Thu Jun 03 12:31:47 2010 +0100
+++ b/ChangeLog Fri Mar 19 15:50:36 2010 +0000
@@ -1,3 +1,88 @@ 2010-06-03 Andrew John Hughes <ahughes
+2010-03-19 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+ (SharkBlock::do_field_access): Indentation fixes.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+ (SharkBuilder::throw_ArithmeticException): New method.
+ (SharkBuilder::throw_ClassCastException): Likewise.
+ (SharkBuilder::frame_address): Likewise.
+ (SharkBuilder::CreateGetFrameAddress): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::throw_ArithmeticException): New method.
+ (SharkBuilder::throw_ClassCastException): Likewise.
+ (SharkBuilder::frame_address): Likewise.
+ (SharkBuilder::CreateGetFrameAddress): Likewise.
+ (SharkBuilder::CreateMemoryBarrier): Actually do something on x86.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
+ (SharkNativeWrapper::initialize): Implemented UseMembar code.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
+ (SharkRuntime::throw_ArithmeticException): New method.
+ (SharkRuntime::throw_ClassCastException): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
+ (SharkRuntime::throw_ArithmeticException): New method.
+ (SharkRuntime::throw_ClassCastException): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.hpp
+ (SharkStack::initialize): Added setup_sp_and_method parameter.
+ (SharkStack::CreateStackOverflowCheck): New method.
+ (SharkStack::CreateCheckStack): Likewise.
+ (SharkStack::interpreter_entry_point): Likewise.
+ (SharkStackWithNormalFrame::interpreter_entry_point): Likewise.
+ (SharkStackWithNativeFrame::interpreter_entry_point): Likewise.
+ (SharkStack::CreateHardStackOverflowCheck): Removed.
+ (SharkStack::CreateSoftStackOverflowCheck): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp
+ (SharkStack::initialize): Added setup_sp_and_method parameter,
+ and changed to use new stack overflow detection code.
+ (SharkStack::CreateStackOverflowCheck): New method.
+ (SharkStack::CreateCheckStack): Likewise.
+ (SharkStack::CreateHardStackOverflowCheck): Removed.
+ (SharkStack::CreateSoftStackOverflowCheck): Likewise.
+ (SharkStackWithNormalFrame::interpreter_entry_point): Likewise.
+ (SharkStackWithNativeFrame::interpreter_entry_point): Likewise.
+ (SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated.
+ (SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+ (SharkTopLevelBlock::static_field_ok_in_clinit): New method.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+ (SharkTopLevelBlock::scan_for_traps): New trap.
+ (SharkTopLevelBlock::static_field_ok_in_clinit): New method.
+ (SharkTopLevelBlock::zero_check_value): Throw arithmetic exception
+ for divide by zero.
+ (SharkTopLevelBlock::do_full_instance_check): Throw class cast
+ exception.
+ (SharkTopLevelBlock::do_monitorexit): Do not handle exceptions.
+ * ports/hotspot/src/share/vm/shark/shark_globals.hpp:
+ Make debugging options available in product builds.
+
+2010-03-19 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (start_jvm_if_needed): Create pipes in a temporary dir instead of users
+ home directory.
+ (plugin_start_appletviewer): Pass pipe names to PluginMain when initializing Java.
+ * plugin/icedteanp/java/sun/applet/PluginMain.java: Receive pipe names
+ during initialization.
+
+2010-03-18 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/jtreg-httpTest.patch: new regression test
+ to check if the cacerts keytool database is configured and
+ created properly and if SSL is really working.
+
+2010-03-17 Matthias Klose <doko at ubuntu.com>
+
+ * NEWS: More news.
+
+2010-03-17 Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+
+ * acinclude.m4 (IT_SET_ARCH_SETTINGS): Define architecture as sh
+ for all sh* variants.
+ * patches/sh4-support.patch: Likewise.
+
+2010-03-17 Matthias Klose <doko at ubuntu.com>
+
+ * NEWS: Update for 1.8.
+
2010-06-03 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r c19577b915ad -r 788424aa74ed Makefile.am
--- a/Makefile.am Thu Jun 03 12:31:47 2010 +0100
+++ b/Makefile.am Fri Mar 19 15:50:36 2010 +0000
@@ -312,7 +312,8 @@ ICEDTEA_PATCHES = \
patches/sh4-support.patch \
patches/extensions/netx.patch \
patches/extensions/netx-dist.patch \
- patches/extensions/netx-umask.patch
+ patches/extensions/netx-umask.patch \
+ patches/jtreg-httpTest.patch
# Conditional patches
diff -r c19577b915ad -r 788424aa74ed NEWS
--- a/NEWS Thu Jun 03 12:31:47 2010 +0100
+++ b/NEWS Fri Mar 19 15:50:36 2010 +0000
@@ -27,6 +27,34 @@ New in release 1.13 (2010-XX-XX)
- Added JNI call tracing using systemtap version 1.0+ when
configuring with --enable-systemtap. See tapset/hotspot_jni.stp.
- Add support for Zero build on Hitachi SH.
+- Removed the old plugin, replaced by the NPPlugin.
+Bug fixes
+- PR179: Rhino bootclasspath issue
+- Add missing .c file to PulseAudio build
+Zero/Shark
+- Formatting changes and other fixes to match upstream
+- PR428: Shark on ARM precompiled header incls
+- Update Shark for LLVM r95390 API change.
+- S6927165: Zero S/390 fixes (from upstream)
+- Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs.
+- Add s390 support to TCK setup helper script
+- Strip stupid options that llvm-config supplies
+- Update Shark for LLVM r94686 API change.
+- S6914622, S6909153, S6913869 upstream Zero fixes.
+- Fixed Shark sharkCompiler mattr memory corruption bug when using llvm 2.7.
+NPPlugin fixes
+- PR446: Use JDK_UPDATE_VERSION to set the jpi version.
+- Re-designed frame embedding code so that the applet is dynamically
+ packed into given handle. This increases stability and breaks
+ reliance on the assumption that the browser will always provide a
+ handle in a certain sequence.
+- Encode new lines, carriage returns, and other special characters
+ before sending them to Java side (de-coding code is already in
+ effect on Java side).
+- Centralised and increased timeouts to give slow-loading applets
+ enough time to load.
+- Fix security permissions related to get/set property, based on
+ specifications.
New in release 1.12 (2009-11-17)
diff -r c19577b915ad -r 788424aa74ed acinclude.m4
--- a/acinclude.m4 Thu Jun 03 12:31:47 2010 +0100
+++ b/acinclude.m4 Fri Mar 19 15:50:36 2010 +0000
@@ -74,6 +74,12 @@
JRE_ARCH_DIR=s390x
CROSS_TARGET_ARCH=s390x
ARCHFLAG="-m64"
+ ;;
+ sh*)
+ BUILD_ARCH_DIR=sh
+ INSTALL_ARCH_DIR=sh
+ JRE_ARCH_DIR=sh
+ CROSS_TARGET_ARCH=sh
;;
*)
BUILD_ARCH_DIR=`uname -m`
diff -r c19577b915ad -r 788424aa74ed patches/jtreg-httpTest.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-httpTest.patch Fri Mar 19 15:50:36 2010 +0000
@@ -0,0 +1,37 @@
+--- /dev/null 2010-03-18 17:24:04.000000000 +0100
++++ openjdk/jdk/test/java/net/URL/TestHttps.java 2010-03-18 17:24:04.000000000 +0100
+@@ -0,0 +1,34 @@
++/*
++ * Copyright 2010 Red Hat, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++
++/* @test
++ * @summary This test check if the cacerts keytool database is configured properly and SSL is really working. The test should not fail if SSL is working.
++ */
++
++import java.io.IOException;
++
++import java.net.URL;
++import java.net.URLConnection;
++
++public class TestHttps {
++ public static void main(String[] args) throws IOException {
++ new URL("https://www.verisign.com/").openConnection().connect();
++ }
++}
diff -r c19577b915ad -r 788424aa74ed patches/sh4-support.patch
--- a/patches/sh4-support.patch Thu Jun 03 12:31:47 2010 +0100
+++ b/patches/sh4-support.patch Fri Mar 19 15:50:36 2010 +0000
@@ -1,7 +1,37 @@ diff -Nru openjdk.orig/corba/make/common
+diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
+--- openjdk.orig/corba/make/common/Defs-linux.gmk 2010-06-03 14:00:19.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2010-06-03 14:08:47.000000000 +0100
+@@ -109,6 +109,7 @@
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+ LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
++CFLAGS_REQUIRED_sh += -mieee
+ ifeq ($(ZERO_BUILD), true)
+ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
+ ifeq ($(ZERO_ENDIANNESS), little)
+@@ -186,7 +187,7 @@
+ CXXFLAGS_DBG += $(CC_LOWER_OPT)
+ endif
+
+-CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) \
++CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha sh),,-D$(ARCH)) \
+ -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
+ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
+
diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
---- openjdk.orig/corba/make/common/shared/Platform.gmk 2010-05-10 15:04:44.000000000 +0100
-+++ openjdk/corba/make/common/shared/Platform.gmk 2010-05-10 18:37:14.000000000 +0100
-@@ -220,6 +220,9 @@
+--- openjdk.orig/corba/make/common/shared/Platform.gmk 2010-06-03 14:00:19.000000000 +0100
++++ openjdk/corba/make/common/shared/Platform.gmk 2010-06-03 14:11:30.000000000 +0100
+@@ -193,6 +193,9 @@
+ arm*) \
+ echo arm \
+ ;; \
++ sh*) \
++ echo sh \
++ ;; \
+ *) \
+ echo $(mach) \
+ ;; \
+@@ -220,6 +223,9 @@
else
ARCH_DATA_MODEL=64
endif
@@ -12,8 +42,8 @@ diff -Nru openjdk.orig/corba/make/common
endif
diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2010-05-10 15:04:44.000000000 +0100
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-05-10 18:37:14.000000000 +0100
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-03 14:00:19.000000000 +0100
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-03 14:08:47.000000000 +0100
@@ -1756,7 +1756,8 @@
{EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
{EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
@@ -37,9 +67,29 @@ diff -Nru openjdk.orig/hotspot/src/os/li
#endif
// Identify compatability class for VM's architecture and library's architecture
+diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2010-06-03 14:00:19.000000000 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk 2010-06-03 14:08:47.000000000 +0100
+@@ -126,6 +126,7 @@
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+ LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
++CFLAGS_REQUIRED_sh += -mieee
+ ifeq ($(ZERO_BUILD), true)
+ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
+ ifeq ($(ZERO_ENDIANNESS), little)
+@@ -204,7 +205,7 @@
+ CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
+ endif
+
+-CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) \
++CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha sh),,-D$(ARCH)) \
+ -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
+ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
+
diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2010-05-10 15:04:45.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2010-05-10 18:37:14.000000000 +0100
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2010-06-03 14:00:21.000000000 +0100
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2010-06-03 14:08:47.000000000 +0100
@@ -117,6 +117,11 @@
REQUIRED_CC_VER = 3.2
REQUIRED_GCC_VER = 3.2.*
@@ -52,9 +102,67 @@ diff -Nru openjdk.orig/jdk/make/common/s
# Option used to create a shared library
SHARED_LIBRARY_FLAG = -shared -mimpure-text
SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2010-06-03 14:00:19.000000000 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk 2010-06-03 14:08:47.000000000 +0100
+@@ -171,6 +171,9 @@
+ arm*) \
+ echo arm \
+ ;; \
++ sh*) \
++ echo sh \
++ ;; \
+ *) \
+ echo $(mach) \
+ ;; \
+@@ -198,6 +201,9 @@
+ else
+ ARCH_DATA_MODEL=64
+ endif
++ ifeq ($(ARCH), sh)
++ ARCH_DATA_MODEL=32
++ endif
+ endif
+ endif
+
+diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
+--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2010-06-03 14:00:19.000000000 +0100
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2010-06-03 14:10:12.000000000 +0100
+@@ -114,9 +114,9 @@
+ CPPFLAGS += -DX_ARCH=X_SPARCV9
+ endif # ARCH sparcv9
+
+- ifeq ($(ARCH), amd64)
+- CPPFLAGS += -DX_ARCH=X_AMD64
+- endif # ARCH amd64
++ ifeq ($(ARCH), sh)
++ CPPFLAGS += -DX_ARCH=X_SH
++ endif # ARCH Renesas SuperH(sh)
+ endif
+
+
+diff -Nru openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh
+--- openjdk.orig/jdk/make/jdk_generic_profile.sh 2010-05-19 19:30:53.000000000 +0100
++++ openjdk/jdk/make/jdk_generic_profile.sh 2010-06-03 14:10:57.000000000 +0100
+@@ -349,13 +349,14 @@
+ i?86) ZERO_LIBARCH=i386 ;;
+ sparc64) ZERO_LIBARCH=sparcv9 ;;
+ arm*) ZERO_LIBARCH=arm ;;
++ sh*) ZERO_LIBARCH=sh ;;
+ *) ZERO_LIBARCH="$(arch)"
+ esac
+ export ZERO_LIBARCH
+
+ # ARCH_DATA_MODEL is the number of bits in a pointer
+ case "${ZERO_LIBARCH}" in
+- i386|ppc|s390|sparc|arm)
++ i386|ppc|s390|sparc|arm|sh)
+ ARCH_DATA_MODEL=32
+ ;;
+ amd64|ppc64|s390x|sparcv9|ia64|alpha)
diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
---- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-05-10 15:04:44.000000000 +0100
-+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-05-10 18:37:14.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-03 14:00:19.000000000 +0100
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-03 14:08:47.000000000 +0100
@@ -47,7 +47,8 @@
#define X_S390X 12
#define X_SPARC 13
diff -r c19577b915ad -r 788424aa74ed plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jun 03 12:31:47 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Mar 19 15:50:36 2010 +0000
@@ -434,8 +434,8 @@ void start_jvm_if_needed()
// pipe.
// in_pipe_name
- in_pipe_name = g_strdup_printf ("%s/icedteanp-appletviewer-to-plugin",
- data_directory);
+ in_pipe_name = g_strdup_printf ("%s/%s-icedteanp-appletviewer-to-plugin",
+ data_directory, getenv ("USER"));
if (!in_pipe_name)
{
PLUGIN_ERROR ("Failed to create input pipe name.");
@@ -449,7 +449,7 @@ void start_jvm_if_needed()
unlink (in_pipe_name);
PLUGIN_DEBUG_1ARG ("GCJ_New: creating input fifo: %s\n", in_pipe_name);
- if (mkfifo (in_pipe_name, 0700) == -1 && errno != EEXIST)
+ if (mkfifo (in_pipe_name, 0600) == -1 && errno != EEXIST)
{
PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
np_error = NPERR_GENERIC_ERROR;
@@ -461,8 +461,8 @@ void start_jvm_if_needed()
// output pipe.
// out_pipe_name
- out_pipe_name = g_strdup_printf ("%s/icedteanp-plugin-to-appletviewer",
- data_directory);
+ out_pipe_name = g_strdup_printf ("%s/%s-icedteanp-plugin-to-appletviewer",
+ data_directory, getenv ("USER"));
if (!out_pipe_name)
{
@@ -475,7 +475,7 @@ void start_jvm_if_needed()
unlink (out_pipe_name);
PLUGIN_DEBUG_1ARG ("GCJ_New: creating output fifo: %s\n", out_pipe_name);
- if (mkfifo (out_pipe_name, 0700) == -1 && errno != EEXIST)
+ if (mkfifo (out_pipe_name, 0600) == -1 && errno != EEXIST)
{
PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
np_error = NPERR_GENERIC_ERROR;
@@ -1461,19 +1461,23 @@ plugin_start_appletviewer (GCJPluginData
if (plugin_debug)
{
- command_line = (gchar**) malloc(sizeof(gchar*)*6);
+ command_line = (gchar**) malloc(sizeof(gchar*)*8);
command_line[0] = g_strdup(appletviewer_executable);
command_line[1] = g_strdup("-Xdebug");
command_line[2] = g_strdup("-Xnoagent");
command_line[3] = g_strdup("-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n");
command_line[4] = g_strdup("sun.applet.PluginMain");
- command_line[5] = NULL;
+ command_line[5] = g_strdup(out_pipe_name);
+ command_line[6] = g_strdup(in_pipe_name);
+ command_line[7] = NULL;
} else
{
- command_line = (gchar**) malloc(sizeof(gchar)*3);
+ command_line = (gchar**) malloc(sizeof(gchar)*5);
command_line[0] = g_strdup(appletviewer_executable);
command_line[1] = g_strdup("sun.applet.PluginMain");
- command_line[2] = NULL;
+ command_line[2] = g_strdup(out_pipe_name);
+ command_line[3] = g_strdup(in_pipe_name);
+ command_line[4] = NULL;
}
if (!g_spawn_async (NULL, command_line, NULL, (GSpawnFlags) G_SPAWN_DO_NOT_REAP_CHILD,
@@ -1963,7 +1967,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
// Make sure the plugin data directory exists, creating it if
// necessary.
- data_directory = g_strconcat (getenv ("HOME"), "/.icedteaplugin", NULL);
+ data_directory = g_strconcat (P_tmpdir, NULL);
if (!data_directory)
{
PLUGIN_ERROR ("Failed to create data directory name.");
@@ -1971,20 +1975,34 @@ NP_Initialize (NPNetscapeFuncs* browserT
}
NPError np_error = NPERR_NO_ERROR;
gchar* filename = NULL;
+
+ // If P_tmpdir does not exist, try /tmp directly
+
if (!g_file_test (data_directory,
(GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
{
int file_error = 0;
- file_error = g_mkdir (data_directory, 0700);
- if (file_error != 0)
- {
- PLUGIN_ERROR_THREE ("Failed to create data directory",
- data_directory,
- strerror (errno));
- np_error = NPERR_GENERIC_ERROR;
- goto cleanup_data_directory;
- }
+ data_directory = g_strconcat ("/tmp", NULL);
+ if (!data_directory)
+ {
+ PLUGIN_ERROR ("Failed to create data directory name.");
+ return NPERR_OUT_OF_MEMORY_ERROR;
+ }
+
+ }
+
+ // If that doesn't exit, bail
+ if (!g_file_test (data_directory,
+ (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
+ {
+ PLUGIN_ERROR_THREE ("Temp directory does not exist: ",
+ data_directory,
+ strerror (errno));
+
+ np_error = NPERR_GENERIC_ERROR;
+ goto cleanup_data_directory;
+
}
// Set appletviewer_executable.
diff -r c19577b915ad -r 788424aa74ed plugin/icedteanp/java/sun/applet/PluginMain.java
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 03 12:31:47 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Fri Mar 19 15:50:36 2010 +0000
@@ -107,9 +107,13 @@ public class PluginMain
public static void main(String args[])
throws IOException
{
+ if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
+ System.err.println("Invalid pipe names provided. Refusing to proceed.");
+ System.exit(1);
+ }
try {
- PluginMain pm = new PluginMain(System.getProperty("user.home") + "/.icedteaplugin/icedteanp-plugin-to-appletviewer", System.getProperty("user.home") + "/.icedteaplugin/icedteanp-appletviewer-to-plugin");
+ PluginMain pm = new PluginMain(args[0], args[1]);
} catch (Exception e) {
e.printStackTrace();
System.err.println("Something very bad happened. I don't know what to do, so I am going to exit :(");
diff -r c19577b915ad -r 788424aa74ed ports/hotspot/src/share/vm/shark/sharkBlock.cpp
More information about the distro-pkg-dev
mailing list