Hello community,
here is the log from the commit of package java-1_7_0-openjdk.zero for openSUSE:Factory checked in at 2012-07-12 12:06:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk.zero (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.zero.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk.zero", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2012-07-06 19:40:38.919402255 +0200
+++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.zero.new/java-1_7_0-openjdk.changes 2012-07-12 12:06:58.000000000 +0200
@@ -0,0 +1,88 @@
+-------------------------------------------------------------------
+Thu Jul 12 07:34:47 UTC 2012 - mvyskocil@suse.cz
+
+- update to icedtea-2.1.1
+* Security fixes
+ - S7079902, CVE-2012-1711: Refine CORBA data models
+ - S7110720: Issue with vm config file loadingIssue with vm config file loading
+ - S7143606, CVE-2012-1717: File.createTempFile should be improved for temporary files created by the platform.
+ - S7143614, CVE-2012-1716: SynthLookAndFeel stability improvement
+ - S7143617, CVE-2012-1713: Improve fontmanager layout lookup operations
+ - S7143851, CVE-2012-1719: Improve IIOP stub and tie generation in RMIC
+ - S7143872, CVE-2012-1718: Improve certificate extension processing
+ - S7145239: Finetune package definition restriction
+ - S7152811, CVE-2012-1723: Issues in client compiler
+ - S7157609, CVE-2012-1724: Issues with loop
+ - S7160677: missing else in fix for 7152811
+ - S7160757, CVE-2012-1725: Problem with hotspot/runtime_classfile
+ - S7165628, CVE-2012-1726: Issues with java.lang.invoke.MethodHandles.Lookup
+* Bug fixes
+ - PR885: IcedTea7 does not build scripting support
+ - Fix bug whereby JPEG_LIBS were not set by jdk_generic_profile.sh
+ - S7150392: Linux build breaks with GCC 4.7 due to unrecognized option
+ - Support glib >= 2.32.
+* ARM port
+ - Add arm_port from IcedTea 6
+ - added jvmti event generation for dynamic_generate and compiled_method_load events to ARM JIT compiler
+ - Adjust saved SP when safepointing.
+ - ARM: First cut of invokedynamic
+ - ARM: JIT-compilation of ldc methodHandle
+ - Changes for HSX22
+ - corrected call from fast_method_handle_entry to CppInterpreter::method_handle_entry so that thread is loaded into r2
+ - Don’t save locals at a return.
+ - Fix JIT bug that miscompiles org.eclipse.ui.internal.contexts.ContextAuthority.sourceChanged
+ - invokedynamic and aldc for JIT
+ - Minor review cleanups.
+ - modified safepoint check to rely on memory protect signal instead of polling
+ - patched method handle adapter code to deal with failures in TCK
+ - RTC Thumb2 JIT enhancements.
+ - Zero fails to build in hsx22+, fix for hsx22 after runs gamma OK, hsx23 still nogo.
+ - Use ldrexd for atomic reads on ARMv7.
+ - Use unified syntax for thumb code.
+
+* SUSE changes:
+- limit a build for arm and power pc - this package is intended for those arches
+
+-------------------------------------------------------------------
+Thu Jun 14 21:43:45 UTC 2012 - dmueller@suse.com
+
+- fix build on non-jit arches
+
+-------------------------------------------------------------------
+Thu May 10 09:17:41 UTC 2012 - mvyskocil@suse.cz
+
+- update to icedtea-2.1, openjdk b147
+* Security fixes
+ - 7082299, CVE-2011-3571: Fix in AtomicReferenceArray
+ - S7088367, CVE-2011-3563: Fix issues in java sound
+ - S7110683, CVE-2012-0502: Issues with some KeyboardFocusManager method
+ - S7110687, CVE-2012-0503: Issues with TimeZone class
+ - S7110700, CVE-2012-0505: Enhance exception throwing mechanism in ObjectStreamClass
+ - S7110704, CVE-2012-0506: Issues with some method in corba
+ - S7112642, CVE-2012-0497: Incorrect checking for graphics rendering object
+ - S7118283, CVE-2012-0501: Better input parameter checking in zip file processing
+ - S7126960, CVE-2011-5035: Add property to limit number of request headers to the HTTP Server
+* Bug fixes
+ - S7140882: Don’t return booleans from methods returning pointers
+ - S7091528: javadoc attempts to parse .class files
+ - S7103610: _NET_WM_PID and WM_CLIENT_MACHINE are not set
+ - S7049339: AnyBlit is broken with non-rectangular clips.
+ - and many others
+* SUSE changes:
+ - increase the priority to 17147 to be the default java (thanks Robert
+ Munteau)
+ - openjdk-7-src-b147-no-return-in-nonvoid.patch and
+ openjdk-7-src-b147-stringcompare.patch fixes issues found by post-build-check
+ - buildrequire at least openjdk6 and let prjconf to handle the prefferences
+
+-------------------------------------------------------------------
+Tue Mar 6 11:48:02 UTC 2012 - cfarrell@suse.com
+
+- license update: GPL-2.0-with-classpath-exception
+ Use SPDX syntax
+
+-------------------------------------------------------------------
+Wed Nov 2 15:18:33 UTC 2011 - mvyskocil@suse.cz
+
+- Initial SUSE packaging of icedtea-2.0/openjdk b146
+
New:
----
class-rewriter.tar.gz
desktop-files.tar.gz
fontconfig.SuSE.properties
java-1.7.0-openjdk-accessible-toolkit.patch
java-1.7.0-openjdk-arm-fixes.patch
java-1.7.0-openjdk-arm-ftbfs.patch
java-1.7.0-openjdk-bitmap.patch
java-1.7.0-openjdk-debugdocs.patch
java-1.7.0-openjdk-debuginfo.patch
java-1.7.0-openjdk-java-access-bridge-idlj.patch
java-1.7.0-openjdk-java-access-bridge-security.patch
java-1.7.0-openjdk-java-access-bridge-tck.patch
java-1.7.0-openjdk-ppc-zero-hotspot.patch
java-1.7.0-openjdk-ppc-zero-jdk.patch
java-1.7.0-openjdk-remove-mimpure-opt.patch
java-1.7.0-openjdk-size_t.patch
java-1.7.0-openjdk-system-zlib.patch
java-1_7_0-openjdk-suse-desktop-files.patch
java-1_7_0-openjdk.changes
java-1_7_0-openjdk.spec
java-access-bridge-1.23.0.tar.bz2
mauve-2008-10-22.tar.gz
mauve_tests
nss.cfg
openjdk-7-src-b147-no-return-in-nonvoid.patch
openjdk-7-src-b147-stringcompare.patch
openjdk-icedtea-2.1.1.tar.gz
pulse-soundproperties.patch
pulseaudio.tar.gz
remove-intree-libraries.sh
rhino.patch
systemtap-alloc-size-workaround.patch
systemtap-tapset.tar.gz
systemtap.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
++++ 1229 lines (skipped)
++++++ fontconfig.SuSE.properties ++++++
#
# Copyright 2007 Sun Microsystems, 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. Sun designates this
# particular file as subject to the "Classpath" exception as provided
# by Sun in the LICENSE file that accompanied this code.
#
# 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.
#
# 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.
#
# Uses SUSE 10.2 fonts and file paths.
version=1
# Component Font Mappings
dialog.plain.latin-1=DejaVu Sans
dialog.plain.japanese-x0208=Sazanami Gothic
dialog.plain.korean=UnDotum
dialog.bold.latin-1=DejaVu Sans Bold
dialog.bold.japanese-x0208=Sazanami Gothic
dialog.bold.korean=UnDotum Bold
dialog.italic.latin-1=DejaVu Sans Oblique
dialog.italic.japanese-x0208=Sazanami Gothic
dialog.italic.korean=UnDotum
dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
dialog.bolditalic.japanese-x0208=Sazanami Gothic
dialog.bolditalic.korean=UnDotum Bold
sansserif.plain.latin-1=DejaVu Sans
sansserif.plain.japanese-x0208=Sazanami Gothic
sansserif.plain.korean=UnDotum
sansserif.bold.latin-1=DejaVu Sans Bold
sansserif.bold.japanese-x0208=Sazanami Gothic
sansserif.bold.korean=UnDotum Bold
sansserif.italic.latin-1=DejaVu Sans Oblique
sansserif.italic.japanese-x0208=Sazanami Gothic
sansserif.italic.korean=UnDotum
sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
sansserif.bolditalic.japanese-x0208=Sazanami Gothic
sansserif.bolditalic.korean=UnDotum Bold
serif.plain.latin-1=DejaVu Serif
serif.plain.japanese-x0208=Sazanami Mincho
serif.plain.korean=UnBatang
serif.bold.latin-1=DejaVu Serif Bold
serif.bold.japanese-x0208=Sazanami Mincho
serif.bold.korean=UnBatang Bold
serif.italic.latin-1=DejaVu Serif Oblique
serif.italic.japanese-x0208=Sazanami Mincho
serif.italic.korean=UnBatang
serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
serif.bolditalic.japanese-x0208=Sazanami Mincho
serif.bolditalic.korean=UnBatang Bold
monospaced.plain.latin-1=DejaVu Sans Mono
monospaced.plain.japanese-x0208=Sazanami Mincho
monospaced.plain.korean=UnDotum
monospaced.bold.latin-1=DejaVu Sans Mono Bold
monospaced.bold.japanese-x0208=Sazanami Mincho
monospaced.bold.korean=UnDotum Bold
monospaced.italic.latin-1=DejaVu Sans Mono Oblique
monospaced.italic.japanese-x0208=Sazanami Mincho
monospaced.italic.korean=UnDotum
monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
monospaced.bolditalic.japanese-x0208=Sazanami Mincho
monospaced.bolditalic.korean=UnDotum Bold
dialoginput.plain.latin-1=DejaVu Sans Mono
dialoginput.plain.japanese-x0208=Sazanami Gothic
dialoginput.plain.korean=UnDotum
dialoginput.bold.latin-1=DejaVu Sans Mono Bold
dialoginput.bold.japanese-x0208=Sazanami Gothic
dialoginput.bold.korean=UnDotum Bold
dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
dialoginput.italic.japanese-x0208=Sazanami Gothic
dialoginput.italic.korean=UnDotum
dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
dialoginput.bolditalic.korean=UnDotum Bold
allfonts.chinese-big5=AR PL Mingti2L Big5
allfonts.chinese-gb18030=AR PL SungtiL GB
# Search Sequences
sequence.allfonts=latin-1
sequence.allfonts.Big5=chinese-big5,latin-1
sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1
sequence.allfonts.EUC-KR=korean,latin-1
sequence.allfonts.GB18030=chinese-gb18030,latin-1
sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
# Font File Names
filename.DejaVu_Sans=/usr/share/fonts/truetype/DejaVuSans.ttf
filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/DejaVuSans-Bold.ttf
filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/DejaVuSans-Oblique.ttf
filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/DejaVuSansMono.ttf
filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/DejaVuSansMono-Bold.ttf
filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Serif=/usr/share/fonts/truetype/DejaVuSerif.ttf
filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/DejaVuSerif-Bold.ttf
filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/DejaVuSerif-Italic.ttf
filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSerif-BoldItalic.ttf
filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami-gothic.ttf
filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami-mincho.ttf
filename.AR_PL_SungtiL_GB=/usr/share/fonts/truetype/gbsn00lp.ttf
filename.AR_PL_Mingti2L_Big5=/usr/share/fonts/truetype/bsmi00lp.ttf
filename.UnDotum=/usr/share/fonts/truetype/UnDotum.ttf
filename.UnDotum_Bold=/usr/share/fonts/truetype/UnDotumBold.ttf
filename.UnBatang=/usr/share/fonts/truetype/UnBatang.ttf
filename.UnBatang_Bold=/usr/share/fonts/truetype/UnBatangBold.ttf
# AWT X11 font paths
awtfontpath.japanese-x0201=/usr/share/fonts/truetype
awtfontpath.japanese-x0208=/usr/share/fonts/truetype
awtfontpath.japanese-iso10646-1=/usr/share/fonts/truetype
awtfontpath.korean=/usr/share/fonts/truetype
awtfontpath.latin-1=/usr/share/fonts/truetype
++++++ java-1.7.0-openjdk-accessible-toolkit.patch ++++++
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java openjdk/jdk/src/share/classes/java/awt/Toolkit.java
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
+++ openjdk/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
@@ -871,7 +871,11 @@
return null;
}
});
- loadAssistiveTechnologies();
+ try {
+ loadAssistiveTechnologies();
+ } catch ( AWTError error) {
+ // ignore silently
+ }
} finally {
// Make sure to always re-enable the JIT.
java.lang.Compiler.enable();
++++++ java-1.7.0-openjdk-arm-fixes.patch ++++++
diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
--- openjdk/jdk/make/common/shared/Sanity.gmk.sav 2012-02-14 16:12:48.000000000 -0500
+++ openjdk/jdk/make/common/shared/Sanity.gmk 2012-03-07 17:31:26.153840755 -0500
@@ -814,12 +814,12 @@ ifdef OPENJDK
@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
$(ECHO) "Failed to build freetypecheck." ) > $@
- sane-freetype: $(TEMPDIR)/freetypeinfo
- @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
- " or higher is required. \n" \
- "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
- fi
+# sane-freetype: $(TEMPDIR)/freetypeinfo
+# @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
+# $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+# " or higher is required. \n" \
+# "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
+# fi
else
#do nothing (cross-compiling)
sane-freetype:
diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
--- openjdk/jdk/make/jdk_generic_profile.sh.sav 2012-02-14 16:12:48.000000000 -0500
+++ openjdk/jdk/make/jdk_generic_profile.sh 2012-03-07 17:31:26.154840740 -0500
@@ -280,7 +280,7 @@ if [ "${ZERO_BUILD}" = true ] ; then
# ZERO_ENDIANNESS is the endianness of the processor
case "${ZERO_LIBARCH}" in
- i386|amd64|ia64)
+ i386|amd64|ia64|arm)
ZERO_ENDIANNESS=little
;;
ppc*|s390*|sparc*|alpha)
@@ -307,6 +307,9 @@ if [ "${ZERO_BUILD}" = true ] ; then
s390)
ZERO_ARCHFLAG="-m31"
;;
+ arm)
+ ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
+ ;;
*)
ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
esac
++++++ java-1.7.0-openjdk-arm-ftbfs.patch ++++++
diff -up openjdk/hotspot/make/linux/makefiles/defs.make.sav openjdk/hotspot/make/linux/makefiles/defs.make
--- openjdk/hotspot/make/linux/makefiles/defs.make.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/make/linux/makefiles/defs.make 2012-03-08 10:39:44.567935704 -0500
@@ -184,8 +184,10 @@ EXPORT_LIST += $(EXPORT_DOCS_DIR)/platfo
# client and server subdirectories have symbolic links to ../libjsig.so
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
-ifneq ($(OBJCOPY),)
- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+ifneq ($(ZERO_BUILD), true)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+ endif
endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
@@ -194,8 +196,10 @@ EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARC
ifndef BUILD_CLIENT_ONLY
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
- ifneq ($(OBJCOPY),)
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ ifneq ($(ZERO_BUILD), true)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ endif
endif
endif
@@ -215,9 +219,11 @@ ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB
$(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
$(EXPORT_LIB_DIR)/sa-jdi.jar
-ifneq ($(OBJCOPY),)
- ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
- ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ifneq ($(ZERO_BUILD), true)
+ ifneq ($(OBJCOPY),)
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ endif
endif
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
diff -up openjdk/hotspot/make/linux/platform_zero.in.sav openjdk/hotspot/make/linux/platform_zero.in
--- openjdk/hotspot/make/linux/platform_zero.in.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/make/linux/platform_zero.in 2012-03-08 10:39:44.567935704 -0500
@@ -14,4 +14,4 @@ compiler = gcc
gnu_dis_arch = zero
-sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
+sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DTARGET_ARCH_NYI_6939861=1 -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
diff -up openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp.sav openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp
--- openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp 2012-03-08 10:39:44.567935704 -0500
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2011 Red Hat, Inc.
+ * Copyright 2011, 2012 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
@@ -29,7 +29,6 @@ enum /* platform_dependent_constants */
adapter_code_size = 0
};
-#define TARGET_ARCH_NYI_6939861
// ..#ifdef TARGET_ARCH_NYI_6939861
// .. // Here are some backward compatible declarations until the 6939861 ports are updated.
// .. #define _adapter_flyby (_EK_LIMIT + 10)
@@ -69,3 +68,19 @@ enum /* platform_dependent_constants */
// ..
// .. static void trace_method_handle(MacroAssembler* _masm, const char* adaptername) PRODUCT_RETURN;
// ..#endif //TARGET_ARCH_NYI_6939861
+
+class RicochetFrame : public ResourceObj {
+ friend class MethodHandles;
+ private:
+ /*
+ RF field x86 SPARC
+ sender_pc *(rsp+0) I7-0x8
+ sender_link rbp I6+BIAS
+ exact_sender_sp rsi/r13 I5_savedSP
+ conversion *(rcx+&amh_conv) L5_conv
+ saved_args_base rax L4_sab (cf. Gargs = G4)
+ saved_args_layout #NULL L3_sal
+ saved_target *(rcx+&mh_vmtgt) L2_stgt
+ continuation #STUB_CON L1_cont
+ */
+};
diff -up openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp.sav openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
--- openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp 2012-03-08 10:39:44.567935704 -0500
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010, 2011, 2012 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
@@ -47,6 +47,7 @@
#endif
+
int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
VMRegPair *regs,
int total_args_passed,
@@ -96,19 +97,21 @@ uint SharedRuntime::out_preserve_stack_s
ShouldNotCallThis();
}
+JRT_LEAF(void, zero_stub())
+ ShouldNotCallThis();
+JRT_END
+
+
static RuntimeStub* generate_empty_runtime_stub(const char* name) {
- CodeBuffer buffer(name, 0, 0);
- return RuntimeStub::new_runtime_stub(name, &buffer, 0, 0, NULL, false);
+ return CAST_FROM_FN_PTR(RuntimeStub*,zero_stub);
}
static SafepointBlob* generate_empty_safepoint_blob() {
- CodeBuffer buffer("handler_blob", 0, 0);
- return SafepointBlob::create(&buffer, NULL, 0);
+ return NULL;
}
static DeoptimizationBlob* generate_empty_deopt_blob() {
- CodeBuffer buffer("handler_blob", 0, 0);
- return DeoptimizationBlob::create(&buffer, NULL, 0, 0, 0, 0);
+ return NULL;
}
void SharedRuntime::generate_deopt_blob() {
@@ -123,6 +126,7 @@ RuntimeStub* SharedRuntime::generate_res
return generate_empty_runtime_stub("resolve_blob");
}
+
int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
VMRegPair *regs,
int total_args_passed) {
diff -up openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp.sav openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp
--- openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp 2012-03-08 10:39:44.568935688 -0500
@@ -818,10 +818,10 @@ static inline uint64_t cast_uint64_t(siz
/* CodeBlobs (NOTE: incomplete, but only a little) */ \
/***************************************************/ \
\
- X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _sender_pc, address)) \
- X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _exact_sender_sp, intptr_t*)) \
- X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _sender_link, intptr_t*)) \
- X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _saved_args_base, intptr_t*)) \
+ NOT_ZERO(X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _sender_pc, address))) \
+ NOT_ZERO(X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _exact_sender_sp, intptr_t*))) \
+ NOT_ZERO(X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _sender_link, intptr_t*))) \
+ NOT_ZERO(X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _saved_args_base, intptr_t*))) \
\
static_field(SharedRuntime, _ricochet_blob, RicochetBlob*) \
\
@@ -2526,7 +2526,7 @@ static inline uint64_t cast_uint64_t(siz
/* frame */ \
/**********************/ \
\
- X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset)) \
+ NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset))) \
declare_constant(frame::pc_return_offset) \
\
/*************/ \
diff -up openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp.sav openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp 2012-03-08 10:39:44.568935688 -0500
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2008, 2009, 2010, 2011 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010, 2011, 2012 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
@@ -319,7 +319,7 @@ void SharkCompiler::free_compiled_method
// finish with the exception of the VM thread, so we can consider
// ourself the owner of the execution engine lock even though we
// can't actually acquire it at this time.
- assert(Thread::current()->is_VM_thread(), "must be called by VM thread");
+ assert(JavaThread::current()->thread_state() == _thread_in_vm, "must run in vm mode");
assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
SharkEntry *entry = (SharkEntry *) code;
diff -up openjdk/hotspot/src/share/vm/utilities/macros.hpp.sav openjdk/hotspot/src/share/vm/utilities/macros.hpp
--- openjdk/hotspot/src/share/vm/utilities/macros.hpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/utilities/macros.hpp 2012-03-08 10:39:44.569935671 -0500
@@ -169,6 +169,22 @@
#define NOT_WIN64(code) code
#endif
+#if defined(ZERO)
+#define ZERO_ONLY(code) code
+#define NOT_ZERO(code)
+#else
+#define ZERO_ONLY(code)
+#define NOT_ZERO(code) code
+#endif
+
+#if defined(SHARK)
+#define SHARK_ONLY(code) code
+#define NOT_SHARK(code)
+#else
+#define SHARK_ONLY(code)
+#define NOT_SHARK(code) code
+#endif
+
#if defined(IA32) || defined(AMD64)
#define X86
#define X86_ONLY(code) code
++++++ java-1.7.0-openjdk-bitmap.patch ++++++
diff -up openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp.s390 openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp
--- openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp.s390 2012-02-10 08:30:46.378435291 -0500
+++ openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp 2012-02-10 08:47:27.478427892 -0500
@@ -52,16 +52,16 @@ inline void BitMap::clear_bit(idx_t bit)
inline bool BitMap::par_set_bit(idx_t bit) {
verify_index(bit);
- volatile idx_t* const addr = word_addr(bit);
- const idx_t mask = bit_mask(bit);
- idx_t old_val = *addr;
+ volatile bm_word_t* const addr = word_addr(bit);
+ const bm_word_t mask = bit_mask(bit);
+ bm_word_t old_val = *addr;
do {
- const idx_t new_val = old_val | mask;
+ const bm_word_t new_val = old_val | mask;
if (new_val == old_val) {
return false; // Someone else beat us to it.
}
- const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val,
+ const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val,
(volatile void*) addr,
(void*) old_val);
if (cur_val == old_val) {
@@ -73,16 +73,16 @@ inline bool BitMap::par_set_bit(idx_t bi
inline bool BitMap::par_clear_bit(idx_t bit) {
verify_index(bit);
- volatile idx_t* const addr = word_addr(bit);
- const idx_t mask = ~bit_mask(bit);
- idx_t old_val = *addr;
+ volatile bm_word_t* const addr = word_addr(bit);
+ const bm_word_t mask = ~bit_mask(bit);
+ bm_word_t old_val = *addr;
do {
- const idx_t new_val = old_val & mask;
+ const bm_word_t new_val = old_val & mask;
if (new_val == old_val) {
return false; // Someone else beat us to it.
}
- const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val,
+ const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val,
(volatile void*) addr,
(void*) old_val);
if (cur_val == old_val) {
++++++ java-1.7.0-openjdk-debugdocs.patch ++++++
--- oldMakefile 2008-07-02 17:48:01.000000000 -0400
+++ openjdk/Makefile 2008-07-02 17:48:09.000000000 -0400
@@ -176,8 +176,7 @@
COMMON_DEBUG_FLAGS= \
DEBUG_NAME=$(DEBUG_NAME) \
- ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME) \
- NO_DOCS=true
+ ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME)
product_build: setup
@$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'`
++++++ java-1.7.0-openjdk-debuginfo.patch ++++++
--- openjdk/hotspot/build/linux/makefiles/saproc.make_back 2009-12-14 13:35:46.000000000 +0100
+++ openjdk/hotspot/make/linux/makefiles/saproc.make 2009-12-14 13:36:47.000000000 +0100
@@ -67,6 +67,7 @@
-I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \
$(SASRCFILES) \
$(SA_LFLAGS) \
+ -g \
-o $@ \
-lthread_db
--- openjdk/hotspot/build/linux/makefiles/jsig.make_back 2009-12-14 13:34:56.000000000 +0100
+++ openjdk/hotspot/make/linux/makefiles/jsig.make 2009-12-14 13:35:31.000000000 +0100
@@ -44,6 +44,7 @@
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
@echo Making signal interposition lib...
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+ -g \
$(LFLAGS_JSIG) -o $@ $< -ldl
install_jsig: $(LIBJSIG)
++++++ java-1.7.0-openjdk-java-access-bridge-idlj.patch ++++++
--- oldjava-access-bridge-1.23.0/idlgen/Makefile.am 2008-06-03 02:47:29.000000000 -0400
+++ java-access-bridge-1.23.0/idlgen/Makefile.am 2008-07-31 15:13:26.000000000 -0400
@@ -3,7 +3,7 @@
JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
JAR=jar
-IDLJ_FLAGS=-emitAll $(IDLJ_IDLDIRS)
+IDLJ_FLAGS=-J-client -emitAll $(IDLJ_IDLDIRS)
BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl)
--- oldjava-access-bridge-1.23.0/idlgen/Makefile.in 2008-06-23 23:34:59.000000000 -0400
+++ java-access-bridge-1.23.0/idlgen/Makefile.in 2008-07-31 15:13:45.000000000 -0400
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 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.
@@ -140,7 +140,7 @@
SUBDIRS = org
JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
CLASSES = $(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
-IDLJ_FLAGS = -emitAll $(IDLJ_IDLDIRS)
+IDLJ_FLAGS = -J-client -emitAll $(IDLJ_IDLDIRS)
BONOBO_ACT_IDLFILES = $(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
BONOBO_IDLFILES = $(wildcard $(BONOBO_IDLDIR)/*.idl)
AT_SPI_IDLFILES = $(wildcard $(AT_SPI_IDLDIR)/*.idl)
@@ -253,8 +253,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -279,8 +279,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -290,13 +290,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
++++++ java-1.7.0-openjdk-java-access-bridge-security.patch ++++++
--- jsorig 2008-12-05 11:43:39.000000000 -0500
+++ openjdk/jdk/src/share/lib/security/java.security 2008-12-05 11:43:45.000000000 -0500
@@ -127,7 +127,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
#
# List of comma-separated packages that start with or equal this string
++++++ java-1.7.0-openjdk-java-access-bridge-tck.patch ++++++
--- java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-05-22 11:27:00.000000000 -0400
+++ java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java 2008-05-22 11:28:02.000000000 -0400
@@ -34,6 +34,9 @@
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleText;
import javax.accessibility.AccessibleEditableText;
+import java.security.PrivilegedAction;
+import java.security.AccessController;
+
public class JavaBridge {
@@ -332,7 +335,11 @@
System.err.println ("Java Accessibility Bridge for GNOME loaded.\n");
// Not sure what kind of arguments should be sent to ORB
- String vm_rev = System.getProperty("java.version");
+ String vm_rev = (String) AccessController.doPrivileged(new PrivilegedAction() {
+ public java.lang.Object run() {
+ return System.getProperty("java.version");
+ }
+ });
if (vm_rev.compareTo("1.4.0") < 0) {
System.err.println("WARNING: Java Accessibility Bridge " +
++++++ java-1.7.0-openjdk-ppc-zero-hotspot.patch ++++++
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:01.000000000 -0400
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:00.000000000 -0400
@@ -32,11 +32,11 @@
//
define_pd_global(bool, DontYieldALot, false);
-define_pd_global(intx, ThreadStackSize, 1536);
+define_pd_global(intx, ThreadStackSize, 1664);
#ifdef _LP64
-define_pd_global(intx, VMThreadStackSize, 1024);
+define_pd_global(intx, VMThreadStackSize, 1664);
#else
-define_pd_global(intx, VMThreadStackSize, 512);
+define_pd_global(intx, VMThreadStackSize, 1152);
#endif // _LP64
define_pd_global(intx, SurvivorRatio, 8);
define_pd_global(intx, CompilerThreadStackSize, 0);
++++++ java-1.7.0-openjdk-ppc-zero-jdk.patch ++++++
--- openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
@@ -83,9 +83,9 @@
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
diff -up openjdk/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk
--- openjdk/corba/make/common/shared/Defs-java.gmk.ppc 2012-03-24 11:44:34.450072733 +0100
+++ openjdk/corba/make/common/shared/Defs-java.gmk 2012-03-24 11:44:53.300073137 +0100
@@ -79,9 +79,9 @@ JAVAC_JVM_FLAGS =
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
++++++ java-1.7.0-openjdk-remove-mimpure-opt.patch ++++++
diff -ur 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 2012-02-14 16:12:48.000000000 -0500
+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-02-15 17:52:53.747394442 -0500
@@ -133,7 +133,7 @@
REQUIRED_GCC_VER = 4.0.*
endif
# Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
+ SHARED_LIBRARY_FLAG = -shared
SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
endif
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2012-02-15 17:52:53.750394381 -0500
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2012-02-15 17:52:53.750394381 -0500
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2012-02-15 17:52:53.749394399 -0500
@@ -96,7 +96,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc
# Building a shared library
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2012-02-15 17:52:53.748394420 -0500
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2012-02-15 17:52:53.753394337 -0500
@@ -130,7 +130,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES= -ldl -lc
# Building a shared library
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/index.html openjdk/jdk/src/share/demo/jvmti/index.html
--- openjdk.orig/jdk/src/share/demo/jvmti/index.html 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/index.html 2012-02-15 17:52:53.748394420 -0500
@@ -308,7 +308,7 @@
<code><ul>
gcc -O2 -fPIC -pthread -DLINUX -c <i>*.c</i>
<br>
-gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
+gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
</code></ul>
<br>
For AMD64:
@@ -316,7 +316,7 @@
<code><ul>
gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c <i>*.c</i>
<br>
-gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
+gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
</code></ul>
<br>
</li>
@@ -339,7 +339,7 @@
</li>
<li>
-Library: Use -static-libgcc -mimpure-text.
+Library: Use -static-libgcc.
<br>
When building the shared library (-shared option), this option
allows for maximum portability of the library between different
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2012-02-15 17:52:53.751394367 -0500
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2012-02-15 17:52:53.751394367 -0500
@@ -96,7 +96,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc
# Building a shared library
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2012-02-15 17:52:53.752394352 -0500
@@ -96,7 +96,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L../../java_crw_demo/src -ljava_crw_demo -lc
diff -ur openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
--- openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2012-02-14 16:12:51.000000000 -0500
+++ openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2012-02-15 17:52:53.749394399 -0500
@@ -90,7 +90,7 @@
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
++++++ java-1.7.0-openjdk-size_t.patch ++++++
diff -up openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.sav openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
--- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp 2012-03-09 14:48:08.223867826 -0500
@@ -572,15 +572,15 @@ void MethodLiveness::print_times() {
MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) :
- _gen((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _gen((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
- _kill((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _kill((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
- _entry((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _entry((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
- _normal_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _normal_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
- _exception_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+ _exception_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
analyzer->bit_map_size_bits()),
_last_bci(-1) {
_analyzer = analyzer;
@@ -998,7 +998,7 @@ bool MethodLiveness::BasicBlock::merge_e
}
MethodLivenessResult MethodLiveness::BasicBlock::get_liveness_at(ciMethod* method, int bci) {
- MethodLivenessResult answer(NEW_RESOURCE_ARRAY(size_t, _analyzer->bit_map_size_words()),
+ MethodLivenessResult answer(NEW_RESOURCE_ARRAY(BitMap::bm_word_t, _analyzer->bit_map_size_words()),
_analyzer->bit_map_size_bits());
answer.set_is_valid();
diff -up openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2012-03-09 14:48:08.223867826 -0500
@@ -2656,7 +2656,7 @@ void CFLS_LAB::get_from_global_pool(size
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks;
- n_blks = MIN2(n_blks, CMSOldPLABMax);
+ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
}
assert(n_blks > 0, "Error");
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-03-09 16:30:30.426921691 -0500
@@ -481,7 +481,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
_regionStack(),
// _finger set in set_non_marking_state
- _max_task_num(MAX2(ParallelGCThreads, (size_t)1)),
+ _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
// _active_tasks set in set_non_marking_state
// _tasks set inside the constructor
_task_queues(new CMTaskQueueSet((int) _max_task_num)),
@@ -586,7 +586,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
_sleep_factor = sleep_factor;
_marking_task_overhead = marking_task_overhead;
} else {
- _parallel_marking_threads = MAX2((ParallelGCThreads + 2) / 4, (size_t)1);
+ _parallel_marking_threads = MAX2((size_t)((ParallelGCThreads + 2) / 4), (size_t)1);
_sleep_factor = 0.0;
_marking_task_overhead = 1.0;
}
@@ -1116,7 +1116,7 @@ void ConcurrentMark::markFromRoots() {
_restart_for_overflow = false;
- size_t active_workers = MAX2((size_t) 1, parallel_marking_threads());
+ size_t active_workers = MAX2((size_t) 1, (size_t)parallel_marking_threads());
force_overflow_conc()->init();
set_phase(active_workers, true /* concurrent */);
@@ -3689,7 +3689,7 @@ void CMTask::drain_local_queue(bool part
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
+ target_size = MIN2((size_t)(_task_queue->max_elems()/3), (size_t) GCDrainStackTargetSize);
} else {
target_size = 0;
}
@@ -4604,7 +4604,7 @@ size_t G1PrintRegionLivenessInfoClosure:
// The > 0 check is to deal with the prev and next live bytes which
// could be 0.
if (*hum_bytes > 0) {
- bytes = MIN2((size_t) HeapRegion::GrainBytes, *hum_bytes);
+ bytes = MIN2((size_t) HeapRegion::GrainBytes, (size_t)*hum_bytes);
*hum_bytes -= bytes;
}
return bytes;
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2012-03-09 14:48:08.226867784 -0500
@@ -1615,7 +1615,7 @@ HeapWord* G1CollectedHeap::expand_and_al
verify_region_sets_optional();
- size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
+ size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes);
ergo_verbose1(ErgoHeapSizing,
"attempt heap expansion",
ergo_format_reason("allocation request failed")
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-03-09 14:48:08.226867784 -0500
@@ -1083,7 +1083,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC
// This can be done by either mutator threads together with the
// concurrent refinement threads or GC threads.
int HeapRegionRemSet::num_par_rem_sets() {
- return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
+ return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);
}
HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
diff -up openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2012-03-09 14:48:08.226867784 -0500
@@ -62,7 +62,7 @@ ParMarkBitMap::initialize(MemRegion cove
if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {
_region_start = covered_region.start();
_region_size = covered_region.word_size();
- idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
+ BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr();
_beg_bits.set_map(map);
_beg_bits.set_size(bits / 2);
_end_bits.set_map(map + words / 2);
diff -up openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2012-03-09 14:48:08.227867766 -0500
@@ -188,7 +188,7 @@ bool ParScanThreadState::take_from_overf
const size_t num_overflow_elems = of_stack->size();
const size_t space_available = queue->max_elems() - queue->size();
const size_t num_take_elems = MIN3(space_available / 4,
- ParGCDesiredObjsFromOverflowList,
+ (size_t)ParGCDesiredObjsFromOverflowList,
num_overflow_elems);
// Transfer the most recent num_take_elems from the overflow
// stack to our work queue.
diff -up openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp.sav openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2012-03-09 14:48:08.227867766 -0500
@@ -354,7 +354,7 @@ void GenCollectorPolicy::initialize_size
// generally small compared to the NewRatio calculation.
_min_gen0_size = NewSize;
desired_new_size = NewSize;
- max_new_size = MAX2(max_new_size, NewSize);
+ max_new_size = MAX2(max_new_size, (size_t)NewSize);
} else {
// For the case where NewSize is the default, use NewRatio
// to size the minimum and initial generation sizes.
@@ -362,10 +362,10 @@ void GenCollectorPolicy::initialize_size
// NewRatio is overly large, the resulting sizes can be too
// small.
_min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),
- NewSize);
+ (size_t)NewSize);
desired_new_size =
MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()),
- NewSize);
+ (size_t)NewSize);
}
assert(_min_gen0_size > 0, "Sanity check");
@@ -420,14 +420,14 @@ bool TwoGenerationCollectorPolicy::adjus
// Adjust gen0 down to accomodate OldSize
*gen0_size_ptr = heap_size - min_gen0_size;
*gen0_size_ptr =
- MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),
+ MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()),
min_alignment());
assert(*gen0_size_ptr > 0, "Min gen0 is too large");
result = true;
} else {
*gen1_size_ptr = heap_size - *gen0_size_ptr;
*gen1_size_ptr =
- MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()),
+ MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()),
min_alignment());
}
}
@@ -451,7 +451,7 @@ void TwoGenerationCollectorPolicy::initi
// for setting the gen1 maximum.
_max_gen1_size = max_heap_byte_size() - _max_gen0_size;
_max_gen1_size =
- MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()),
+ MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()),
min_alignment());
// If no explicit command line flag has been set for the
// gen1 size, use what is left for gen1.
@@ -465,11 +465,11 @@ void TwoGenerationCollectorPolicy::initi
"gen0 has an unexpected minimum size");
set_min_gen1_size(min_heap_byte_size() - min_gen0_size());
set_min_gen1_size(
- MAX2((uintx)align_size_down(_min_gen1_size, min_alignment()),
+ MAX2((size_t)align_size_down(_min_gen1_size, min_alignment()),
min_alignment()));
set_initial_gen1_size(initial_heap_byte_size() - initial_gen0_size());
set_initial_gen1_size(
- MAX2((uintx)align_size_down(_initial_gen1_size, min_alignment()),
+ MAX2((size_t)align_size_down(_initial_gen1_size, min_alignment()),
min_alignment()));
} else {
diff -up openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.sav openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2012-03-09 14:48:08.227867766 -0500
@@ -46,7 +46,7 @@ void objArrayKlass::objarray_follow_cont
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
const size_t end_index = beg_index + stride;
T* const base = (T*)a->base();
T* const beg = base + beg_index;
@@ -80,7 +80,7 @@ void objArrayKlass::objarray_follow_cont
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
const size_t end_index = beg_index + stride;
T* const base = (T*)a->base();
T* const beg = base + beg_index;
diff -up openjdk/hotspot/src/share/vm/runtime/arguments.cpp.sav openjdk/hotspot/src/share/vm/runtime/arguments.cpp
--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2012-03-09 14:48:08.228867748 -0500
@@ -1179,7 +1179,7 @@ void Arguments::set_cms_and_parnew_gc_fl
// so it's NewRatio x of NewSize.
if (FLAG_IS_DEFAULT(OldSize)) {
if (max_heap > NewSize) {
- FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize));
+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize));
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
++++++ java-1.7.0-openjdk-system-zlib.patch ++++++
diff -ur openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh
--- openjdk.orig/jdk/make/jdk_generic_profile.sh 2011-10-20 16:12:28.000000000 -0400
+++ openjdk/jdk/make/jdk_generic_profile.sh 2011-11-08 11:32:53.365858929 -0500
@@ -421,7 +421,7 @@
# JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
# link against libjpeg
if [ "${JPEG_LIBS}" = "" ] ; then
- ZLIB_LIBS="-ljpeg"
+ JPEG_LIBS="-ljpeg"
fi
export JPEG_LIBS
++++++ java-1_7_0-openjdk-suse-desktop-files.patch ++++++
Index: java-1_7_0-openjdk/jconsole.desktop
===================================================================
--- java-1_7_0-openjdk.orig/jconsole.desktop
+++ java-1_7_0-openjdk/jconsole.desktop
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Monitoring & Management Console
+GenericName=OpenJDK Monitoring & Management Console
Comment=Monitor and manage OpenJDK applications
Exec=/usr/bin/jconsole
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
Version=1.0
Index: java-1_7_0-openjdk/policytool.desktop
===================================================================
--- java-1_7_0-openjdk.orig/policytool.desktop
+++ java-1_7_0-openjdk/policytool.desktop
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK Policy Tool
+GenericName=OpenJDK Policy Tool
Comment=Manage OpenJDK policy files
Exec=/usr/bin/policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
+Categories=Utility;Security;
Version=1.0
++++++ mauve_tests ++++++
++++ 2571 lines (skipped)
++++++ nss.cfg ++++++
name = NSS
nssLibraryDirectory =
nssDbMode = noDb
attributes = compatibility
++++++ openjdk-7-src-b147-no-return-in-nonvoid.patch ++++++
Index: java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
===================================================================
--- java-1_7_0-openjdk.orig/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+++ java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
@@ -142,6 +142,7 @@ jboolean XShared_initIDs(JNIEnv *env, jb
#endif /* MITSHM */
#endif /* !HEADLESS */
+return JNI_FALSE;
}
@@ -491,6 +492,7 @@ jboolean XShared_initSurface(JNIEnv *env
return JNI_TRUE;
#endif /* !HEADLESS */
+return JNI_FALSE;
}
++++++ openjdk-7-src-b147-stringcompare.patch ++++++
Index: java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c
===================================================================
--- java-1_7_0-openjdk.orig/openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c
+++ java-1_7_0-openjdk/openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c
@@ -574,7 +574,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
- if (nativename != NULL && nativename != "")
+ if (nativename != NULL && strcmp(nativename, "") != 0)
JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
/*
++++++ pulse-soundproperties.patch ++++++
--- openjdk/jdk/src/share/lib/sound.properties 2008-08-28 04:15:18.000000000 -0400
+++ openjdk/jdk/src/share/lib/sound.properties 2008-10-03 16:59:21.000000000 -0400
@@ -37,3 +37,13 @@
# Specify the default Receiver by provider and name:
# javax.sound.midi.Receiver=com.sun.media.sound.MidiProvider#SunMIDI1
#
+
+# javax.sound.sampled.Clip=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
+# javax.sound.sampled.Port=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
+# javax.sound.sampled.SourceDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
+# javax.sound.sampled.TargetDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
+
+javax.sound.sampled.Clip=com.sun.media.sound.DirectAudioDeviceProvider
+javax.sound.sampled.Port=com.sun.media.sound.PortMixerProvider
+javax.sound.sampled.SourceDataLine=com.sun.media.sound.DirectAudioDeviceProvider
+javax.sound.sampled.TargetDataLine=com.sun.media.sound.DirectAudioDeviceProvider
++++++ remove-intree-libraries.sh ++++++
#!/bin/sh
ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-*
JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeg-6b
GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib
PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng
LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms
echo "Removing built-in libs (they will be linked)"
echo "Removing zlib"
if [ ! -d ${ZIP_SRC} ]; then
echo "${ZIP_SRC} does not exist. Refusing to proceed."
exit 1
fi
rm -rvf ${ZIP_SRC}
echo "Removing libjpeg"
if [ ! -f ${JPEG_SRC}/jdhuff.c ]; then # some file that sound definitely exist
echo "${JPEG_SRC} does not contain jpeg sources. Refusing to proceed."
exit 1
fi
rm -vf ${JPEG_SRC}/jcomapi.c
rm -vf ${JPEG_SRC}/jdapimin.c
rm -vf ${JPEG_SRC}/jdapistd.c
rm -vf ${JPEG_SRC}/jdcoefct.c
rm -vf ${JPEG_SRC}/jdcolor.c
rm -vf ${JPEG_SRC}/jddctmgr.c
rm -vf ${JPEG_SRC}/jdhuff.c
rm -vf ${JPEG_SRC}/jdinput.c
rm -vf ${JPEG_SRC}/jdmainct.
rm -vf ${JPEG_SRC}/jdmarker.c
rm -vf ${JPEG_SRC}/jdmaster.c
rm -vf ${JPEG_SRC}/jdmerge.c
rm -vf ${JPEG_SRC}/jdphuff.c
rm -vf ${JPEG_SRC}/jdpostct.c
rm -vf ${JPEG_SRC}/jdsample.c
rm -vf ${JPEG_SRC}/jerror.c
rm -vf ${JPEG_SRC}/jidctflt.c
rm -vf ${JPEG_SRC}/jidctfst.c
rm -vf ${JPEG_SRC}/jidctint.c
rm -vf ${JPEG_SRC}/jidctred.c
rm -vf ${JPEG_SRC}/jmemmgr.c
rm -vf ${JPEG_SRC}/jmemnobs.c
rm -vf ${JPEG_SRC}/jquant1.c
rm -vf ${JPEG_SRC}/jquant2.c
rm -vf ${JPEG_SRC}/jutils.c
rm -vf ${JPEG_SRC}/jcapimin.c
rm -vf ${JPEG_SRC}/jcapistd.c
rm -vf ${JPEG_SRC}/jccoefct.c
rm -vf ${JPEG_SRC}/jccolor.c
rm -vf ${JPEG_SRC}/jcdctmgr.c
rm -vf ${JPEG_SRC}/jchuff.c
rm -vf ${JPEG_SRC}/jcinit.c
rm -vf ${JPEG_SRC}/jcmainct.c
rm -vf ${JPEG_SRC}/jcmarker.c
rm -vf ${JPEG_SRC}/jcmaster.c
rm -vf ${JPEG_SRC}/jcparam.c
rm -vf ${JPEG_SRC}/jcphuff.c
rm -vf ${JPEG_SRC}/jcprepct.c
rm -vf ${JPEG_SRC}/jcsample.c
rm -vf ${JPEG_SRC}/jctrans.c
rm -vf ${JPEG_SRC}/jdtrans.c
rm -vf ${JPEG_SRC}/jfdctflt.c
rm -vf ${JPEG_SRC}/jfdctfst.c
rm -vf ${JPEG_SRC}/jfdctint.c
rm -vf ${JPEG_SRC}/README
echo "Removing giflib"
if [ ! -d ${GIF_SRC} ]; then
echo "${GIF_SRC} does not exist. Refusing to proceed."
exit 1
fi
rm -rvf ${GIF_SRC}
echo "Removing libpng"
if [ ! -d ${PNG_SRC} ]; then
echo "${PNG_SRC} does not exist. Refusing to proceed."
exit 1
fi
rm -rvf ${PNG_SRC}
echo "Removing lcms"
if [ ! -d ${LCMS_SRC} ]; then
echo "${LCMS_SRC} does not exist. Refusing to proceed."
exit 1
fi
rm -vf ${LCMS_SRC}/cmscam02.c
rm -vf ${LCMS_SRC}/cmscgats.c
rm -vf ${LCMS_SRC}/cmscnvrt.c
rm -vf ${LCMS_SRC}/cmserr.c
rm -vf ${LCMS_SRC}/cmsgamma.c
rm -vf ${LCMS_SRC}/cmsgmt.c
rm -vf ${LCMS_SRC}/cmsintrp.c
rm -vf ${LCMS_SRC}/cmsio0.c
rm -vf ${LCMS_SRC}/cmsio1.c
rm -vf ${LCMS_SRC}/cmslut.c
rm -vf ${LCMS_SRC}/cmsmd5.c
rm -vf ${LCMS_SRC}/cmsmtrx.c
rm -vf ${LCMS_SRC}/cmsnamed.c
rm -vf ${LCMS_SRC}/cmsopt.c
rm -vf ${LCMS_SRC}/cmspack.c
rm -vf ${LCMS_SRC}/cmspcs.c
rm -vf ${LCMS_SRC}/cmsplugin.c
rm -vf ${LCMS_SRC}/cmsps2.c
rm -vf ${LCMS_SRC}/cmssamp.c
rm -vf ${LCMS_SRC}/cmssm.c
rm -vf ${LCMS_SRC}/cmstypes.c
rm -vf ${LCMS_SRC}/cmsvirt.c
rm -vf ${LCMS_SRC}/cmswtpnt.c
rm -vf ${LCMS_SRC}/cmsxform.c
rm -vf ${LCMS_SRC}/lcms2.h
rm -vf ${LCMS_SRC}/lcms2_internal.h
rm -vf ${LCMS_SRC}/lcms2_plugin.h
++++++ rhino.patch ++++++
diff -ur openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
--- openjdk.orig/jdk/make/com/sun/Makefile 2012-02-14 16:12:48.000000000 -0500
+++ openjdk/jdk/make/com/sun/Makefile 2012-02-22 14:25:10.327518016 -0500
@@ -31,13 +31,6 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
-ifndef OPENJDK
- ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
- ifneq ("$(ORG_EXISTS)", "")
- SCRIPT_SUBDIR = script
- endif
-endif
-
# jarsigner is part of JRE
SUBDIRS = java security net/ssl jarsigner
@@ -45,7 +38,7 @@
SUBDIRS_desktop = image
SUBDIRS_enterprise = crypto/provider jndi \
org rowset net/httpserver
-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
+SUBDIRS_misc = script tracing servicetag nio demo
# Omit mirror since it's built with the apt tool.
SUBDIRS_tools = tools
diff -ur openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile
--- openjdk.orig/jdk/make/com/sun/script/Makefile 2012-02-14 16:12:48.000000000 -0500
+++ openjdk/jdk/make/com/sun/script/Makefile 2012-02-22 14:10:53.325225237 -0500
@@ -31,6 +31,8 @@
AUTO_FILES_JAVA_DIRS = com/sun/script
+OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
+
#
# Files that need to be copied
#
diff -ur openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
--- openjdk.orig/jdk/make/common/Release.gmk 2012-02-14 16:12:48.000000000 -0500
+++ openjdk/jdk/make/common/Release.gmk 2012-02-22 14:10:53.325225237 -0500
@@ -766,6 +766,7 @@
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
@# Generate meta-index to make boot and extension class loaders lazier
$(CD) $(JRE_IMAGE_DIR)/lib && \
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-22 14:10:53.325225237 -0500
@@ -24,7 +24,7 @@
*/
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import javax.script.*;
import java.util.*;
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-02-22 14:10:53.325225237 -0500
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import javax.script.Invocable;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
/**
* This class implements Rhino-like JavaAdapter to help implement a Java
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-02-22 14:10:53.326225216 -0500
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import java.util.*;
/**
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-02-22 14:10:53.326225216 -0500
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import java.util.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
/**
* This class prevents script access to certain sensitive classes.
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-02-22 14:10:53.326225216 -0500
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
import javax.script.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
/**
* Represents compiled JavaScript code.
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-02-22 14:10:53.326225216 -0500
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import javax.script.*;
import java.util.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import com.sun.script.util.*;
/**
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-02-22 14:10:53.327225198 -0500
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import com.sun.script.util.*;
import javax.script.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import java.lang.reflect.Method;
import java.io.*;
import java.security.*;
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-02-22 14:10:53.327225198 -0500
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import java.security.AccessControlContext;
import javax.script.*;
import java.security.AccessControlContext;
diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-14 16:12:49.000000000 -0500
+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-22 14:10:53.327225198 -0500
@@ -27,7 +27,7 @@
import java.lang.reflect.*;
import static sun.security.util.SecurityConstants.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
/**
* This wrap factory is used for security reasons. JSR 223 script
++++++ systemtap-alloc-size-workaround.patch ++++++
diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
--- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp 2011-04-11 12:33:06.000000000 +0100
+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp 2011-04-11 16:40:57.825703429 +0100
@@ -890,7 +890,7 @@
int size = o->size();
Symbol* name = klass->name();
HS_DTRACE_PROBE4(hotspot, object__alloc, get_java_tid(thread),
- name->bytes(), name->utf8_length(), size * HeapWordSize);
+ name->bytes(), name->utf8_length(), size);
return 0;
}
++++++ systemtap.patch ++++++
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-07-29 21:54:46.000000000 +0100
+++ openjdk/hotspot/make/linux/makefiles/dtrace.make 2011-03-16 20:52:47.269527251 +0000
@@ -25,3 +25,7 @@
# Linux does not build jvm_db
LIBJVM_DB =
+# But it does have a Systemtap dtrace compatible sys/sdt.h
+CFLAGS += -DDTRACE_ENABLED
+
+# It doesn't support HAVE_DTRACE_H though.
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 2011-03-14 22:09:03.000000000 +0000
+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2011-03-16 20:52:47.277527381 +0000
@@ -1817,10 +1817,7 @@
JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \
JNIWrapper("Set" XSTR(Result) "Field"); \
\
- HS_DTRACE_PROBE_CDECL_N(hotspot_jni, Set##Result##Field__entry, \
- ( JNIEnv*, jobject, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \
- HS_DTRACE_PROBE_N(hotspot_jni, Set##Result##Field__entry, \
- ( env, obj, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \
+ FP_SELECT_##Result(DTRACE_PROBE4(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID, value),DTRACE_PROBE3(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID)); \
\
oop o = JNIHandles::resolve_non_null(obj); \
klassOop k = o->klass(); \
@@ -1994,10 +1991,7 @@
\
JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \
JNIWrapper("SetStatic" XSTR(Result) "Field"); \
- HS_DTRACE_PROBE_CDECL_N(hotspot_jni, SetStatic##Result##Field__entry,\
- ( JNIEnv*, jclass, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \
- HS_DTRACE_PROBE_N(hotspot_jni, SetStatic##Result##Field__entry, \
- ( env, clazz, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \
+ FP_SELECT_##Result(DTRACE_PROBE4(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID, value),DTRACE_PROBE3(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID)); \
\
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \
assert(id->is_static_field_id(), "invalid static field id"); \
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 2011-03-16 20:51:33.000000000 +0000
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2011-03-16 20:52:47.277527381 +0000
@@ -2634,16 +2634,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 2011-03-14 22:09:03.000000000 +0000
+++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp 2011-03-16 20:53:58.314683506 +0000
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2009 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
@@ -25,7 +26,7 @@
#ifndef SHARE_VM_UTILITIES_DTRACE_HPP
#define SHARE_VM_UTILITIES_DTRACE_HPP
-#if defined(SOLARIS) && defined(DTRACE_ENABLED)
+#if defined(DTRACE_ENABLED)
#include