/hg/release/icedtea7-forest-2.2/hotspot: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 16 06:49:39 PDT 2012
changeset 5be91de8b779 in /hg/release/icedtea7-forest-2.2/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=5be91de8b779
author: andrew
date: Wed May 02 22:35:52 2012 +0100
Make {HOST,BUILD}_{GCC,CPP} work again, post build-infra changes. Rename {HOST_BUILD}_CPP to {HOST_BUILD}_CXX.
changeset b11130d646c2 in /hg/release/icedtea7-forest-2.2/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=b11130d646c2
author: andrew
date: Wed May 16 14:49:26 2012 +0100
Merge
diffstat:
.hgtags | 15 +
agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java | 6 +-
agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java | 30 +-
agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java | 30 +-
agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java | 30 +-
agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java | 30 +-
agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java | 30 +-
agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java | 30 +-
agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java | 30 +-
agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java | 30 +-
agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java | 18 +-
make/hotspot_version | 6 +-
make/jprt.properties | 21 +-
make/linux/makefiles/gcc.make | 30 +-
src/cpu/sparc/vm/c2_globals_sparc.hpp | 2 +-
src/cpu/x86/vm/c2_globals_x86.hpp | 2 +-
src/cpu/x86/vm/sharedRuntime_x86_64.cpp | 248 ++++++++-
src/os/bsd/vm/os_bsd.cpp | 19 +
src/os/linux/vm/os_linux.cpp | 4 +-
src/share/vm/classfile/vmSymbols.hpp | 5 +-
src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp | 4 +-
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 16 +-
src/share/vm/gc_implementation/g1/survRateGroup.cpp | 88 +--
src/share/vm/gc_implementation/g1/vm_operations_g1.cpp | 61 ++-
src/share/vm/gc_implementation/g1/vm_operations_g1.hpp | 15 +-
src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp | 50 +-
src/share/vm/gc_interface/collectedHeap.cpp | 7 +-
src/share/vm/gc_interface/collectedHeap.hpp | 6 +-
src/share/vm/oops/arrayKlass.cpp | 3 +-
src/share/vm/oops/instanceKlass.cpp | 3 +-
src/share/vm/oops/objArrayKlass.cpp | 3 +-
src/share/vm/oops/typeArrayKlass.cpp | 3 +-
src/share/vm/opto/connode.cpp | 4 +-
src/share/vm/opto/escape.cpp | 38 +-
src/share/vm/prims/jvmtiClassFileReconstituter.cpp | 5 +-
src/share/vm/prims/jvmtiExport.hpp | 8 +-
src/share/vm/runtime/arguments.cpp | 26 +-
src/share/vm/runtime/globals.cpp | 22 +-
src/share/vm/runtime/globals.hpp | 5 +-
src/share/vm/runtime/globals_ext.hpp | 7 +-
src/share/vm/runtime/safepoint.cpp | 21 +-
src/share/vm/runtime/thread.cpp | 4 +
src/share/vm/runtime/thread.hpp | 9 +
src/share/vm/services/diagnosticCommand.cpp | 189 +++++++-
src/share/vm/services/diagnosticCommand.hpp | 80 +++-
src/share/vm/utilities/numberSeq.cpp | 6 +-
src/share/vm/utilities/numberSeq.hpp | 3 +-
47 files changed, 931 insertions(+), 371 deletions(-)
diffs (truncated from 2342 to 500 lines):
diff -r 11f2ed4d2141 -r b11130d646c2 .hgtags
--- a/.hgtags Wed May 02 15:07:20 2012 +0100
+++ b/.hgtags Wed May 16 14:49:26 2012 +0100
@@ -265,3 +265,18 @@
f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint
+efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13
+82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14
+1c483d994a78e46c4656b6f3773c7014346d0f19 jdk7u4-b15
+34a4f7687460b1b2bfb1d87191919c5f101aa988 hs23-b17
+c6a96f7a781dd23d2b9fd6353fcd87493616c803 jdk7u4-b16
+418bcab91d2c07c720190d39e1b7f7e39b214994 hs23-b18
+e266ffd6a7d7ccd6e06a442155c5e2457c1884de jdk7u4-b17
+ad5eb0a72fb1d6d7aa6ec7e9cfd06045aef51728 hs23-b19
+f1b786625e0c2ce215d70dda637a127edb2688f2 jdk7u4-b18
+1834c6835b75ed0c0f6fdb55a4ae56cc82e0f15c hs23-b20
+a1292d4e07097cf68addadca35553fd1255dc555 jdk7u4-b19
+34fce1d343b0d9f5e1e5ea30d93e840d260f3dce hs23-b21
+ad6f5eaa165edc94caaa0ac582828718a63a3d02 jdk7u4-b20
+c7c6b00122cf49c4147229689904a20779e73b85 jdk7u4-b30
+93ec23d55b87d46bada8f32b84eb67b427436858 jdk7u4-b21
\ No newline at end of file
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
--- a/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java Wed May 16 14:49:26 2012 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. 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
@@ -217,8 +217,8 @@
}
protected void checkNativeLink(SecurityManager sm, String os) {
- if (os.equals("SunOS") || os.equals("Linux")) {
- // link "saproc" - SA native library on SunOS and Linux?
+ if (os.equals("SunOS") || os.equals("Linux") || os.contains("OS X")) {
+ // link "saproc" - SA native library on SunOS, Linux, and Mac OS X
sm.checkLink("saproc");
} else if (os.startsWith("Windows")) {
// link "sawindbg" - SA native library on Windows.
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java Wed May 16 14:49:26 2012 +0100
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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.
*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*
*/
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java Wed May 16 14:49:26 2012 +0100
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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.
*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*
*/
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java Wed May 16 14:49:26 2012 +0100
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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.
*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*
*/
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java Wed May 16 14:49:26 2012 +0100
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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.
*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*
*/
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java Wed May 16 14:49:26 2012 +0100
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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.
*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*
*/
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java Wed May 16 14:49:26 2012 +0100
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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.
*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*
*/
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java Wed May 16 14:49:26 2012 +0100
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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.
*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*
*/
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java Wed May 16 14:49:26 2012 +0100
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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.
*
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*
*/
diff -r 11f2ed4d2141 -r b11130d646c2 agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Wed May 02 15:07:20 2012 +0100
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Wed May 16 14:49:26 2012 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
@@ -43,7 +43,7 @@
return "bsd";
} else if (os.equals("OpenBSD")) {
return "bsd";
- } else if (os.equals("Darwin") || os.startsWith("Mac OS X")) {
+ } else if (os.equals("Darwin") || os.contains("OS X")) {
return "bsd";
} else if (os.startsWith("Windows")) {
return "win32";
@@ -52,17 +52,17 @@
}
}
- /* Returns "sparc" if on SPARC, "x86" if on x86. */
+ /* Returns "sparc" for SPARC based platforms and "x86" for x86 based
+ platforms. Otherwise returns the value of os.arch. If the value
+ is not recognized as supported, an exception is thrown instead. */
public static String getCPU() throws UnsupportedPlatformException {
String cpu = System.getProperty("os.arch");
- if (cpu.equals("i386")) {
+ if (cpu.equals("i386") || cpu.equals("x86")) {
return "x86";
- } else if (cpu.equals("sparc") || cpu.equals("x86") || cpu.equals("ia64")) {
+ } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) {
+ return "sparc";
+ } else if (cpu.equals("ia64") || cpu.equals("amd64") || cpu.equals("x86_64")) {
return cpu;
- } else if (cpu.equals("sparcv9")) {
- return "sparc";
- } else if (cpu.equals("x86_64") || cpu.equals("amd64")) {
- return "amd64";
} else {
throw new UnsupportedPlatformException("CPU type " + cpu + " not yet supported");
}
diff -r 11f2ed4d2141 -r b11130d646c2 make/hotspot_version
--- a/make/hotspot_version Wed May 02 15:07:20 2012 +0100
+++ b/make/hotspot_version Wed May 16 14:49:26 2012 +0100
@@ -35,11 +35,11 @@
HS_MAJOR_VER=23
HS_MINOR_VER=0
-HS_BUILD_NUMBER=16
+HS_BUILD_NUMBER=21
JDK_MAJOR_VER=1
-JDK_MINOR_VER=8
+JDK_MINOR_VER=7
JDK_MICRO_VER=0
# Previous (bootdir) JDK version
-JDK_PREVIOUS_VERSION=1.7.0
+JDK_PREVIOUS_VERSION=1.6.0
diff -r 11f2ed4d2141 -r b11130d646c2 make/jprt.properties
--- a/make/jprt.properties Wed May 02 15:07:20 2012 +0100
+++ b/make/jprt.properties Wed May 16 14:49:26 2012 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. 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
@@ -38,7 +38,7 @@
# This tells jprt what default release we want to build
-jprt.hotspot.default.release=jdk7
+jprt.hotspot.default.release=jdk7u4
jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
@@ -54,58 +54,72 @@
# Define the Solaris platforms we want for the various releases
jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
+jprt.my.solaris.sparc.jdk7u4=${jprt.my.solaris.sparc.jdk7}
jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
+jprt.my.solaris.sparcv9.jdk7u4=${jprt.my.solaris.sparcv9.jdk7}
jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
jprt.my.solaris.i586.jdk8=solaris_i586_5.10
jprt.my.solaris.i586.jdk7=solaris_i586_5.10
+jprt.my.solaris.i586.jdk7u4=${jprt.my.solaris.i586.jdk7}
jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
jprt.my.solaris.x64.jdk8=solaris_x64_5.10
jprt.my.solaris.x64.jdk7=solaris_x64_5.10
+jprt.my.solaris.x64.jdk7u4=${jprt.my.solaris.x64.jdk7}
jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
jprt.my.linux.i586.jdk8=linux_i586_2.6
jprt.my.linux.i586.jdk7=linux_i586_2.6
+jprt.my.linux.i586.jdk7u4=${jprt.my.linux.i586.jdk7}
jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
jprt.my.linux.x64.jdk8=linux_x64_2.6
jprt.my.linux.x64.jdk7=linux_x64_2.6
+jprt.my.linux.x64.jdk7u4=${jprt.my.linux.x64.jdk7}
jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
More information about the distro-pkg-dev
mailing list