. Update to patchset 6, based on 1.5.0 Update 12.
. Use the -bc (backwards compatible) flag when doing time zone updates.
This commit is contained in:
Greg Lewis
parent
cf24da0ea7
commit
a4adb6665f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=196360
18 changed files with 28 additions and 404 deletions
|
|
@ -53,10 +53,10 @@ POLICYFILE= jce_policy-${JDK_VERSION:S/./_/g}.zip
|
||||||
TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
|
TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
|
||||||
|
|
||||||
JDK_VERSION= 1.5.0
|
JDK_VERSION= 1.5.0
|
||||||
JDK_UPDATE_VERSION= 11
|
JDK_UPDATE_VERSION= 12
|
||||||
JDK_PATCHSET_VERSION= 5
|
JDK_PATCHSET_VERSION= 6
|
||||||
JDK_BUILD_NUMBER= 03
|
JDK_BUILD_NUMBER= 04
|
||||||
JDK_BUILD_DATE= 15_dec_2006
|
JDK_BUILD_DATE= 02_may_2007
|
||||||
LATEST_LINK= jdk15
|
LATEST_LINK= jdk15
|
||||||
|
|
||||||
TZUPDATE_VERSION= 1.2.1
|
TZUPDATE_VERSION= 1.2.1
|
||||||
|
|
@ -326,7 +326,7 @@ post-build:
|
||||||
.if defined(WITH_TZUPDATE)
|
.if defined(WITH_TZUPDATE)
|
||||||
@# Update time zones
|
@# Update time zones
|
||||||
@-${JDKIMAGEDIR}/bin/java -jar \
|
@-${JDKIMAGEDIR}/bin/java -jar \
|
||||||
${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
|
${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
|
||||||
@-${RM} -rf ${JDKIMAGEDIR}/jre/lib/zi.tzdata*
|
@-${RM} -rf ${JDKIMAGEDIR}/jre/lib/zi.tzdata*
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
MD5 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = e6661cce9c94009e2fa909a151c0160c
|
MD5 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = deb204740d2f8a799ba8658c8c768ebe
|
||||||
SHA256 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = f2dd285070a1c4d71077cbc28420e39628fc577ac4fb02e8617ebffeab8120eb
|
SHA256 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 8b93abe500d58a9b2d766ded6f9041e8bc457b785e6751e0e3d1d8308ed23a3f
|
||||||
SIZE (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = 57703958
|
SIZE (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 57752561
|
||||||
MD5 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 7c952fba37101c154f1636dc401aa093
|
MD5 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 80996fbf2db79d9fa4a75e17bc1f6551
|
||||||
SHA256 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = c5cd6d195c1cb213546cd598da0c6d5295e1cf5fd5748e924628035b45874780
|
SHA256 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 886c57a62f6691954269a84d4cd0a32c8d61eb4e04c4028933e0e9bfae2cf999
|
||||||
SIZE (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 2211688
|
SIZE (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 2211514
|
||||||
MD5 (bsd-jdk15-patches-5.tar.bz2) = bc6339e072fabb20097eebbec0e5060f
|
MD5 (bsd-jdk15-patches-6.tar.bz2) = 9277d3624b9879583c1dc74c798321e2
|
||||||
SHA256 (bsd-jdk15-patches-5.tar.bz2) = b996f0bc530e2c21c83598e5b3e2f86a264d50d755cb5037ee5cc38a88be9993
|
SHA256 (bsd-jdk15-patches-6.tar.bz2) = 6f9c225db85f63a0b9c41f0eab50c3e3394dbe163f6cc8d936f2afe76010cdd1
|
||||||
SIZE (bsd-jdk15-patches-5.tar.bz2) = 772184
|
SIZE (bsd-jdk15-patches-6.tar.bz2) = 777561
|
||||||
MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
|
MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
|
||||||
SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
|
SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
|
||||||
SIZE (jce_policy-1_5_0.zip) = 8826
|
SIZE (jce_policy-1_5_0.zip) = 8826
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
--- ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig Thu May 24 15:27:43 2007
|
|
||||||
+++ ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp Thu May 24 19:54:47 2007
|
|
||||||
@@ -238,15 +238,15 @@
|
|
||||||
// success, if not we return failure and the caller can retry.
|
|
||||||
//
|
|
||||||
_result = false;
|
|
||||||
- if (uc->context_eip == (int)_old_addr.pc() ) {
|
|
||||||
- uc->context_eip = (int)_new_addr.pc();
|
|
||||||
+ if (uc->context_eip == (intptr_t)_old_addr.pc() ) {
|
|
||||||
+ uc->context_eip = (intptr_t)_new_addr.pc();
|
|
||||||
_result = true;
|
|
||||||
#ifndef __OpenBSD__
|
|
||||||
} else if (uc->uc_link != NULL) {
|
|
||||||
// Check (and validate) one level of stacked ucontext
|
|
||||||
ucontext_t* linked_uc = uc->uc_link;
|
|
||||||
- if (os::Bsd::valid_ucontext(thread, uc, linked_uc) && linked_uc->context_eip == (int)_old_addr.pc()) {
|
|
||||||
- linked_uc->context_eip = (int)_new_addr.pc();
|
|
||||||
+ if (os::Bsd::valid_ucontext(thread, uc, linked_uc) && linked_uc->context_eip == (intptr_t)_old_addr.pc()) {
|
|
||||||
+ linked_uc->context_eip = (intptr_t)_new_addr.pc();
|
|
||||||
_result = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
--- ../../hotspot/src/cpu/i486/vm/i486.ad.orig Thu May 24 15:27:42 2007
|
|
||||||
+++ ../../hotspot/src/cpu/i486/vm/i486.ad Thu May 24 19:47:30 2007
|
|
||||||
@@ -383,8 +383,9 @@
|
|
||||||
void emit_d32_reloc(CodeBuffer &cbuf, int d32, RelocationHolder const& rspec,
|
|
||||||
int format) {
|
|
||||||
#ifdef ASSERT
|
|
||||||
- if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
|
|
||||||
- assert(oop(d32)->is_oop() && oop(d32)->is_perm(), "cannot embed non-perm oops in code");
|
|
||||||
+ if (rspec.reloc()->type() == relocInfo::oop_type &&
|
|
||||||
+ d32 != 0 && d32 != (intptr_t)Universe::non_oop_word()) {
|
|
||||||
+ assert(oop((intptr_t)d32)->is_oop() && oop((intptr_t)d32)->is_perm(), "cannot embed non-perm oops in code");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
cbuf.relocate(cbuf.mark(), rspec, format);
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
--- ../../hotspot/src/cpu/i486/vm/register_i486.hpp.orig Thu May 24 15:27:42 2007
|
|
||||||
+++ ../../hotspot/src/cpu/i486/vm/register_i486.hpp Thu May 24 19:51:43 2007
|
|
||||||
@@ -24,9 +24,9 @@
|
|
||||||
static Register as_Register(int encoding) { return (Register)encoding; }
|
|
||||||
|
|
||||||
// accessors
|
|
||||||
- int encoding() const { assert(is_valid(), "invalid register"); return (int)this; }
|
|
||||||
- bool is_valid() const { return 0 <= (int)this && (int)this < number_of_registers; }
|
|
||||||
- bool has_byte_register() const { return 0 <= (int)this && (int)this < number_of_byte_registers; }
|
|
||||||
+ int encoding() const { assert(is_valid(), "invalid register"); return value(); }
|
|
||||||
+ bool is_valid() const { return 0 <= value() && value() < number_of_registers; }
|
|
||||||
+ bool has_byte_register() const { return 0 <= value() && value() < number_of_byte_registers; }
|
|
||||||
const char* name() const;
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -74,8 +74,8 @@
|
|
||||||
friend XMMRegister as_XMMRegister(int encoding) { return (XMMRegister)encoding; }
|
|
||||||
|
|
||||||
// accessors
|
|
||||||
- int encoding() const { assert(is_valid(), "invalid register"); return (int)this; }
|
|
||||||
- bool is_valid() const { return 0 <= (int)this && (int)this < number_of_registers; }
|
|
||||||
+ int encoding() const { assert(is_valid(), "invalid register"); return value(); }
|
|
||||||
+ bool is_valid() const { return 0 <= value() && value() < number_of_registers; }
|
|
||||||
const char* name() const;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
--- ../../j2se/src/share/native/sun/awt/medialib/mlib_sys.c
|
|
||||||
+++ ../../j2se/src/share/native/sun/awt/medialib/mlib_sys.c
|
|
||||||
@@ -15,6 +15,9 @@
|
|
||||||
#include <mlib_types.h>
|
|
||||||
#include <mlib_sys_proto.h>
|
|
||||||
#include "mlib_SysMath.h"
|
|
||||||
+#if defined(_ALLBSD_SOURCE)
|
|
||||||
+#include <sys/param.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/***************************************************************/
|
|
||||||
|
|
||||||
@@ -72,6 +75,9 @@
|
|
||||||
* alignment. -- from stdlib.h of MS VC++5.0.
|
|
||||||
*/
|
|
||||||
return (void *) malloc(size);
|
|
||||||
+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
|
|
||||||
+ void *ret;
|
|
||||||
+ return posix_memalign(&ret, 8, size) ? NULL : ret;
|
|
||||||
#elif defined(_ALLBSD_SOURCE)
|
|
||||||
return valloc(size);
|
|
||||||
#else
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
--- ../../j2se/src/solaris/bin/java_md.c.orig Fri May 25 21:49:14 2007
|
|
||||||
+++ ../../j2se/src/solaris/bin/java_md.c Wed May 30 17:00:23 2007
|
|
||||||
@@ -1060,8 +1060,9 @@
|
|
||||||
|
|
||||||
#if defined(_ALLBSD_SOURCE)
|
|
||||||
|
|
||||||
- uint64_t result;
|
|
||||||
- int mib[2], rlen;
|
|
||||||
+ unsigned long result;
|
|
||||||
+ int mib[2];
|
|
||||||
+ size_t rlen;
|
|
||||||
|
|
||||||
/* fetch sysctl(hw.physmem) value */
|
|
||||||
mib[0] = CTL_HW;
|
|
||||||
@@ -1342,10 +1343,11 @@
|
|
||||||
|
|
||||||
#if defined(_ALLBSD_SOURCE)
|
|
||||||
|
|
||||||
- unsigned long result, sys_processors;
|
|
||||||
- int mib[2], rlen;
|
|
||||||
+ unsigned long sys_processors;
|
|
||||||
+ int mib[2], result;
|
|
||||||
+ size_t rlen;
|
|
||||||
|
|
||||||
- /* fetch sysctl(hw.physmem) value */
|
|
||||||
+ /* fetch sysctl(hw.ncpu) value */
|
|
||||||
mib[0] = CTL_HW;
|
|
||||||
mib[1] = HW_NCPU;
|
|
||||||
rlen = sizeof(result);
|
|
||||||
@@ -1354,7 +1356,7 @@
|
|
||||||
result = 1;
|
|
||||||
|
|
||||||
if (_launcher_debug) {
|
|
||||||
- printf("sysctl(hw.ncpu): %lu\n", result);
|
|
||||||
+ printf("sysctl(hw.ncpu): %d\n", result);
|
|
||||||
}
|
|
||||||
|
|
||||||
sys_processors = result;
|
|
||||||
@@ -1635,7 +1637,7 @@
|
|
||||||
while (dp != NULL) {
|
|
||||||
cp = strchr(dp, (int)':');
|
|
||||||
if (cp != NULL)
|
|
||||||
- *cp = (char)NULL;
|
|
||||||
+ *cp = '\0';
|
|
||||||
if ((target = ProcessDir(info, dp)) != NULL)
|
|
||||||
break;
|
|
||||||
dp = cp;
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
--- ../../j2se/src/solaris/hpi/src/memory_md.c
|
|
||||||
+++ ../../j2se/src/solaris/hpi/src/memory_md.c
|
|
||||||
@@ -32,7 +32,9 @@
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h> /* For perror() */
|
|
||||||
#include <string.h>
|
|
||||||
-#if !defined(_ALLBSD_SOURCE)
|
|
||||||
+#if defined(_ALLBSD_SOURCE)
|
|
||||||
+#include <sys/param.h>
|
|
||||||
+#else
|
|
||||||
#include <malloc.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -67,7 +69,16 @@
|
|
||||||
static size_t memGrainSize; /* A page for Linux */
|
|
||||||
#elif defined(_ALLBSD_SOURCE)
|
|
||||||
static size_t memGrainSize; /* A page for FreeBSD */
|
|
||||||
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
|
|
||||||
+static inline void *
|
|
||||||
+memalign(size_t alignment, size_t size)
|
|
||||||
+{
|
|
||||||
+ void *ret;
|
|
||||||
+ return posix_memalign(&ret, alignment, size) ? NULL : ret;
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
#define memalign(a, b) valloc(b)
|
|
||||||
+#endif
|
|
||||||
#else
|
|
||||||
static unsigned int memGrainSize; /* A page for Solaris */
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
--- ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
|
|
||||||
+++ ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
|
|
||||||
@@ -42,6 +42,7 @@
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
#ifdef __FreeBSD__
|
|
||||||
+#include <sys/param.h>
|
|
||||||
#include <sys/soundcard.h>
|
|
||||||
#endif
|
|
||||||
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
||||||
@@ -67,7 +68,16 @@
|
|
||||||
#define FALSE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
|
|
||||||
+static inline void *
|
|
||||||
+memalign(size_t alignment, size_t size)
|
|
||||||
+{
|
|
||||||
+ void *ret;
|
|
||||||
+ return posix_memalign(&ret, alignment, size) ? NULL : ret;
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
#define memalign(a, b) valloc(b)
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
// How many audio frames to generate at one time
|
|
||||||
#define HAE_BSD_FRAMES_PER_BLOCK 8
|
|
||||||
|
|
@ -53,10 +53,10 @@ POLICYFILE= jce_policy-${JDK_VERSION:S/./_/g}.zip
|
||||||
TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
|
TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
|
||||||
|
|
||||||
JDK_VERSION= 1.5.0
|
JDK_VERSION= 1.5.0
|
||||||
JDK_UPDATE_VERSION= 11
|
JDK_UPDATE_VERSION= 12
|
||||||
JDK_PATCHSET_VERSION= 5
|
JDK_PATCHSET_VERSION= 6
|
||||||
JDK_BUILD_NUMBER= 03
|
JDK_BUILD_NUMBER= 04
|
||||||
JDK_BUILD_DATE= 15_dec_2006
|
JDK_BUILD_DATE= 02_may_2007
|
||||||
LATEST_LINK= jdk15
|
LATEST_LINK= jdk15
|
||||||
|
|
||||||
TZUPDATE_VERSION= 1.2.1
|
TZUPDATE_VERSION= 1.2.1
|
||||||
|
|
@ -326,7 +326,7 @@ post-build:
|
||||||
.if defined(WITH_TZUPDATE)
|
.if defined(WITH_TZUPDATE)
|
||||||
@# Update time zones
|
@# Update time zones
|
||||||
@-${JDKIMAGEDIR}/bin/java -jar \
|
@-${JDKIMAGEDIR}/bin/java -jar \
|
||||||
${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
|
${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
|
||||||
@-${RM} -rf ${JDKIMAGEDIR}/jre/lib/zi.tzdata*
|
@-${RM} -rf ${JDKIMAGEDIR}/jre/lib/zi.tzdata*
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
MD5 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = e6661cce9c94009e2fa909a151c0160c
|
MD5 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = deb204740d2f8a799ba8658c8c768ebe
|
||||||
SHA256 (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = f2dd285070a1c4d71077cbc28420e39628fc577ac4fb02e8617ebffeab8120eb
|
SHA256 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 8b93abe500d58a9b2d766ded6f9041e8bc457b785e6751e0e3d1d8308ed23a3f
|
||||||
SIZE (jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar) = 57703958
|
SIZE (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 57752561
|
||||||
MD5 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 7c952fba37101c154f1636dc401aa093
|
MD5 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 80996fbf2db79d9fa4a75e17bc1f6551
|
||||||
SHA256 (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = c5cd6d195c1cb213546cd598da0c6d5295e1cf5fd5748e924628035b45874780
|
SHA256 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 886c57a62f6691954269a84d4cd0a32c8d61eb4e04c4028933e0e9bfae2cf999
|
||||||
SIZE (jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar) = 2211688
|
SIZE (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 2211514
|
||||||
MD5 (bsd-jdk15-patches-5.tar.bz2) = bc6339e072fabb20097eebbec0e5060f
|
MD5 (bsd-jdk15-patches-6.tar.bz2) = 9277d3624b9879583c1dc74c798321e2
|
||||||
SHA256 (bsd-jdk15-patches-5.tar.bz2) = b996f0bc530e2c21c83598e5b3e2f86a264d50d755cb5037ee5cc38a88be9993
|
SHA256 (bsd-jdk15-patches-6.tar.bz2) = 6f9c225db85f63a0b9c41f0eab50c3e3394dbe163f6cc8d936f2afe76010cdd1
|
||||||
SIZE (bsd-jdk15-patches-5.tar.bz2) = 772184
|
SIZE (bsd-jdk15-patches-6.tar.bz2) = 777561
|
||||||
MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
|
MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
|
||||||
SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
|
SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
|
||||||
SIZE (jce_policy-1_5_0.zip) = 8826
|
SIZE (jce_policy-1_5_0.zip) = 8826
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
--- ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig Thu May 24 15:27:43 2007
|
|
||||||
+++ ../../hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp Thu May 24 19:54:47 2007
|
|
||||||
@@ -238,15 +238,15 @@
|
|
||||||
// success, if not we return failure and the caller can retry.
|
|
||||||
//
|
|
||||||
_result = false;
|
|
||||||
- if (uc->context_eip == (int)_old_addr.pc() ) {
|
|
||||||
- uc->context_eip = (int)_new_addr.pc();
|
|
||||||
+ if (uc->context_eip == (intptr_t)_old_addr.pc() ) {
|
|
||||||
+ uc->context_eip = (intptr_t)_new_addr.pc();
|
|
||||||
_result = true;
|
|
||||||
#ifndef __OpenBSD__
|
|
||||||
} else if (uc->uc_link != NULL) {
|
|
||||||
// Check (and validate) one level of stacked ucontext
|
|
||||||
ucontext_t* linked_uc = uc->uc_link;
|
|
||||||
- if (os::Bsd::valid_ucontext(thread, uc, linked_uc) && linked_uc->context_eip == (int)_old_addr.pc()) {
|
|
||||||
- linked_uc->context_eip = (int)_new_addr.pc();
|
|
||||||
+ if (os::Bsd::valid_ucontext(thread, uc, linked_uc) && linked_uc->context_eip == (intptr_t)_old_addr.pc()) {
|
|
||||||
+ linked_uc->context_eip = (intptr_t)_new_addr.pc();
|
|
||||||
_result = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
--- ../../hotspot/src/cpu/i486/vm/i486.ad.orig Thu May 24 15:27:42 2007
|
|
||||||
+++ ../../hotspot/src/cpu/i486/vm/i486.ad Thu May 24 19:47:30 2007
|
|
||||||
@@ -383,8 +383,9 @@
|
|
||||||
void emit_d32_reloc(CodeBuffer &cbuf, int d32, RelocationHolder const& rspec,
|
|
||||||
int format) {
|
|
||||||
#ifdef ASSERT
|
|
||||||
- if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
|
|
||||||
- assert(oop(d32)->is_oop() && oop(d32)->is_perm(), "cannot embed non-perm oops in code");
|
|
||||||
+ if (rspec.reloc()->type() == relocInfo::oop_type &&
|
|
||||||
+ d32 != 0 && d32 != (intptr_t)Universe::non_oop_word()) {
|
|
||||||
+ assert(oop((intptr_t)d32)->is_oop() && oop((intptr_t)d32)->is_perm(), "cannot embed non-perm oops in code");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
cbuf.relocate(cbuf.mark(), rspec, format);
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
--- ../../hotspot/src/cpu/i486/vm/register_i486.hpp.orig Thu May 24 15:27:42 2007
|
|
||||||
+++ ../../hotspot/src/cpu/i486/vm/register_i486.hpp Thu May 24 19:51:43 2007
|
|
||||||
@@ -24,9 +24,9 @@
|
|
||||||
static Register as_Register(int encoding) { return (Register)encoding; }
|
|
||||||
|
|
||||||
// accessors
|
|
||||||
- int encoding() const { assert(is_valid(), "invalid register"); return (int)this; }
|
|
||||||
- bool is_valid() const { return 0 <= (int)this && (int)this < number_of_registers; }
|
|
||||||
- bool has_byte_register() const { return 0 <= (int)this && (int)this < number_of_byte_registers; }
|
|
||||||
+ int encoding() const { assert(is_valid(), "invalid register"); return value(); }
|
|
||||||
+ bool is_valid() const { return 0 <= value() && value() < number_of_registers; }
|
|
||||||
+ bool has_byte_register() const { return 0 <= value() && value() < number_of_byte_registers; }
|
|
||||||
const char* name() const;
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -74,8 +74,8 @@
|
|
||||||
friend XMMRegister as_XMMRegister(int encoding) { return (XMMRegister)encoding; }
|
|
||||||
|
|
||||||
// accessors
|
|
||||||
- int encoding() const { assert(is_valid(), "invalid register"); return (int)this; }
|
|
||||||
- bool is_valid() const { return 0 <= (int)this && (int)this < number_of_registers; }
|
|
||||||
+ int encoding() const { assert(is_valid(), "invalid register"); return value(); }
|
|
||||||
+ bool is_valid() const { return 0 <= value() && value() < number_of_registers; }
|
|
||||||
const char* name() const;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
--- ../../j2se/src/share/native/sun/awt/medialib/mlib_sys.c
|
|
||||||
+++ ../../j2se/src/share/native/sun/awt/medialib/mlib_sys.c
|
|
||||||
@@ -15,6 +15,9 @@
|
|
||||||
#include <mlib_types.h>
|
|
||||||
#include <mlib_sys_proto.h>
|
|
||||||
#include "mlib_SysMath.h"
|
|
||||||
+#if defined(_ALLBSD_SOURCE)
|
|
||||||
+#include <sys/param.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/***************************************************************/
|
|
||||||
|
|
||||||
@@ -72,6 +75,9 @@
|
|
||||||
* alignment. -- from stdlib.h of MS VC++5.0.
|
|
||||||
*/
|
|
||||||
return (void *) malloc(size);
|
|
||||||
+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
|
|
||||||
+ void *ret;
|
|
||||||
+ return posix_memalign(&ret, 8, size) ? NULL : ret;
|
|
||||||
#elif defined(_ALLBSD_SOURCE)
|
|
||||||
return valloc(size);
|
|
||||||
#else
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
--- ../../j2se/src/solaris/bin/java_md.c.orig Fri May 25 21:49:14 2007
|
|
||||||
+++ ../../j2se/src/solaris/bin/java_md.c Wed May 30 17:00:23 2007
|
|
||||||
@@ -1060,8 +1060,9 @@
|
|
||||||
|
|
||||||
#if defined(_ALLBSD_SOURCE)
|
|
||||||
|
|
||||||
- uint64_t result;
|
|
||||||
- int mib[2], rlen;
|
|
||||||
+ unsigned long result;
|
|
||||||
+ int mib[2];
|
|
||||||
+ size_t rlen;
|
|
||||||
|
|
||||||
/* fetch sysctl(hw.physmem) value */
|
|
||||||
mib[0] = CTL_HW;
|
|
||||||
@@ -1342,10 +1343,11 @@
|
|
||||||
|
|
||||||
#if defined(_ALLBSD_SOURCE)
|
|
||||||
|
|
||||||
- unsigned long result, sys_processors;
|
|
||||||
- int mib[2], rlen;
|
|
||||||
+ unsigned long sys_processors;
|
|
||||||
+ int mib[2], result;
|
|
||||||
+ size_t rlen;
|
|
||||||
|
|
||||||
- /* fetch sysctl(hw.physmem) value */
|
|
||||||
+ /* fetch sysctl(hw.ncpu) value */
|
|
||||||
mib[0] = CTL_HW;
|
|
||||||
mib[1] = HW_NCPU;
|
|
||||||
rlen = sizeof(result);
|
|
||||||
@@ -1354,7 +1356,7 @@
|
|
||||||
result = 1;
|
|
||||||
|
|
||||||
if (_launcher_debug) {
|
|
||||||
- printf("sysctl(hw.ncpu): %lu\n", result);
|
|
||||||
+ printf("sysctl(hw.ncpu): %d\n", result);
|
|
||||||
}
|
|
||||||
|
|
||||||
sys_processors = result;
|
|
||||||
@@ -1635,7 +1637,7 @@
|
|
||||||
while (dp != NULL) {
|
|
||||||
cp = strchr(dp, (int)':');
|
|
||||||
if (cp != NULL)
|
|
||||||
- *cp = (char)NULL;
|
|
||||||
+ *cp = '\0';
|
|
||||||
if ((target = ProcessDir(info, dp)) != NULL)
|
|
||||||
break;
|
|
||||||
dp = cp;
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
--- ../../j2se/src/solaris/hpi/src/memory_md.c
|
|
||||||
+++ ../../j2se/src/solaris/hpi/src/memory_md.c
|
|
||||||
@@ -32,7 +32,9 @@
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h> /* For perror() */
|
|
||||||
#include <string.h>
|
|
||||||
-#if !defined(_ALLBSD_SOURCE)
|
|
||||||
+#if defined(_ALLBSD_SOURCE)
|
|
||||||
+#include <sys/param.h>
|
|
||||||
+#else
|
|
||||||
#include <malloc.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -67,7 +69,16 @@
|
|
||||||
static size_t memGrainSize; /* A page for Linux */
|
|
||||||
#elif defined(_ALLBSD_SOURCE)
|
|
||||||
static size_t memGrainSize; /* A page for FreeBSD */
|
|
||||||
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
|
|
||||||
+static inline void *
|
|
||||||
+memalign(size_t alignment, size_t size)
|
|
||||||
+{
|
|
||||||
+ void *ret;
|
|
||||||
+ return posix_memalign(&ret, alignment, size) ? NULL : ret;
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
#define memalign(a, b) valloc(b)
|
|
||||||
+#endif
|
|
||||||
#else
|
|
||||||
static unsigned int memGrainSize; /* A page for Solaris */
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
--- ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
|
|
||||||
+++ ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
|
|
||||||
@@ -42,6 +42,7 @@
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
#ifdef __FreeBSD__
|
|
||||||
+#include <sys/param.h>
|
|
||||||
#include <sys/soundcard.h>
|
|
||||||
#endif
|
|
||||||
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
||||||
@@ -67,7 +68,16 @@
|
|
||||||
#define FALSE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
|
|
||||||
+static inline void *
|
|
||||||
+memalign(size_t alignment, size_t size)
|
|
||||||
+{
|
|
||||||
+ void *ret;
|
|
||||||
+ return posix_memalign(&ret, alignment, size) ? NULL : ret;
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
#define memalign(a, b) valloc(b)
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
// How many audio frames to generate at one time
|
|
||||||
#define HAE_BSD_FRAMES_PER_BLOCK 8
|
|
||||||
Loading…
Reference in a new issue