summaryrefslogtreecommitdiff
path: root/java/openjdk7/files/patch-bsd
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2015-04-28 05:40:24 +0000
committerGreg Lewis <glewis@FreeBSD.org>2015-04-28 05:40:24 +0000
commit010c48ac487233ddc4b8f5412c091027cf491693 (patch)
treedefc6a53fe89a51934b8603883f018d1286ac71b /java/openjdk7/files/patch-bsd
parentAdd euclid-wm 0.4.3, minimalist, tiling window manager for X11. (diff)
. Update to 7u80.
Diffstat (limited to 'java/openjdk7/files/patch-bsd')
-rw-r--r--java/openjdk7/files/patch-bsd1700
1 files changed, 836 insertions, 864 deletions
diff --git a/java/openjdk7/files/patch-bsd b/java/openjdk7/files/patch-bsd
index 4725ec6455cc..f1584da0741e 100644
--- a/java/openjdk7/files/patch-bsd
+++ b/java/openjdk7/files/patch-bsd
@@ -1,50 +1,5 @@
---- ./.hgtags Thu Dec 18 14:04:37 2014 -0800
-+++ ./.hgtags Sat Jan 24 11:28:38 2015 -0800
-@@ -123,6 +123,7 @@
- 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
- 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
- d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
-+00b623147f23ef8a92a25c4c28ef8681dc1d1b52 7u0
- 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
- bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
- f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -552,3 +554,4 @@
- fc18a1bf57b62578466a4de68314bba79721c8fd jdk7u76-b10
- 4f5b251f1daa41a9143636a9b8aaf0cf4ce00f26 jdk7u76-b11
- 01d1d34f82f30de97a61f8b0048c61aa17d0dd12 jdk7u76-b12
-+a9728fbea214dbf6f58567e729fdc5276f3c704f jdk7u76-b13
---- ./corba/.hgtags Thu Dec 18 14:05:07 2014 -0800
-+++ ./corba/.hgtags Sat Jan 24 11:28:39 2015 -0800
-@@ -123,6 +123,7 @@
- 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
- 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
- 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
-+578c4d2c534cc761f5f5cc0d8360471bb8d5f94f 7u0
- 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
- dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
- eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -554,3 +556,4 @@
- b10583d82c01a621beb89a4a8e0f4830cdda703b jdk7u76-b10
- c947bf709139b13476a1df4ca8a92583fb1de5a4 jdk7u76-b11
- 14f0846f4d1b8373e3e3cce10901f37341bf6980 jdk7u76-b12
-+0db41b697138ce89f15c49eef1dc670f94a27d89 jdk7u76-b13
---- ./hotspot/.hgtags Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/.hgtags Sun Jan 25 08:30:35 2015 -0800
-@@ -182,6 +182,7 @@
- 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
- 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
- 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17
-+f1a18ada5853af49fce54d43dd5a5b67dc291470 7u0
- 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
- 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
- 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
-@@ -779,3 +781,4 @@
- 82b681cadc354b08b0aa2858d9b7f78576a8c1a4 jdk7u76-b10
- fd16bf65cfed7208af5740977a6699d18ac103b2 jdk7u76-b11
- e375023d196199ffb263cb15739f7218e1621be6 jdk7u76-b12
-+a395c29532e5322657c542d54dd957940cf2f523 jdk7u76-b13
---- ./hotspot/agent/src/os/bsd/ps_proc.c Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/agent/src/os/bsd/ps_proc.c Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/agent/src/os/bsd/ps_proc.c Sun Apr 19 13:24:21 2015 -0700
@@ -131,7 +131,7 @@
static bool ptrace_continue(pid_t pid, int signal) {
@@ -54,8 +9,8 @@
print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
return false;
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sun Apr 19 13:24:21 2015 -0700
@@ -33,6 +33,7 @@
import sun.jvm.hotspot.debugger.remote.*;
import sun.jvm.hotspot.debugger.windbg.*;
@@ -64,8 +19,8 @@
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Sun Apr 19 13:24:21 2015 -0700
@@ -35,6 +35,7 @@
import sun.jvm.hotspot.debugger.windbg.*;
import sun.jvm.hotspot.debugger.linux.*;
@@ -74,8 +29,8 @@
import sun.jvm.hotspot.debugger.remote.*;
import sun.jvm.hotspot.livejvm.*;
import sun.jvm.hotspot.memory.*;
---- ./hotspot/make/bsd/Makefile Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/Makefile Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/Makefile Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/Makefile Sun Apr 19 13:24:21 2015 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -105,8 +60,8 @@
# Synonyms for win32-like targets.
compiler2: jvmg product
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sun Apr 19 13:24:21 2015 -0700
@@ -1,12 +1,28 @@
#!/bin/sh
@@ -142,8 +97,8 @@
+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
+ }' | sort -u ;;
+esac
---- ./hotspot/make/bsd/makefiles/buildtree.make Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/makefiles/buildtree.make Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/makefiles/buildtree.make Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/makefiles/buildtree.make Sun Apr 19 13:24:21 2015 -0700
@@ -255,6 +255,16 @@
echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
[ -n "$(CFLAGS_BROWSE)" ] && \
@@ -170,8 +125,8 @@
.dbxrc: $(BUILDTREE_MAKE)
@echo Creating $@ ...
---- ./hotspot/make/bsd/makefiles/gcc.make Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/makefiles/gcc.make Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/makefiles/gcc.make Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/makefiles/gcc.make Sun Apr 19 13:24:21 2015 -0700
@@ -117,7 +117,10 @@
CFLAGS += -fno-rtti
CFLAGS += -fno-exceptions
@@ -197,8 +152,8 @@
endif
# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
---- ./hotspot/make/bsd/makefiles/jsig.make Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/makefiles/jsig.make Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/makefiles/jsig.make Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/makefiles/jsig.make Sun Apr 19 13:24:21 2015 -0700
@@ -36,9 +36,16 @@
LIBJSIG_G = lib$(JSIG_G).so
endif
@@ -251,8 +206,8 @@
$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
.PHONY: install_jsig
---- ./hotspot/make/bsd/makefiles/launcher.make Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/makefiles/launcher.make Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/makefiles/launcher.make Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/makefiles/launcher.make Sun Apr 19 13:24:21 2015 -0700
@@ -50,7 +50,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
@@ -262,8 +217,8 @@
# The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a
# freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sun Apr 19 13:24:21 2015 -0700
@@ -19,237 +19,248 @@
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
@@ -737,8 +692,8 @@
+ local:
+ *;
+};
---- ./hotspot/make/bsd/makefiles/ppc.make Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/makefiles/ppc.make Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/makefiles/ppc.make Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/makefiles/ppc.make Sun Apr 19 13:24:21 2015 -0700
@@ -28,3 +28,6 @@
# Must also specify if CPU is big endian
CFLAGS += -DVM_BIG_ENDIAN
@@ -746,8 +701,8 @@
+ifdef E500V2
+ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1
+endif
---- ./hotspot/make/bsd/makefiles/saproc.make Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/bsd/makefiles/saproc.make Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/bsd/makefiles/saproc.make Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/bsd/makefiles/saproc.make Sun Apr 19 13:24:21 2015 -0700
@@ -36,6 +36,11 @@
LIBSAPROC_G = lib$(SAPROC_G).so
endif
@@ -804,8 +759,8 @@
cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
fi
---- ./hotspot/make/solaris/makefiles/defs.make Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/make/solaris/makefiles/defs.make Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/make/solaris/makefiles/defs.make Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/make/solaris/makefiles/defs.make Sun Apr 19 13:24:21 2015 -0700
@@ -221,8 +221,8 @@
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -817,8 +772,8 @@
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
ifeq ($(ARCH_DATA_MODEL),32)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sun Apr 19 13:24:21 2015 -0700
@@ -71,7 +71,11 @@
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
@@ -832,7 +787,7 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sun Jan 25 08:30:35 2015 -0800
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -880,8 +835,8 @@
+ return false;
+}
+
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -187,6 +187,8 @@
static int SR_signum = SIGUSR2;
sigset_t SR_sigset;
@@ -905,7 +860,23 @@
len = sizeof(mem_val);
if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) {
assert(len == sizeof(mem_val), "unexpected data size");
-@@ -2401,14 +2409,14 @@
+@@ -1848,9 +1856,15 @@
+ return n;
+ }
+
++#ifdef __NetBSD__
++#include <lwp.h>
++#endif
++
+ intx os::current_thread_id() {
+ #ifdef __APPLE__
+ return (intx)::pthread_mach_thread_np(::pthread_self());
++#elif defined(__NetBSD__)
++ return (intx)_lwp_self();
+ #else
+ return (intx)::pthread_self();
+ #endif
+@@ -2401,14 +2415,14 @@
}
void os::print_os_info_brief(outputStream* st) {
@@ -922,7 +893,7 @@
os::Posix::print_uname_info(st);
-@@ -2417,10 +2425,6 @@
+@@ -2417,10 +2431,6 @@
os::Posix::print_load_average(st);
}
@@ -933,7 +904,7 @@
void os::print_memory_info(outputStream* st) {
st->print("Memory:");
-@@ -2437,6 +2441,7 @@
+@@ -2437,6 +2447,7 @@
st->print("(" UINT64_FORMAT "k free)",
os::available_memory() >> 10);
#ifndef _ALLBSD_SOURCE
@@ -941,7 +912,7 @@
st->print(", swap " UINT64_FORMAT "k",
((jlong)si.totalswap * si.mem_unit) >> 10);
st->print("(" UINT64_FORMAT "k free)",
-@@ -2444,12 +2449,22 @@
+@@ -2444,12 +2455,22 @@
#endif
st->cr();
@@ -964,7 +935,7 @@
// Taken from /usr/include/bits/siginfo.h Supposed to be architecture specific
// but they're the same for all the bsd arch that we support
// and they're the same for solaris but there's no common place to put this.
-@@ -2596,6 +2611,25 @@
+@@ -2596,6 +2617,25 @@
assert(len < buflen, "Ran out of buffer space");
jrelib_p = buf + len;
@@ -990,7 +961,7 @@
// Add the appropriate library subdir
snprintf(jrelib_p, buflen-len, "/jre/lib");
if (0 != access(buf, F_OK)) {
-@@ -2625,6 +2659,7 @@
+@@ -2625,6 +2665,7 @@
if (rp == NULL)
return;
}
@@ -998,7 +969,7 @@
}
}
}
-@@ -2728,10 +2763,14 @@
+@@ -2728,10 +2769,14 @@
bool timedwait(unsigned int sec, int nsec);
private:
jlong currenttime() const;
@@ -1014,7 +985,7 @@
SEM_INIT(_semaphore, 0);
}
-@@ -2796,7 +2835,7 @@
+@@ -2796,7 +2841,7 @@
bool Semaphore::timedwait(unsigned int sec, int nsec) {
struct timespec ts;
@@ -1023,7 +994,7 @@
while (1) {
int result = sem_timedwait(&_semaphore, &ts);
-@@ -3017,7 +3056,11 @@
+@@ -3017,7 +3062,11 @@
}
void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -1035,7 +1006,7 @@
}
void os::numa_make_global(char *addr, size_t bytes) {
-@@ -3852,6 +3895,7 @@
+@@ -3864,6 +3913,7 @@
return OS_OK;
#elif defined(__FreeBSD__)
int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
@@ -1043,8 +1014,8 @@
#elif defined(__APPLE__) || defined(__NetBSD__)
struct sched_param sp;
int policy;
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sun Apr 19 13:24:21 2015 -0700
@@ -103,6 +103,12 @@
static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
@@ -1058,8 +1029,8 @@
public:
static void init_thread_fpu_state();
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Sun Apr 19 13:24:21 2015 -0700
@@ -31,10 +31,22 @@
# include "atomic_bsd_x86.inline.hpp"
# include "orderAccess_bsd_x86.inline.hpp"
@@ -1083,8 +1054,8 @@
// System includes
---- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Sun Apr 19 13:24:21 2015 -0700
@@ -34,11 +34,26 @@
# include "orderAccess_bsd_x86.inline.hpp"
# include "prefetch_bsd_x86.inline.hpp"
@@ -1112,8 +1083,8 @@
// Contains inlined functions for class Thread and ThreadLocalStorage
---- ./hotspot/src/os/posix/vm/os_posix.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/os/posix/vm/os_posix.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/os/posix/vm/os_posix.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -175,11 +175,19 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -1134,8 +1105,8 @@
}
void os::Posix::print_uname_info(outputStream* st) {
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -945,7 +945,7 @@
if (rslt != 0)
fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
@@ -1145,8 +1116,8 @@
*size = ss.ss_size;
#elif defined(_ALLBSD_SOURCE)
pthread_attr_t attr;
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -24,7 +24,7 @@
*/
@@ -1156,8 +1127,8 @@
# include <pthread_np.h> /* For pthread_attr_get_np */
#endif
---- ./hotspot/src/share/vm/code/relocInfo.hpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/share/vm/code/relocInfo.hpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/share/vm/code/relocInfo.hpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/share/vm/code/relocInfo.hpp Sun Apr 19 13:24:21 2015 -0700
@@ -371,7 +371,7 @@
// "immediate" in the prefix header word itself. This optimization
// is invisible outside this module.)
@@ -1176,8 +1147,8 @@
assert(relocInfo::fits_into_immediate(datalen), "datalen in limits");
return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen);
}
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -111,7 +111,7 @@
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
@@ -1187,8 +1158,8 @@
e.commit();
}
}
---- ./hotspot/src/share/vm/runtime/atomic.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/share/vm/runtime/atomic.cpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/share/vm/runtime/atomic.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/share/vm/runtime/atomic.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -54,6 +54,12 @@
#ifdef TARGET_OS_ARCH_windows_x86
# include "atomic_windows_x86.inline.hpp"
@@ -1202,9 +1173,9 @@
#ifdef TARGET_OS_ARCH_linux_arm
# include "atomic_linux_arm.inline.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Sun Jan 25 08:30:35 2015 -0800
-@@ -1716,7 +1716,7 @@
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Sun Apr 19 13:24:21 2015 -0700
+@@ -1744,7 +1744,7 @@
}
iterator->_notified = 1 ;
Thread * Self = THREAD;
@@ -1213,7 +1184,7 @@
ObjectWaiter * List = _EntryList ;
if (List != NULL) {
-@@ -1842,7 +1842,7 @@
+@@ -1870,7 +1870,7 @@
guarantee (iterator->_notified == 0, "invariant") ;
iterator->_notified = 1 ;
Thread * Self = THREAD;
@@ -1222,8 +1193,8 @@
if (Policy != 4) {
iterator->TState = ObjectWaiter::TS_ENTER ;
}
---- ./hotspot/src/share/vm/runtime/os.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/share/vm/runtime/os.cpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/share/vm/runtime/os.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/share/vm/runtime/os.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -399,13 +399,6 @@
if (_native_java_library == NULL) {
vm_exit_during_initialization("Unable to load native library", ebuf);
@@ -1238,8 +1209,8 @@
}
static jboolean onLoaded = JNI_FALSE;
if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/share/vm/runtime/os.hpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/share/vm/runtime/os.hpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/share/vm/runtime/os.hpp Sun Apr 19 13:24:21 2015 -0700
@@ -30,6 +30,9 @@
#include "runtime/extendedPC.hpp"
#include "runtime/handles.hpp"
@@ -1250,7 +1221,7 @@
#ifdef TARGET_OS_FAMILY_linux
# include "jvm_linux.h"
# include <setjmp.h>
-@@ -752,8 +755,8 @@
+@@ -755,8 +758,8 @@
# include "os_windows.hpp"
#endif
#ifdef TARGET_OS_FAMILY_bsd
@@ -1260,8 +1231,8 @@
#endif
#ifdef TARGET_OS_ARCH_linux_x86
# include "os_linux_x86.hpp"
---- ./hotspot/src/share/vm/runtime/vmThread.cpp Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/share/vm/runtime/vmThread.cpp Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp Sun Apr 19 13:24:21 2015 -0700
@@ -393,7 +393,7 @@
// Only write caller thread information for non-concurrent vm operations.
// For concurrent vm operations, the thread id is set to 0 indicating thread is unknown.
@@ -1271,8 +1242,8 @@
event.commit();
}
---- ./hotspot/src/share/vm/trace/tracetypes.xml Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/src/share/vm/trace/tracetypes.xml Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/src/share/vm/trace/tracetypes.xml Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/src/share/vm/trace/tracetypes.xml Sun Apr 19 13:24:21 2015 -0700
@@ -60,7 +60,7 @@
<types>
<content_types>
@@ -1293,8 +1264,8 @@
<!-- VM Thread ID Note: changed from U2 to U8 for hotspot -->
<primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD"
---- ./hotspot/test/compiler/5091921/Test7005594.sh Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/test/compiler/5091921/Test7005594.sh Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/test/compiler/5091921/Test7005594.sh Sun Apr 19 13:24:21 2015 -0700
@@ -60,6 +60,9 @@
# Windows/MKS
MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -1305,8 +1276,8 @@
else
echo "Unable to determine amount of physical memory on the machine"
fi
---- ./hotspot/test/runtime/7110720/Test7110720.sh Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/test/runtime/7110720/Test7110720.sh Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/test/runtime/7110720/Test7110720.sh Sun Apr 19 13:24:21 2015 -0700
@@ -28,7 +28,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1317,7 +1288,7 @@
RM=/bin/rm
CP=/bin/cp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/7158800/Test7158800.sh Sun Jan 25 08:30:35 2015 -0800
++++ ./hotspot/test/runtime/7158800/Test7158800.sh Sun Apr 19 13:24:21 2015 -0700
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
@@ -1410,8 +1381,8 @@
+ echo "Test Passed"
+ exit 0
+fi
---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Thu Dec 18 14:06:49 2014 -0800
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sun Jan 25 08:30:35 2015 -0800
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Fri Apr 10 09:07:36 2015 -0700
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sun Apr 19 13:24:21 2015 -0700
@@ -36,8 +36,8 @@
public static void main(String args[]) throws Throwable {
@@ -1423,53 +1394,80 @@
return;
}
---- ./jaxp/.hgtags Thu Dec 18 14:10:07 2014 -0800
-+++ ./jaxp/.hgtags Sat Jan 24 11:28:40 2015 -0800
-@@ -123,6 +123,7 @@
- bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
- 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
- fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
-+3170972bd3928a331c4c64a5c0c9632077fb399a 7u0
- 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
- 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
- 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
-@@ -555,3 +557,4 @@
- 62e1b60c3adfd3133e3fe9f8d5194512f503c540 jdk7u76-b10
- 33040bd2deb5371a85fe7d7a9442cdf649919b39 jdk7u76-b11
- 7167fcf821b00424c0464086f4047a7209dc9e59 jdk7u76-b12
-+6262c3d41bb13f58338c4bc7946468ba70825046 jdk7u76-b13
---- ./jaxws/.hgtags Thu Dec 18 14:10:40 2014 -0800
-+++ ./jaxws/.hgtags Sat Jan 24 11:28:42 2015 -0800
-@@ -123,6 +123,7 @@
- 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
- c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
- d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
-+ce6378e3c791c56b98cbf161804a07d0225b41c0 7u0
- 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
- 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
- 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
-@@ -554,3 +556,4 @@
- c84694b00c547056b8da98ae4c0c7c9feb06863b jdk7u76-b10
- df2786b1daffc450d7e7e43c9d63aaf72a5cd2f0 jdk7u76-b11
- dc818936e1050f0058d35a7a27946e4e2bfb27ee jdk7u76-b12
-+a986e4b755f388532378d595831bebece7bf72c4 jdk7u76-b13
---- ./jdk/.hgtags Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/.hgtags Sun Jan 25 08:34:16 2015 -0800
-@@ -123,6 +123,7 @@
- 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
- 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
- f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
-+0870207843e2a74816dff1e33a717ffaf6f0a919 7u0
- 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
- a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
- b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -542,3 +544,4 @@
- c67a0b63cc6971ced2e233b63ebbdec063ad81d2 jdk7u76-b10
- e0e3c03502518c460d51d8c517b081cbd712a9c1 jdk7u76-b11
- 9af83882ca9e628f9e35634b930081271a91d561 jdk7u76-b12
-+1af0023da23e23482947b715fbf3bdfdee0d2813 jdk7u76-b13
---- ./jdk/make/com/sun/security/auth/module/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/com/sun/security/auth/module/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Thu Apr 23 13:38:32 2015 -0400
+@@ -29,6 +29,7 @@
+
+ ifneq ($(PLATFORM), windows)
+ ifneq ($(PLATFORM), macosx)
++ifneq ($(OS_VENDOR), OpenBSD)
+ FILES_export = \
+ sun/nio/ch/SctpAssocChange.java \
+ sun/nio/ch/SctpChannelImpl.java \
+@@ -39,3 +40,4 @@
+ sun/nio/ch/SctpStdSocketOption.java
+ endif
+ endif
++endif
+--- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Thu Apr 23 13:38:32 2015 -0400
+@@ -25,9 +25,13 @@
+
+ ifneq ($(PLATFORM),windows)
+ ifneq ($(PLATFORM),macosx)
++ifneq ($(OS_VENDOR),NetBSD)
++ifneq ($(OS_VENDOR),OpenBSD)
+ FILES_c = \
+ SctpNet.c \
+ SctpChannelImpl.c \
+ SctpServerChannelImpl.c
+ endif
+ endif
++endif
++endif
+--- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Thu Apr 23 13:38:32 2015 -0400
+@@ -50,6 +50,8 @@
+
+ ifneq ($(PLATFORM), windows)
+ ifneq ($(PLATFORM), macosx)
++ifneq ($(OS_VENDOR), NetBSD)
++ifneq ($(OS_VENDOR), OpenBSD)
+ FILES_java += \
+ sun/nio/ch/SctpAssocChange.java \
+ sun/nio/ch/SctpAssociationImpl.java \
+@@ -64,3 +66,5 @@
+ sun/nio/ch/SctpShutdown.java
+ endif
+ endif
++endif
++endif
+--- ./jdk/make/com/sun/nio/sctp/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/nio/sctp/Makefile Thu Apr 23 13:38:32 2015 -0400
+@@ -47,9 +47,13 @@
+ ifeq ($(PLATFORM), macosx)
+ include $(BUILDDIR)/common/Classes.gmk
+ endif
++ifeq ($(OS_VENDOR), OpenBSD)
++include $(BUILDDIR)/common/Classes.gmk
++endif
+
+ ifneq ($(PLATFORM), windows)
+ ifneq ($(PLATFORM), macosx)
++ifneq ($(OS_VENDOR), OpenBSD)
+ include $(BUILDDIR)/common/Mapfile-vers.gmk
+ include $(BUILDDIR)/common/Library.gmk
+
+@@ -76,6 +80,7 @@
+ #LIBSCTP = -lsctp
+ OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
+ endif
++endif # OpenBSD
+ endif # macosx
+ endif # windows
+
+--- ./jdk/make/com/sun/security/auth/module/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/security/auth/module/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
@@ -1479,8 +1477,8 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
endif
@@ -1490,8 +1488,8 @@
FILES_export = \
sun/tools/attach/BsdVirtualMachine.java
endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -39,7 +39,7 @@
LinuxVirtualMachine.c
endif
@@ -1501,8 +1499,8 @@
FILES_c = \
BsdVirtualMachine.c
endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxAttachProvider.java
endif
@@ -1512,8 +1510,8 @@
FILES_java += \
sun/tools/attach/BsdAttachProvider.java
endif
---- ./jdk/make/com/sun/tools/attach/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/com/sun/tools/attach/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/com/sun/tools/attach/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/tools/attach/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -38,7 +38,7 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
@@ -1532,8 +1530,8 @@
vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
else
vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Thu Apr 23 13:38:32 2015 -0400
@@ -30,6 +30,7 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -1543,7 +1541,7 @@
Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
Java_sun_tools_attach_BsdVirtualMachine_socket;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/Defs-bsd.gmk Sun Jan 25 08:34:16 2015 -0800
++++ ./jdk/make/common/Defs-bsd.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -0,0 +1,482 @@
+#
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2027,8 +2025,8 @@
+ OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
+ OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
+endif
---- ./jdk/make/common/Defs-linux.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/Defs-linux.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/Defs-linux.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/Defs-linux.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -426,6 +426,7 @@
override LIBDL = -ldl
override MOOT_PRIORITIES = true
@@ -2037,8 +2035,8 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs-solaris.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/Defs-solaris.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/Defs-solaris.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/Defs-solaris.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -753,6 +753,9 @@
# Network Services library
LIBNSL = -lnsl
@@ -2049,8 +2047,8 @@
# service configuration facility library
LIBSCF = -lscf
---- ./jdk/make/common/Defs.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/Defs.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/Defs.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/Defs.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -179,15 +179,15 @@
ifdef ALT_FREETYPE_LIB_PATH
@@ -2101,8 +2099,8 @@
VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
else
VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
---- ./jdk/make/common/Library.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/Library.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/Library.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/Library.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -299,8 +299,12 @@
ifeq ($(PLATFORM), solaris)
$(STRIP) -x $@
@@ -2118,8 +2116,8 @@
endif
# implied else here is no stripping at all
endif
---- ./jdk/make/common/Mapfile-vers.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/Mapfile-vers.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/Mapfile-vers.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/Mapfile-vers.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -76,7 +76,7 @@
endif # PLATFORM
@@ -2129,8 +2127,8 @@
ifeq ($(VARIANT), OPT)
# OPT build MUST have a mapfile?
---- ./jdk/make/common/Program.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/Program.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/Program.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/Program.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -95,6 +95,17 @@
endif # SYSTEM_ZLIB
endif # PLATFORM
@@ -2192,19 +2190,19 @@
ifeq ($(PLATFORM), macosx)
OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)/bin
- ifneq ($(SYSTEM_ZLIB), true)
-- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.2.8
- endif # SYSTEM_ZLIB
-else # PLATFORM !MACOSX
-+endif # PLATFORM
++endif # PLATFORM !MACOSX
+ifneq ($(SYSTEM_ZLIB), true)
- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.2.8
-endif
+endif # SYSTEM_ZLIB
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/Release.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/Release.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/Release.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -180,6 +180,12 @@
JA_DIRNAME=ja_JP.UTF-8
endif # linux
@@ -2249,8 +2247,8 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/Rules.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/Rules.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/Rules.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/Rules.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -51,7 +51,7 @@
#
# All source tree areas for java/properties files (a few may be closed)
@@ -2269,8 +2267,8 @@
# TODO(cpc): need to document why this is necessary...
$(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
@$(add-java-file)
---- ./jdk/make/common/shared/Compiler-gcc.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/shared/Compiler-gcc.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/shared/Compiler-gcc.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -72,6 +72,21 @@
endif
@@ -2294,7 +2292,7 @@
# Settings specific to Solaris
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/shared/Defs-bsd.gmk Sun Jan 25 08:34:16 2015 -0800
++++ ./jdk/make/common/shared/Defs-bsd.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -0,0 +1,267 @@
+#
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -2563,8 +2561,8 @@
+endef
+endif
+
---- ./jdk/make/common/shared/Defs-utils.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/shared/Defs-utils.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/shared/Defs-utils.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/shared/Defs-utils.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -74,6 +74,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
@@ -2615,8 +2613,8 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs-versions.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/shared/Defs-versions.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/shared/Defs-versions.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/shared/Defs-versions.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -44,6 +44,11 @@
override CC_VERSION = gcc
endif
@@ -2643,8 +2641,8 @@
# Mac specific
ifeq ($(PLATFORM), macosx)
REQUIRED_OS_NAME = Darwin
---- ./jdk/make/common/shared/Defs.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/shared/Defs.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/shared/Defs.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/shared/Defs.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -181,7 +181,7 @@
# platform and shared sources/headers. This is mainly useful for the
# Mac OS X build, which pulls its platform sources from the solaris and/or
@@ -2654,8 +2652,8 @@
define JavaSrcDirList
$(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
endef
---- ./jdk/make/common/shared/Platform.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/common/shared/Platform.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/common/shared/Platform.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/common/shared/Platform.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -298,6 +298,85 @@
# How much RAM does this machine have:
endif
@@ -2742,8 +2740,8 @@
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
---- ./jdk/make/java/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -53,7 +53,7 @@
endif
endif # PLATFORM
@@ -2753,8 +2751,8 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/instrument/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/instrument/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/instrument/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/instrument/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -104,12 +104,24 @@
# equivalent of strcasecmp is stricmp on Windows
CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -2785,8 +2783,8 @@
ifeq ($(SYSTEM_ZLIB), true)
OTHER_LDLIBS += -lz
endif
---- ./jdk/make/java/java/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/java/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/java/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/java/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -177,9 +177,11 @@
#
ifneq ($(PLATFORM), windows)
@@ -2809,8 +2807,8 @@
ARCHFLAG =
ifeq ($(ARCH_DATA_MODEL), 64)
---- ./jdk/make/java/java/genlocales.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/java/genlocales.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/java/genlocales.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/java/genlocales.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -93,17 +93,65 @@
else
@@ -2881,8 +2879,8 @@
endif
genlocales : $(LocaleDataMetaInfo_Dest)
---- ./jdk/make/java/jli/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/jli/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/jli/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/jli/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -119,9 +119,9 @@
LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
endif # PLATFORM
@@ -2904,9 +2902,9 @@
ifeq ($(USE_PTHREADS),true)
LDLIBS += -lpthread
endif # USE_PTHREADS
---- ./jdk/make/java/net/FILES_c.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/net/FILES_c.gmk Sun Jan 25 08:34:16 2015 -0800
-@@ -49,6 +49,10 @@
+--- ./jdk/make/java/net/FILES_c.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/net/FILES_c.gmk Thu Apr 23 13:38:32 2015 -0400
+@@ -50,6 +50,10 @@
FILES_c += bsd_close.c
endif
@@ -2917,8 +2915,8 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/net/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/net/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/net/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -93,7 +93,7 @@
include $(BUILDDIR)/common/Library.gmk
@@ -2928,8 +2926,8 @@
ifdef DONT_ENABLE_IPV6
OTHER_CFLAGS += -DDONT_ENABLE_IPV6
endif
---- ./jdk/make/java/nio/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/nio/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/nio/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/nio/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -263,13 +263,89 @@
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
@@ -3051,7 +3049,7 @@
vpath %.c $(call NativeSrcDirList,,native/sun/nio/fs)
vpath %.c $(call NativeSrcDirList,,native/sun/nio/ch)
-@@ -388,6 +459,9 @@
+@@ -390,6 +461,9 @@
ifeq ($(PLATFORM), macosx)
OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread -framework CoreFoundation
endif
@@ -3061,7 +3059,7 @@
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
-@@ -410,7 +484,7 @@
+@@ -412,7 +486,7 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
endif
@@ -3070,8 +3068,8 @@
FILES_m = mapfile-bsd
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/java/nio/mapfile-bsd Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/nio/mapfile-bsd Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/nio/mapfile-bsd Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/nio/mapfile-bsd Thu Apr 23 13:38:32 2015 -0400
@@ -70,6 +70,7 @@
Java_sun_nio_ch_IOUtil_drain;
Java_sun_nio_ch_IOUtil_fdVal;
@@ -3092,8 +3090,8 @@
Java_sun_nio_ch_KQueuePort_socketpair;
Java_sun_nio_ch_KQueuePort_interrupt;
Java_sun_nio_ch_KQueuePort_drain1;
---- ./jdk/make/java/npt/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/npt/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/npt/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/npt/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -74,6 +74,14 @@
OTHER_LDLIBS += -liconv
endif
@@ -3109,8 +3107,8 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/java/redist/fonts/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/java/redist/fonts/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/java/redist/fonts/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -42,7 +42,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
$(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
@@ -3138,8 +3136,8 @@
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/javax/sound/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/javax/sound/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/javax/sound/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/javax/sound/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -111,6 +111,21 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
@@ -3162,8 +3160,8 @@
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -DUSE_PORTS=TRUE \
-DUSE_DAUDIO=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/javax/sound/SoundDefs.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/javax/sound/SoundDefs.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/javax/sound/SoundDefs.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
endif # PLATFORM linux
@@ -3175,8 +3173,8 @@
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -DX_PLATFORM=X_MACOSX
endif # PLATFORM macosx
---- ./jdk/make/javax/sound/jsoundalsa/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/javax/sound/jsoundalsa/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/javax/sound/jsoundalsa/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -51,6 +51,7 @@
$(PORTFILES_c)
@@ -3227,8 +3225,8 @@
#
# Add to the ambient VPATH.
---- ./jdk/make/jpda/transport/socket/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/jpda/transport/socket/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/jpda/transport/socket/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/jpda/transport/socket/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -38,6 +38,11 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -3241,8 +3239,8 @@
ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
endif
---- ./jdk/make/sun/awt/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/sun/awt/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/sun/awt/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/sun/awt/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -127,7 +127,12 @@
OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
endif
@@ -3309,8 +3307,8 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mawt.gmk Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/sun/awt/mawt.gmk Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/sun/awt/mawt.gmk Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/sun/awt/mawt.gmk Thu Apr 23 13:38:32 2015 -0400
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
endif
@@ -3367,8 +3365,8 @@
ifeq ($(PLATFORM), macosx))
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-I$(OPENWIN_HOME)/include
---- ./jdk/make/sun/font/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/sun/font/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/sun/font/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/sun/font/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -95,7 +95,7 @@
endif # PLATFORM
@@ -3387,8 +3385,8 @@
OTHER_INCLUDES += -I$(X11_PATH)/include
OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
ifeq ($(OS_VENDOR),Apple)
---- ./jdk/make/sun/jawt/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/sun/jawt/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/sun/jawt/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/sun/jawt/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -99,8 +99,7 @@
#
# Other extra flags needed for compiling.
@@ -3416,8 +3414,8 @@
ifndef BUILD_HEADLESS_ONLY
OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
else
---- ./jdk/make/sun/rmi/rmi/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/sun/rmi/rmi/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/sun/rmi/rmi/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/sun/rmi/rmi/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -71,6 +71,9 @@
BUILD_TARGETS += bin
endif
@@ -3428,8 +3426,8 @@
build: $(BUILD_TARGETS)
---- ./jdk/make/sun/splashscreen/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/sun/splashscreen/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/sun/splashscreen/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/sun/splashscreen/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -61,6 +61,12 @@
CFLAGS += -DSPLASHSCREEN
@@ -3481,8 +3479,8 @@
OTHER_CFLAGS += $(ZLIB_CFLAGS)
OTHER_LDLIBS += $(ZLIB_LIBS)
endif
---- ./jdk/make/sun/xawt/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/sun/xawt/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/sun/xawt/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/sun/xawt/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -52,6 +52,9 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -3535,8 +3533,8 @@
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
endif
---- ./jdk/make/tools/freetypecheck/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/make/tools/freetypecheck/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/make/tools/freetypecheck/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/make/tools/freetypecheck/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -52,8 +52,15 @@
else
ifeq ($(PLATFORM), macosx)
@@ -3556,7 +3554,7 @@
endif
endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/tools/sharing/classlist.bsd Sun Jan 25 08:34:16 2015 -0800
++++ ./jdk/make/tools/sharing/classlist.bsd Thu Apr 23 13:38:32 2015 -0400
@@ -0,0 +1,2327 @@
+java/lang/Object
+java/lang/String
@@ -5885,8 +5883,8 @@
+sun/applet/AppletPanel$6
+javax/swing/BufferStrategyPaintManager$1
+# f3ac8b467e7f8c49
---- ./jdk/src/bsd/doc/man/appletviewer.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/appletviewer.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/appletviewer.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/appletviewer.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -5939,8 +5937,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/apt.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/apt.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/apt.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/apt.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -6093,8 +6091,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/extcheck.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/extcheck.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/extcheck.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/extcheck.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -6126,8 +6124,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/idlj.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/idlj.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/idlj.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/idlj.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,13 +19,13 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -6450,8 +6448,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/ja/appletviewer.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/appletviewer.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/appletviewer.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/appletviewer.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,51 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -6505,8 +6503,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/apt.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/apt.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/apt.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/apt.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,9 +19,135 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -6645,8 +6643,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/extcheck.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/extcheck.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/extcheck.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/extcheck.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,55 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -6704,8 +6702,8 @@
+jar(1)
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/idlj.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/idlj.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/idlj.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/idlj.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,720 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -7428,8 +7426,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jar.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jar.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jar.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jar.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,583 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -8015,8 +8013,8 @@
+pack200(1)
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jarsigner.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jarsigner.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jarsigner.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jarsigner.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,1655 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -9674,8 +9672,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/java.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/java.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/java.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/java.1 Thu Apr 23 13:38:32 2015 -0400
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -10316,8 +10314,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/javac.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javac.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/javac.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/javac.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,1222 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -11542,8 +11540,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/javadoc.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javadoc.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/javadoc.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/javadoc.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,4 +19,4179 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -15725,8 +15723,8 @@
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles(tools.jar)
+.RE
+
---- ./jdk/src/bsd/doc/man/ja/javah.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javah.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/javah.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/javah.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,120 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -15849,8 +15847,8 @@
+javac(1)¡¢java(1)¡¢jdb(1)¡¢javap(1)¡¢javadoc(1)
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/javap.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javap.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/javap.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/javap.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,299 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -16152,8 +16150,8 @@
+javac(1)¡¢java(1)¡¢jdb(1)¡¢javah(1)¡¢javadoc(1)
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/javaws.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javaws.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/javaws.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/javaws.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,204 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -16361,7 +16359,7 @@
+.LP
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/doc/man/ja/jcmd.1 Sun Jan 25 08:34:16 2015 -0800
++++ ./jdk/src/bsd/doc/man/ja/jcmd.1 Thu Apr 23 13:38:32 2015 -0400
@@ -0,0 +1,118 @@
+." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16481,8 +16479,8 @@
+jps(1)
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jconsole.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jconsole.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jconsole.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jconsole.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,138 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -16623,8 +16621,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jdb.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jdb.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jdb.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jdb.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,312 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -16939,8 +16937,8 @@
+javac(1)¡¢java(1)¡¢javah(1)¡¢javap(1)¡¢javadoc(1)
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jhat.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jhat.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jhat.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jhat.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,135 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -17078,8 +17076,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jinfo.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jinfo.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jinfo.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jinfo.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,148 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -17230,8 +17228,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jmap.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jmap.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jmap.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jmap.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,161 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -17395,8 +17393,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jps.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jps.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jps.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jps.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,260 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -17659,8 +17657,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jrunscript.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jrunscript.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jrunscript.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jrunscript.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,194 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -17857,8 +17855,8 @@
+http://docs.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jsadebugd.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jsadebugd.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,107 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -17968,8 +17966,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jstack.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jstack.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jstack.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jstack.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,154 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -18126,8 +18124,8 @@
+º®¹ç¥â¡¼¥É¤Î¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹(\-m¥ª¥×¥·¥ç¥ó»ÈÍÑ)¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤Ç¤Ïµ¡Ç½¤·¤Þ¤»¤ó¡£
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jstat.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jstat.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jstat.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jstat.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,5370 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -23500,8 +23498,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/jstatd.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jstatd.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/jstatd.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/jstatd.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,267 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -23771,8 +23769,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/keytool.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/keytool.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/keytool.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/keytool.1 Thu Apr 23 13:38:32 2015 -0400
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
@@ -25608,8 +25606,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/native2ascii.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/native2ascii.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/native2ascii.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/native2ascii.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,54 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -25666,8 +25664,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/orbd.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/orbd.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/orbd.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/orbd.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,350 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -26020,8 +26018,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/pack200.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/pack200.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/pack200.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/pack200.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,344 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -26368,8 +26366,8 @@
+JDK¤ËÉÕ°¤¹¤ëJava SE API»ÅÍͤȤÎÁê°ã¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢»ÅÍͤòÍ¥À褷¤Æ¤¯¤À¤µ¤¤¡£
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/policytool.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/policytool.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/policytool.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/policytool.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,102 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -26474,8 +26472,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/rmic.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/rmic.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/rmic.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/rmic.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,209 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -26687,8 +26685,8 @@
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/rmid.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/rmid.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/rmid.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/rmid.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,310 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -27001,8 +26999,8 @@
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath¡¢java(1)
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/rmiregistry.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/rmiregistry.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,65 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -27070,8 +27068,8 @@
+\f2java.rmi.Naming\fP @
+.fi
+http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html
---- ./jdk/src/bsd/doc/man/ja/schemagen.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/schemagen.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/schemagen.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/schemagen.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,109 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -27183,8 +27181,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/serialver.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/serialver.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/serialver.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/serialver.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,79 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -27266,8 +27264,8 @@
+http://docs.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/servertool.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/servertool.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/servertool.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/servertool.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,95 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -27365,8 +27363,8 @@
+.SH "´ØÏ¢¹àÌÜ"
+.LP
+orbd(1)
---- ./jdk/src/bsd/doc/man/ja/tnameserv.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/tnameserv.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/tnameserv.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/tnameserv.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,476 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -27845,8 +27843,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/unpack200.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/unpack200.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/unpack200.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/unpack200.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,6 +19,160 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -28009,8 +28007,8 @@
+JDK¤ËÉÕ°¤¹¤ëJava SE API»ÅÍͤȤÎÁê°ã¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢»ÅÍͤòÍ¥À褷¤Æ¤¯¤À¤µ¤¤¡£
+.LP
+
---- ./jdk/src/bsd/doc/man/ja/wsgen.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/wsgen.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/wsgen.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/wsgen.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,4 +19,638 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -28651,8 +28649,8 @@
+SOAP 1.2 WSDL¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
+.LP
+¥µ¡¼¥Ó¥¹¤ò¥Ç¥×¥í¥¤¤¹¤ë¤È¤­¤ËJAXWS¥é¥ó¥¿¥¤¥à¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤ËWSDL¤¬À¸À®¤µ¤ì¤ë¤¿¤á¡¢³«È¯»þ¤ËWSDL¤òÀ¸À®¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
---- ./jdk/src/bsd/doc/man/ja/wsimport.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/wsimport.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/wsimport.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/wsimport.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,4 +19,1048 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -29703,8 +29701,8 @@
+Java¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¡¢\f2http://stockquote.example.com/quote?wsdl\fP¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Æ¤½¤ÎJava¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹
+.br
+
---- ./jdk/src/bsd/doc/man/ja/xjc.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/ja/xjc.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/ja/xjc.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/ja/xjc.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,279 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -29987,8 +29985,8 @@
+
+.LP
+
---- ./jdk/src/bsd/doc/man/jar.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jar.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jar.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jar.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,31 +19,31 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -30437,8 +30435,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/javac.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/javac.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/javac.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/javac.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -31320,8 +31318,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/javadoc.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/javadoc.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/javadoc.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/javadoc.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -34636,8 +34634,8 @@
.RE
-
+
---- ./jdk/src/bsd/doc/man/javah.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/javah.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/javah.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/javah.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -34748,8 +34746,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/javap.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/javap.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/javap.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/javap.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -34981,8 +34979,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/javaws.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/javaws.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/javaws.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/javaws.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -35017,8 +35015,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jconsole.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jconsole.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jconsole.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jconsole.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -35136,8 +35134,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jdb.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jdb.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jdb.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jdb.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -35471,8 +35469,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jhat.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jhat.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jhat.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jhat.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -35607,8 +35605,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jinfo.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jinfo.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jinfo.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jinfo.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -35744,8 +35742,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jmap.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jmap.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jmap.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jmap.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -35881,8 +35879,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jps.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jps.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jps.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jps.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -35998,8 +35996,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jrunscript.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jrunscript.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jrunscript.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jrunscript.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -36146,8 +36144,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jsadebugd.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jsadebugd.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jsadebugd.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jsadebugd.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -36226,8 +36224,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jstack.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jstack.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jstack.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jstack.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -36337,8 +36335,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jstat.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jstat.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jstat.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jstat.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -37948,8 +37946,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/jstatd.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/jstatd.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/jstatd.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/jstatd.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -38072,8 +38070,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/keytool.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/keytool.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/keytool.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/keytool.1 Thu Apr 23 13:38:32 2015 -0400
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
@@ -39321,8 +39319,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/native2ascii.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/native2ascii.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/native2ascii.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/native2ascii.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -39363,8 +39361,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/orbd.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/orbd.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/orbd.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/orbd.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -39598,8 +39596,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/pack200.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/pack200.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/pack200.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/pack200.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -39764,8 +39762,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/policytool.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/policytool.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/policytool.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/policytool.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,71 +19,86 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -39883,8 +39881,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/rmic.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/rmic.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/rmic.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/rmic.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -40093,8 +40091,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/rmid.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/rmid.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/rmid.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/rmid.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -40374,8 +40372,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/rmiregistry.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/rmiregistry.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/rmiregistry.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/rmiregistry.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,14 +19,14 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -40418,8 +40416,8 @@
.fi
-http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html
+http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html
---- ./jdk/src/bsd/doc/man/schemagen.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/schemagen.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/schemagen.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/schemagen.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -40486,8 +40484,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/serialver.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/serialver.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/serialver.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/serialver.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -40547,8 +40545,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/servertool.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/servertool.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/servertool.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/servertool.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,13 +19,13 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -40656,8 +40654,8 @@
.LP
-orbd(1)
+orbd(1)
---- ./jdk/src/bsd/doc/man/tnameserv.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/tnameserv.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/tnameserv.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/tnameserv.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,18 +19,18 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -40928,8 +40926,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/unpack200.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/unpack200.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/unpack200.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/unpack200.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -40996,8 +40994,8 @@
.LP
-
+
---- ./jdk/src/bsd/doc/man/wsgen.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/wsgen.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/wsgen.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/wsgen.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -41213,8 +41211,8 @@
.LP
-Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service.
+Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service.
---- ./jdk/src/bsd/doc/man/wsimport.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/wsimport.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/wsimport.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/wsimport.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -41511,8 +41509,8 @@
.br
-
+
---- ./jdk/src/bsd/doc/man/xjc.1 Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/bsd/doc/man/xjc.1 Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/bsd/doc/man/xjc.1 Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/bsd/doc/man/xjc.1 Thu Apr 23 13:38:32 2015 -0400
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
@@ -41781,8 +41779,8 @@
.LP
-
+
---- ./jdk/src/share/classes/java/util/TimeZone.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/java/util/TimeZone.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/java/util/TimeZone.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/java/util/TimeZone.java Thu Apr 23 13:38:32 2015 -0400
@@ -917,15 +917,13 @@
}
int gmtOffset = (hours * 60 + num) * 60 * 1000;
@@ -41800,8 +41798,8 @@
}
return zi;
}
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Thu Apr 23 13:38:32 2015 -0400
@@ -1146,7 +1146,7 @@
*/
HashMap<String, Boolean> existsMap;
@@ -41811,8 +41809,8 @@
return false;
} else if (existsMap == null) {
existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java Thu Apr 23 13:38:32 2015 -0400
@@ -39,6 +39,7 @@
WINDOWS,
LINUX,
@@ -41832,8 +41830,8 @@
if (osName.contains("OS X")) {
return MACOSX;
}
---- ./jdk/src/share/classes/sun/font/FontUtilities.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java Thu Apr 23 13:38:32 2015 -0400
@@ -48,6 +48,8 @@
public static boolean isLinux;
@@ -41855,8 +41853,8 @@
isMacOSX = osName.contains("OS X"); // TODO: MacOSX
String t2kStr = System.getProperty("sun.java2d.font.scaler");
---- ./jdk/src/share/classes/sun/font/SunFontManager.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java Thu Apr 23 13:38:32 2015 -0400
@@ -418,7 +418,7 @@
* registerFonts method as on-screen these JRE fonts
* always go through the T2K rasteriser.
@@ -41866,8 +41864,8 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Thu Apr 23 13:38:32 2015 -0400
@@ -1568,7 +1568,7 @@
}
@@ -41877,8 +41875,8 @@
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Thu Apr 23 13:38:32 2015 -0400
@@ -83,7 +83,8 @@
String osname = System.getProperty("os.name");
if (osname.startsWith("SunOS")) {
@@ -41889,16 +41887,16 @@
gssLibs = new String[]{
"libgssapi.so",
"libgssapi_krb5.so",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Thu Apr 23 13:38:32 2015 -0400
@@ -30,4 +30,5 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[bsd]sun.tools.attach.BsdAttachProvider
#[macosx]sun.tools.attach.BsdAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/Main.java Thu Apr 23 13:38:32 2015 -0400
@@ -51,6 +51,7 @@
String zname = "";
String[] files;
@@ -41907,7 +41905,7 @@
// An entryName(path)->File map generated during "expand", it helps to
// decide whether or not an existing entry in a jar file needs to be
-@@ -867,6 +868,19 @@
+@@ -914,6 +915,19 @@
* Extracts specified entries from JAR file.
*/
void extract(InputStream in, String files[]) throws IOException {
@@ -41927,7 +41925,7 @@
ZipInputStream zis = new ZipInputStream(in);
ZipEntry e;
// Set of all directory entries specified in archive. Disallows
-@@ -897,6 +911,19 @@
+@@ -944,6 +958,19 @@
* Extracts specified entries from JAR file, via ZipFile.
*/
void extract(String fname, String files[]) throws IOException {
@@ -41947,18 +41945,7 @@
ZipFile zf = new ZipFile(fname);
Set<ZipEntry> dirs = newDirSet();
Enumeration<? extends ZipEntry> zes = zf.entries();
-@@ -928,6 +955,10 @@
- ZipEntry rc = null;
- String name = e.getName();
- File f = new File(e.getName().replace('/', File.separatorChar));
-+ if (!f.getCanonicalPath().startsWith(cwd)) {
-+ output(formatMsg("out.ignore.entry", name));
-+ return null;
-+ }
- if (e.isDirectory()) {
- if (f.exists()) {
- if (!f.isDirectory()) {
-@@ -949,6 +980,10 @@
+@@ -1003,6 +1030,10 @@
} else {
if (f.getParent() != null) {
File d = new File(f.getParent());
@@ -41969,8 +41956,8 @@
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties Thu Apr 23 13:38:32 2015 -0400
@@ -44,6 +44,8 @@
{0} : could not create directory
error.incorrect.length=\
@@ -41980,8 +41967,8 @@
out.added.manifest=\
added manifest
out.update.manifest=\
---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Thu Apr 23 13:38:32 2015 -0400
@@ -38,6 +38,7 @@
# gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
# gnumake JDK=<java_home> OSNAME=linux [OPT=true]
@@ -42020,8 +42007,8 @@
# Common -I options
CFLAGS += -I.
CFLAGS += -I../agent_util
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Thu Apr 23 13:38:32 2015 -0400
@@ -33,6 +33,10 @@
#include <stdlib.h>
@@ -42042,8 +42029,8 @@
#define SWAP_BYTES(a) \
((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
#else
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h Thu Apr 23 13:38:32 2015 -0400
@@ -64,7 +64,7 @@
@@ -42053,8 +42040,8 @@
#include <sys/types.h>
#endif
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Thu Apr 23 13:38:32 2015 -0400
@@ -24,6 +24,9 @@
* questions.
*/
@@ -42078,8 +42065,8 @@
#ifdef __NEWVALID /* special setup for Sun test regime */
#if defined(i386) || defined(i486) || \
defined(intel) || defined(x86) || defined(arm) || \
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Thu Apr 23 13:38:32 2015 -0400
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -42119,8 +42106,8 @@
#endif /* _NO_LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Thu Apr 23 13:38:32 2015 -0400
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -42160,8 +42147,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Thu Apr 23 13:38:32 2015 -0400
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -42201,8 +42188,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Thu Apr 23 13:38:32 2015 -0400
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -42242,8 +42229,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Thu Apr 23 13:38:32 2015 -0400
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -42283,8 +42270,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Thu Apr 23 13:38:32 2015 -0400
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -42324,8 +42311,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Thu Apr 23 13:38:32 2015 -0400
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -42365,8 +42352,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Thu Apr 23 13:38:32 2015 -0400
@@ -95,7 +95,7 @@
dst = dp[0];
if (ld_offset + size < 32) {
@@ -42586,8 +42573,8 @@
}
#else /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Thu Apr 23 13:38:32 2015 -0400
@@ -168,7 +168,7 @@
}
@@ -42868,8 +42855,8 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Thu Apr 23 13:38:32 2015 -0400
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -43021,8 +43008,8 @@
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Thu Apr 23 13:38:32 2015 -0400
@@ -30,7 +30,7 @@
typedef union {
mlib_d64 db;
@@ -43032,8 +43019,8 @@
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Thu Apr 23 13:38:32 2015 -0400
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
src0 = src1;
@@ -43132,8 +43119,8 @@
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Thu Apr 23 13:38:32 2015 -0400
@@ -120,7 +120,7 @@
} \
}
@@ -44366,8 +44353,8 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Thu Apr 23 13:38:32 2015 -0400
@@ -27,9 +27,21 @@
#ifndef MLIB_IMAGE_H
#define MLIB_IMAGE_H
@@ -44391,8 +44378,8 @@
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Thu Apr 23 13:38:32 2015 -0400
@@ -26,7 +26,7 @@
#include <stdlib.h>
@@ -44414,8 +44401,8 @@
return valloc(size);
#else
return (void *) memalign(8, size);
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h Thu Apr 23 13:38:32 2015 -0400
@@ -59,7 +59,7 @@
#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
@@ -44425,8 +44412,8 @@
#include <stddef.h> /* for ptrdiff_t */
#include <stdint.h> /* for uintptr_t */
#elif defined(__linux__)
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h Thu Apr 23 13:38:32 2015 -0400
@@ -26,7 +26,7 @@
#ifndef OGLFuncs_h_Included
#define OGLFuncs_h_Included
@@ -44436,8 +44423,8 @@
#include <dlfcn.h>
#endif
#include "jni.h"
---- ./jdk/src/solaris/back/util_md.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/back/util_md.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/back/util_md.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/back/util_md.h Thu Apr 23 13:38:32 2015 -0400
@@ -51,7 +51,7 @@
/* On little endian machines, convert java big endian numbers. */
@@ -44447,8 +44434,8 @@
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/bin/ergo.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/bin/ergo.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/bin/ergo.c Thu Apr 23 13:38:32 2015 -0400
@@ -100,6 +100,27 @@
/* Compute physical memory by asking the OS */
uint64_t
@@ -44483,8 +44470,8 @@
return result;
+#endif
}
---- ./jdk/src/solaris/bin/ergo.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/bin/ergo.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/bin/ergo.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/bin/ergo.h Thu Apr 23 13:38:32 2015 -0400
@@ -33,6 +33,10 @@
#include <sys/stat.h>
#include <unistd.h>
@@ -44496,8 +44483,8 @@
#include "java.h"
---- ./jdk/src/solaris/bin/ergo_i586.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/bin/ergo_i586.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/bin/ergo_i586.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/bin/ergo_i586.c Thu Apr 23 13:38:32 2015 -0400
@@ -106,7 +106,7 @@
#endif /* __solaris__ */
@@ -44556,8 +44543,8 @@
return result;
+#endif
}
---- ./jdk/src/solaris/bin/java_md_solinux.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/bin/java_md_solinux.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/bin/java_md_solinux.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/bin/java_md_solinux.c Thu Apr 23 13:38:32 2015 -0400
@@ -899,8 +899,9 @@
* onwards the filename returned in DL_info structure from dladdr is
* an absolute pathname so technically realpath isn't required.
@@ -44614,8 +44601,8 @@
/* --- Splash Screen shared library support --- */
static const char* SPLASHSCREEN_SO = JNI_LIB_NAME("splashscreen");
static void* hSplashLib = NULL;
---- ./jdk/src/solaris/bin/java_md_solinux.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/bin/java_md_solinux.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/bin/java_md_solinux.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/bin/java_md_solinux.h Thu Apr 23 13:38:32 2015 -0400
@@ -33,6 +33,10 @@
#include <sys/time.h>
#define CounterGet() (gethrtime()/1000)
@@ -44637,9 +44624,9 @@
#else /* Solaris */
static const char *system_dir = "/usr/jdk";
static const char *user_dir = "/jdk";
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Sun Jan 25 08:34:16 2015 -0800
-@@ -94,7 +94,14 @@
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Thu Apr 23 13:38:32 2015 -0400
+@@ -95,7 +95,14 @@
public LaunchMechanism run() {
String javahome = System.getProperty("java.home");
@@ -44655,8 +44642,8 @@
String s = System.getProperty(
"jdk.lang.Process.launchMechanism", "posix_spawn");
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Thu Apr 23 13:38:32 2015 -0400
@@ -213,7 +213,7 @@
if (fontID != null) {
fileName = (String)fontNameMap.get(fontID);
@@ -44684,8 +44671,8 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/net/PortConfig.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/classes/sun/net/PortConfig.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Thu Apr 23 13:38:32 2015 -0400
@@ -52,7 +52,7 @@
} else if (os.startsWith("SunOS")) {
defaultLower = 32768;
@@ -44695,8 +44682,8 @@
defaultLower = 49152;
defaultUpper = 65535;
} else {
---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Thu Apr 23 13:38:32 2015 -0400
@@ -50,7 +50,7 @@
return new SolarisAsynchronousChannelProvider();
if (osname.equals("Linux"))
@@ -44706,8 +44693,8 @@
return new BsdAsynchronousChannelProvider();
throw new InternalError("platform not recognized");
}
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Thu Apr 23 13:38:32 2015 -0400
@@ -70,6 +70,8 @@
return createProvider("sun.nio.fs.LinuxFileSystemProvider");
if (osname.equals("Darwin") || osname.contains("OS X"))
@@ -44717,8 +44704,8 @@
throw new AssertionError("Platform not recognized");
}
}
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Thu Apr 23 13:38:32 2015 -0400
@@ -129,6 +129,7 @@
static boolean isBSD() {
@@ -44727,8 +44714,8 @@
osname.contains("OS X"));
}
---- ./jdk/src/solaris/javavm/export/jvm_md.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/javavm/export/jvm_md.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/javavm/export/jvm_md.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/javavm/export/jvm_md.h Thu Apr 23 13:38:32 2015 -0400
@@ -75,7 +75,11 @@
#define JVM_O_O_APPEND O_APPEND
#define JVM_O_EXCL O_EXCL
@@ -44741,8 +44728,8 @@
/* Signals */
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c Thu Apr 23 13:38:32 2015 -0400
@@ -168,6 +168,9 @@
/*
* XXXBSD: there's no way available to get swap info in
@@ -44792,8 +44779,8 @@
*/
// throw_internal_error(env, "Unimplemented in FreeBSD");
return (100);
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c Thu Apr 23 13:38:32 2015 -0400
@@ -151,7 +151,6 @@
return rv;
}
@@ -44802,8 +44789,8 @@
JNIEXPORT jboolean JNICALL
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c Thu Apr 23 13:38:32 2015 -0400
@@ -56,7 +56,7 @@
for (i = 0; environ[i]; i++) {
@@ -44822,8 +44809,8 @@
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/childproc.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/lang/childproc.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/lang/childproc.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/lang/childproc.c Thu Apr 23 13:38:32 2015 -0400
@@ -62,6 +62,16 @@
return c >= '0' && c <= '9';
}
@@ -44849,8 +44836,8 @@
int
moveDescriptor(int fd_from, int fd_to)
---- ./jdk/src/solaris/native/java/lang/java_props_md.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c Thu Apr 23 13:38:32 2015 -0400
@@ -151,7 +151,7 @@
lc = setlocale(cat, NULL);
#endif
@@ -44880,8 +44867,8 @@
} else {
sprops.language = "en";
sprops.encoding = "ISO8859-1";
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Thu Apr 23 13:38:32 2015 -0400
@@ -60,14 +60,19 @@
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -44936,8 +44923,8 @@
return 0;
}
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Thu Apr 23 13:38:32 2015 -0400
@@ -23,12 +23,12 @@
* questions.
*/
@@ -44975,8 +44962,8 @@
len = sizeof(struct sockaddr_in);
}
JVM_Connect(fd, (struct sockaddr *)&addr, len);
---- ./jdk/src/solaris/native/java/net/bsd_close.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/net/bsd_close.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/net/bsd_close.c Thu Apr 23 13:38:32 2015 -0400
@@ -345,6 +345,76 @@
* signal other than our wakeup signal.
*/
@@ -45060,8 +45047,8 @@
}
+#endif
}
---- ./jdk/src/solaris/native/java/net/net_util_md.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/net/net_util_md.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.c Thu Apr 23 13:38:32 2015 -0400
@@ -45,6 +45,10 @@
#endif
#endif
@@ -45073,7 +45060,7 @@
#ifdef __solaris__
#include <sys/sockio.h>
#include <stropts.h>
-@@ -1512,7 +1516,22 @@
+@@ -1520,7 +1524,22 @@
}
}
@@ -45097,8 +45084,8 @@
return setsockopt(fd, level, opt, arg, len);
}
---- ./jdk/src/solaris/native/java/net/net_util_md.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/net/net_util_md.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.h Thu Apr 23 13:38:32 2015 -0400
@@ -37,7 +37,7 @@
#endif
@@ -45108,8 +45095,8 @@
extern int NET_Timeout(int s, long timeout);
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Thu Apr 23 13:38:32 2015 -0400
@@ -123,7 +123,7 @@
return NULL;
}
@@ -45143,8 +45130,8 @@
}
-#endif /* MACOSX */
+#endif /* _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Thu Apr 23 13:38:32 2015 -0400
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
altstyle = "roman";
@@ -45154,8 +45141,8 @@
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Thu Apr 23 13:38:32 2015 -0400
@@ -123,7 +123,7 @@
*/
@@ -45215,8 +45202,8 @@
#endif /* HEADLESS */
return point;
}
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Thu Apr 23 13:38:32 2015 -0400
@@ -67,7 +67,7 @@
XIMPreeditDrawCallbackStruct *);
static void PreeditCaretCallback(XIC, XPointer,
@@ -45456,8 +45443,8 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
#include "wsutils.h"
#include "list.h"
@@ -45467,9 +45454,9 @@
#include <sys/socket.h>
#endif
---- ./jdk/src/solaris/native/sun/awt/awt_util.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h Sun Jan 25 08:34:16 2015 -0800
-@@ -185,7 +185,7 @@
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h Thu Apr 23 13:38:32 2015 -0400
+@@ -187,7 +187,7 @@
#ifdef __solaris__
extern Widget awt_util_getXICStatusAreaWindow(Widget w);
#else
@@ -45478,7 +45465,7 @@
int32_t awt_util_getIMStatusHeight(Widget vw);
Widget awt_util_getXICStatusAreaWindow(Widget w);
#else
-@@ -198,7 +198,7 @@
+@@ -200,7 +200,7 @@
@@ -45487,8 +45474,8 @@
typedef struct _XmImRefRec {
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c Thu Apr 23 13:38:32 2015 -0400
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -45586,8 +45573,8 @@
awt_wmgr = OPENLOOK_WM;
}
else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h Thu Apr 23 13:38:32 2015 -0400
@@ -45,7 +45,10 @@
KDE2_WM,
SAWFISH_WM,
@@ -45600,8 +45587,8 @@
};
extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/extutil.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/extutil.h Thu Apr 23 13:38:32 2015 -0400
@@ -58,7 +58,7 @@
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -45617,8 +45604,8 @@
-#endif /* __linux__ || MACOSX */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c Thu Apr 23 13:38:32 2015 -0400
@@ -23,7 +23,7 @@
* questions.
*/
@@ -45696,8 +45683,8 @@
}
#endif
#endif /* !HEADLESS */
---- ./jdk/src/solaris/native/sun/awt/robot_common.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/awt/robot_common.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/awt/robot_common.c Thu Apr 23 13:38:32 2015 -0400
@@ -27,7 +27,7 @@
#error This file should not be included in headless library
#endif
@@ -45707,8 +45694,8 @@
#include <stdlib.h>
#endif
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Thu Apr 23 13:38:32 2015 -0400
@@ -28,9 +28,9 @@
#include <sys/types.h>
@@ -45721,8 +45708,8 @@
#include <stdint.h>
#endif /* __linux__ || MACOSX */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Thu Apr 23 13:38:32 2015 -0400
@@ -804,7 +804,7 @@
static int initialized;
static int usevis = JNI_TRUE;
@@ -45732,8 +45719,8 @@
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- ./jdk/src/solaris/native/sun/net/portconfig.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/net/portconfig.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/net/portconfig.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/net/portconfig.c Thu Apr 23 13:38:32 2015 -0400
@@ -66,6 +66,24 @@
range->higher = net_getParam("/dev/tcp", "tcp_largest_anon_port");
return 0;
@@ -45759,9 +45746,9 @@
#elif defined(_ALLBSD_SOURCE)
{
int ret;
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c Sun Jan 25 08:34:16 2015 -0800
-@@ -201,7 +201,7 @@
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c Thu Apr 23 13:38:32 2015 -0400
+@@ -204,7 +204,7 @@
return IOS_THROWN;
}
return result;
@@ -45770,7 +45757,7 @@
off_t numBytes;
int result;
-@@ -209,6 +209,8 @@
+@@ -212,6 +212,8 @@
#ifdef __APPLE__
result = sendfile(srcFD, dstFD, position, &numBytes, NULL, 0);
@@ -45779,8 +45766,8 @@
#endif
if (numBytes > 0)
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c Thu Apr 23 13:38:32 2015 -0400
@@ -227,6 +227,21 @@
fl.l_start = (off64_t)pos;
fl.l_type = F_UNLCK;
@@ -45803,8 +45790,8 @@
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
---- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c Thu Apr 23 13:38:32 2015 -0400
@@ -33,12 +33,19 @@
#include "nio_util.h"
@@ -45853,8 +45840,8 @@
if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h Thu Apr 23 13:38:32 2015 -0400
@@ -320,8 +320,20 @@
typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
@@ -45894,8 +45881,8 @@
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c Thu Apr 23 13:38:32 2015 -0400
@@ -58,6 +58,7 @@
*/
jboolean loadSocketExtensionFuncs
@@ -45912,8 +45899,8 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Thu Apr 23 13:38:32 2015 -0400
@@ -33,6 +33,11 @@
#include "j2secmod.h"
@@ -45924,7 +45911,7 @@
+#endif
+
void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
- void *hModule = (void*)jHandle;
+ void *hModule = (void*)jlong_to_ptr(jHandle);
void *fAddress = dlsym(hModule, functionName);
@@ -50,7 +55,11 @@
{
@@ -45937,7 +45924,7 @@
+#endif
dprintf2("-handle for %s: %u\n", libName, hModule);
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
- return (jlong)hModule;
+ return ptr_to_jlong(hModule);
@@ -64,6 +73,9 @@
dprintf1("-lib %s\n", libName);
@@ -45948,8 +45935,8 @@
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Thu Apr 23 13:38:32 2015 -0400
@@ -867,7 +867,7 @@
{
KeySym originalKeysym = *keysym;
@@ -45959,8 +45946,8 @@
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/test/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -79,6 +79,11 @@
endif
OS_VERSION := $(shell $(UNAME) -r)
@@ -45973,8 +45960,8 @@
ifeq ($(UNAME_S), Darwin)
OS_NAME = macosx
OS_ARCH := $(shell $(UNAME) -m)
---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Thu Apr 23 13:38:32 2015 -0400
@@ -48,7 +48,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -45984,8 +45971,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -45995,8 +45982,8 @@
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/jdi/JITDebug.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/jdi/JITDebug.sh Thu Apr 23 13:38:32 2015 -0400
@@ -63,7 +63,7 @@
OS=`uname -s`
export TRANSPORT_METHOD
@@ -46006,8 +45993,8 @@
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -123,7 +123,7 @@
esac
libloc=${jreloc}/lib/${libarch}
@@ -46017,8 +46004,8 @@
xx=`find ${jreloc}/lib -name libdt_socket.so`
libloc=`dirname ${xx}`
;;
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Thu Apr 23 13:38:32 2015 -0400
@@ -293,7 +293,7 @@
psCmd=ps
jstack=jstack.exe
@@ -46028,8 +46015,8 @@
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh Thu Apr 23 13:38:32 2015 -0400
@@ -112,7 +112,7 @@
fi
;;
@@ -46039,8 +46026,8 @@
pass "This test always passes on $OS"
;;
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Thu Apr 23 13:38:32 2015 -0400
@@ -45,7 +45,7 @@
OS=`uname -s`
@@ -46050,8 +46037,8 @@
PS=":"
;;
Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Thu Apr 23 13:38:32 2015 -0400
@@ -72,6 +72,16 @@
done
}
@@ -46079,8 +46066,8 @@
Darwin )
# $ sysctl -n vm.swapusage
# total = 8192.00M used = 7471.11M free = 720.89M (encrypted)
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Thu Apr 23 13:38:32 2015 -0400
@@ -48,7 +48,7 @@
# Test GetMaxFileDescriptorCount if we are running on Unix
@@ -46090,8 +46077,8 @@
runOne GetMaxFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Thu Apr 23 13:38:32 2015 -0400
@@ -48,7 +48,7 @@
# Test GetOpenFileDescriptorCount if we are running on Unix
@@ -46101,8 +46088,8 @@
runOne GetOpenFileDescriptorCount
;;
* )
---- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java Thu Apr 23 13:38:32 2015 -0400
@@ -50,8 +50,8 @@
public static void main(String[] args) {
@@ -46114,8 +46101,8 @@
return;
}
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh Thu Apr 23 13:38:32 2015 -0400
@@ -25,10 +25,11 @@
fi
@@ -46132,8 +46119,8 @@
# Windows
if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/io/File/GetXSpace.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/io/File/GetXSpace.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/io/File/GetXSpace.sh Thu Apr 23 13:38:32 2015 -0400
@@ -26,7 +26,7 @@
# set platform-dependent variable
OS=`uname -s`
@@ -46143,8 +46130,8 @@
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./jdk/test/java/io/FileOutputStream/ManyFiles.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/io/FileOutputStream/ManyFiles.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java Thu Apr 23 13:38:32 2015 -0400
@@ -43,7 +43,7 @@
// Windows capability it is much simpler to only run it
// on that platform.
@@ -46154,8 +46141,8 @@
return;
for (int n = 0; n < NUM_FILES; n++) {
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Thu Apr 23 13:38:32 2015 -0400
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
# operating system.
@@ -46165,8 +46152,8 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Thu Apr 23 13:38:32 2015 -0400
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46176,8 +46163,8 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Thu Apr 23 13:38:32 2015 -0400
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46187,8 +46174,8 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/lang/ClassLoader/Assert.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/lang/ClassLoader/Assert.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/lang/ClassLoader/Assert.sh Thu Apr 23 13:38:32 2015 -0400
@@ -25,7 +25,7 @@
OS=`uname -s`
@@ -46198,8 +46185,8 @@
FS="/"
CHMOD="${FS}bin${FS}chmod"
;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Thu Apr 23 13:38:32 2015 -0400
@@ -45,13 +45,7 @@
# set platform-specific variables
OS=`uname -s`
@@ -46215,8 +46202,8 @@
FS="/"
;;
Windows*)
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Thu Apr 23 13:38:32 2015 -0400
@@ -49,13 +49,7 @@
# set platform-specific variables
OS=`uname -s`
@@ -46232,8 +46219,8 @@
FS="/"
;;
Windows* | CYGWIN* )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Thu Apr 23 13:38:32 2015 -0400
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46243,8 +46230,8 @@
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Thu Apr 23 13:38:32 2015 -0400
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46254,8 +46241,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Thu Apr 23 13:38:32 2015 -0400
@@ -49,7 +49,7 @@
OS=`uname -s`
@@ -46265,8 +46252,8 @@
PATHSEP=":"
;;
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Thu Apr 23 13:38:32 2015 -0400
@@ -35,15 +35,7 @@
OS=`uname -s`
@@ -46284,8 +46271,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Thu Apr 23 13:38:32 2015 -0400
@@ -61,7 +61,7 @@
while true; do
echo "Run $i: TestSystemLoadAvg"
@@ -46295,8 +46282,8 @@
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/Authenticator/B4933582.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/Authenticator/B4933582.sh Thu Apr 23 13:38:32 2015 -0400
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -46306,8 +46293,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Thu Apr 23 13:38:32 2015 -0400
@@ -45,6 +45,8 @@
return (true);
if (p.getProperty ("os.name").equals ("Linux"))
@@ -46317,8 +46304,8 @@
if (p.getProperty ("os.name").startsWith ("Mac OS"))
return (true);
// Check for specific Solaris version from here
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Thu Apr 23 13:38:32 2015 -0400
@@ -27,11 +27,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46332,8 +46319,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Thu Apr 23 13:38:32 2015 -0400
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -46343,8 +46330,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/URL/B5086147.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/URL/B5086147.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/URL/B5086147.sh Thu Apr 23 13:38:32 2015 -0400
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -46354,8 +46341,8 @@
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/URL/runconstructor.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/URL/runconstructor.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/URL/runconstructor.sh Thu Apr 23 13:38:32 2015 -0400
@@ -27,7 +27,7 @@
#
OS=`uname -s`
@@ -46365,8 +46352,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Thu Apr 23 13:38:32 2015 -0400
@@ -34,11 +34,7 @@
OS=`uname -s`
@@ -46380,8 +46367,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Thu Apr 23 13:38:32 2015 -0400
@@ -27,11 +27,7 @@
OS=`uname -s`
@@ -46395,8 +46382,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh Thu Apr 23 13:38:32 2015 -0400
@@ -33,11 +33,7 @@
OS=`uname -s`
@@ -46410,8 +46397,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile Thu Apr 23 13:38:32 2015 -0400
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
endif
@@ -46461,8 +46448,8 @@
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh Thu Apr 23 13:38:32 2015 -0400
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -46531,8 +46518,8 @@
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/charset/Charset/default.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/nio/charset/Charset/default.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/nio/charset/Charset/default.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/nio/charset/Charset/default.sh Thu Apr 23 13:38:32 2015 -0400
@@ -41,10 +41,14 @@
fi
@@ -46552,8 +46539,8 @@
JAVA=$TESTJAVA/bin/java
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Thu Apr 23 13:38:32 2015 -0400
@@ -34,7 +34,7 @@
OS=`uname -s`
@@ -46563,8 +46550,8 @@
# Skip locale test for Windows
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/nio/charset/spi/basic.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/nio/charset/spi/basic.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/nio/charset/spi/basic.sh Thu Apr 23 13:38:32 2015 -0400
@@ -70,10 +70,14 @@
L="$1"
shift
@@ -46593,8 +46580,8 @@
Windows* ) CPS=';' ;;
*) echo "Unknown platform: `uname`"; exit 1 ;;
esac
---- ./jdk/test/java/nio/file/FileSystem/Basic.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/nio/file/FileSystem/Basic.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/nio/file/FileSystem/Basic.java Thu Apr 23 13:38:32 2015 -0400
@@ -76,6 +76,8 @@
checkSupported(fs, "posix", "unix", "owner", "acl", "user");
if (os.equals("Linux"))
@@ -46604,8 +46591,8 @@
if (os.contains("OS X"))
checkSupported(fs, "posix", "unix", "owner");
if (os.equals("Windows"))
---- ./jdk/test/java/nio/file/Files/CopyAndMove.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Thu Apr 23 13:38:32 2015 -0400
@@ -634,7 +634,7 @@
// check POSIX attributes are copied
@@ -46624,8 +46611,8 @@
boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
if (isUnix) {
---- ./jdk/test/java/rmi/registry/readTest/readTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -34,7 +34,7 @@
REGARGS=""
@@ -46635,8 +46622,8 @@
PS=":"
FS="/"
CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh Thu Apr 23 13:38:32 2015 -0400
@@ -84,14 +84,12 @@
@@ -46656,8 +46643,8 @@
export PATH_SEP
mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,15 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46675,8 +46662,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Thu Apr 23 13:38:32 2015 -0400
@@ -34,15 +34,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46694,8 +46681,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Thu Apr 23 13:38:32 2015 -0400
@@ -50,19 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46717,8 +46704,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,15 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46736,8 +46723,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,15 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46755,8 +46742,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46766,8 +46753,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -58,7 +58,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46777,8 +46764,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Thu Apr 23 13:38:32 2015 -0400
@@ -31,7 +31,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46788,8 +46775,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -72,10 +72,10 @@
Windows* | CYGWIN* )
DEL=";"
@@ -46803,8 +46790,8 @@
DEL=":"
HAS_S=YES
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/java/util/ServiceLoader/basic.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/java/util/ServiceLoader/basic.sh Thu Apr 23 13:38:32 2015 -0400
@@ -42,9 +42,7 @@
OS=`uname -s`
@@ -46816,8 +46803,8 @@
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -51,7 +51,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46827,8 +46814,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Thu Apr 23 13:38:32 2015 -0400
@@ -84,7 +84,7 @@
TMP="/tmp"
;;
@@ -46853,8 +46840,8 @@
Windows* )
VAR="A different value for Win32"
DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
---- ./jdk/test/javax/script/CommonSetup.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/javax/script/CommonSetup.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/javax/script/CommonSetup.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/javax/script/CommonSetup.sh Thu Apr 23 13:38:32 2015 -0400
@@ -36,7 +36,7 @@
OS=`uname -s`
@@ -46864,8 +46851,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Thu Apr 23 13:38:32 2015 -0400
@@ -33,17 +33,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46885,8 +46872,8 @@
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/jprt.config Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/jprt.config Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/jprt.config Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/jprt.config Thu Apr 23 13:38:32 2015 -0400
@@ -71,8 +71,8 @@
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -46954,8 +46941,8 @@
# Export PATH setting
PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Thu Apr 23 13:38:32 2015 -0400
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -46965,8 +46952,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Thu Apr 23 13:38:32 2015 -0400
@@ -53,8 +53,13 @@
return isOs("linux");
}
@@ -46982,8 +46969,8 @@
}
public static String getOsName() {
---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Thu Apr 23 13:38:32 2015 -0400
@@ -107,8 +107,8 @@
public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
@@ -46995,8 +46982,8 @@
"skipping!");
return;
}
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -45,37 +45,53 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
#{
@@ -47076,8 +47063,8 @@
#
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Thu Apr 23 13:38:32 2015 -0400
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -47087,8 +47074,8 @@
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -47106,8 +47093,8 @@
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -70,10 +70,12 @@
# security the password file.
@@ -47125,8 +47112,8 @@
# Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -69,10 +69,12 @@
# security the password file.
@@ -47144,8 +47131,8 @@
# Create management and SSL configuration files
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -36,7 +36,7 @@
OS=`uname -s`
@@ -47155,8 +47142,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/net/www/MarkResetTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/net/www/MarkResetTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/net/www/MarkResetTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -47166,8 +47153,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Thu Apr 23 13:38:32 2015 -0400
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -47177,8 +47164,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Thu Apr 23 13:38:32 2015 -0400
@@ -31,7 +31,7 @@
OS=`uname -s`
@@ -47188,8 +47175,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Thu Apr 23 13:38:32 2015 -0400
@@ -31,7 +31,7 @@
OS=`uname -s`
@@ -47199,8 +47186,8 @@
PS=":"
FS="/"
CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/sun/nio/ch/SelProvider.java Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/nio/ch/SelProvider.java Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/nio/ch/SelProvider.java Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/nio/ch/SelProvider.java Thu Apr 23 13:38:32 2015 -0400
@@ -39,7 +39,7 @@
expected = "sun.nio.ch.DevPollSelectorProvider";
} else if ("Linux".equals(osname)) {
@@ -47210,8 +47197,8 @@
expected = "sun.nio.ch.KQueueSelectorProvider";
} else {
return;
---- ./jdk/test/sun/security/krb5/runNameEquals.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/krb5/runNameEquals.sh Thu Apr 23 13:38:32 2015 -0400
@@ -48,15 +48,11 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47229,8 +47216,8 @@
CYGWIN* )
PATHSEP=";"
FILESEP="/"
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh Thu Apr 23 13:38:32 2015 -0400
@@ -131,6 +131,27 @@
;;
esac
@@ -47259,8 +47246,8 @@
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Thu Apr 23 13:38:32 2015 -0400
@@ -93,6 +93,27 @@
;;
esac
@@ -47289,8 +47276,8 @@
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Thu Apr 23 13:38:32 2015 -0400
@@ -50,19 +50,7 @@
OS=`uname -s`
@@ -47312,8 +47299,8 @@
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Thu Apr 23 13:38:32 2015 -0400
@@ -51,19 +51,7 @@
OS=`uname -s`
@@ -47335,8 +47322,8 @@
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Thu Apr 23 13:38:32 2015 -0400
@@ -44,11 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47350,8 +47337,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Thu Apr 23 13:38:32 2015 -0400
@@ -47,15 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47369,8 +47356,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Thu Apr 23 13:38:32 2015 -0400
@@ -33,7 +33,7 @@
OS=`uname -s`
@@ -47380,8 +47367,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -42,7 +42,7 @@
OS=`uname -s`
@@ -47391,8 +47378,8 @@
FILESEP="/"
PATHSEP=":"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Thu Apr 23 13:38:32 2015 -0400
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -47402,8 +47389,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Thu Apr 23 13:38:32 2015 -0400
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -47413,8 +47400,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47424,8 +47411,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47435,8 +47422,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Thu Apr 23 13:38:32 2015 -0400
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47446,8 +47433,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Thu Apr 23 13:38:32 2015 -0400
@@ -42,7 +42,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47457,8 +47444,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47468,8 +47455,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Thu Apr 23 13:38:32 2015 -0400
@@ -47,15 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47487,8 +47474,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Thu Apr 23 13:38:32 2015 -0400
@@ -42,13 +42,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47504,8 +47491,8 @@
FILESEP="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Thu Apr 23 13:38:32 2015 -0400
@@ -45,7 +45,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47515,8 +47502,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47526,8 +47513,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/autotest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/autotest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -72,6 +72,27 @@
;;
esac
@@ -47556,8 +47543,8 @@
* )
echo "Will not run test on: ${OS}"
exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47567,8 +47554,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh Thu Apr 23 13:38:32 2015 -0400
@@ -37,7 +37,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47578,8 +47565,8 @@
FS="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/resource.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/resource.sh Thu Apr 23 13:38:32 2015 -0400
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47589,8 +47576,8 @@
NULL=/dev/null
FS="/"
;;
---- ./jdk/test/sun/security/tools/keytool/standard.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/keytool/standard.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/keytool/standard.sh Thu Apr 23 13:38:32 2015 -0400
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47600,8 +47587,8 @@
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh Thu Apr 23 13:38:32 2015 -0400
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47611,8 +47598,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47622,8 +47609,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47633,8 +47620,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Thu Apr 23 13:38:32 2015 -0400
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47644,8 +47631,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47655,8 +47642,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47666,8 +47653,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh Thu Apr 23 13:38:32 2015 -0400
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47678,7 +47665,7 @@
PS=":"
FS="/"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh Sun Jan 25 08:34:16 2015 -0800
++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -0,0 +1,111 @@
+#
+# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -47791,19 +47778,19 @@
+
+ else fail "unspecified test failure"
+fi
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -54,7 +54,7 @@
OS=`uname -s`
case "$OS" in
-- SunOS | Linux )
+- SunOS | Linux | Darwin)
+ SunOS | Linux | *BSD | Darwin )
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh Thu Apr 23 13:38:32 2015 -0400
@@ -33,7 +33,7 @@
case `uname -s` in
@@ -47813,8 +47800,8 @@
esac
N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Thu Dec 18 14:05:58 2014 -0800
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sun Jan 25 08:34:16 2015 -0800
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Fri Apr 10 09:12:54 2015 -0700
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Thu Apr 23 13:38:32 2015 -0400
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -47824,23 +47811,8 @@
PATHSEP=":"
;;
---- ./langtools/.hgtags Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/.hgtags Sat Jan 24 12:35:01 2015 -0800
-@@ -123,6 +123,7 @@
- 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
- d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
- 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
-+23aadf169f085b180803bcdc53baad4ae870f75b 7u0
- cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
- 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
- baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
-@@ -554,3 +556,4 @@
- 11ca0f4b0c56817f6ad302022e6414aa52582f16 jdk7u76-b10
- 63c1f23bddcfc45835f224376525ec621ac73a96 jdk7u76-b11
- f0a6f4f62959a43e21d377436e3e60f6431ee5b4 jdk7u76-b12
-+d9e79541170f453dda964319f268fdad80dce9d7 jdk7u76-b13
---- ./langtools/test/Makefile Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/Makefile Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/Makefile Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/Makefile Sun Apr 19 13:24:14 2015 -0700
@@ -42,6 +42,14 @@
ARCH=i586
endif
@@ -47876,8 +47848,8 @@
# Root of all test results
TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
---- ./langtools/test/tools/javac/4846262/Test.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/4846262/Test.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/4846262/Test.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/4846262/Test.sh Sun Apr 19 13:24:14 2015 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47887,8 +47859,8 @@
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/6302184/T6302184.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/6302184/T6302184.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/6302184/T6302184.sh Sun Apr 19 13:24:14 2015 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47898,8 +47870,8 @@
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh Sun Apr 19 13:24:14 2015 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47909,8 +47881,8 @@
FS="/"
CHMOD="${FS}bin${FS}chmod"
;;
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh Sun Apr 19 13:24:14 2015 -0700
@@ -54,7 +54,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47920,8 +47892,8 @@
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/MissingInclude.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/MissingInclude.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/MissingInclude.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/MissingInclude.sh Sun Apr 19 13:24:14 2015 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47931,8 +47903,8 @@
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Sun Apr 19 13:24:14 2015 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47942,8 +47914,8 @@
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/T5090006/compiler.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/T5090006/compiler.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/T5090006/compiler.sh Sun Apr 19 13:24:14 2015 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47953,8 +47925,8 @@
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/apt.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/apt.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/apt.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/apt.sh Sun Apr 19 13:24:14 2015 -0700
@@ -38,7 +38,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47964,8 +47936,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh Sun Apr 19 13:24:14 2015 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47975,8 +47947,8 @@
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh Sun Apr 19 13:24:14 2015 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47986,8 +47958,8 @@
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh Sun Apr 19 13:24:14 2015 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -47997,8 +47969,8 @@
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/javazip/Test.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/javazip/Test.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/javazip/Test.sh Sun Apr 19 13:24:14 2015 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48008,8 +47980,8 @@
FS="/"
SCR=`pwd`
;;
---- ./langtools/test/tools/javac/links/links.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/links/links.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/links/links.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/links/links.sh Sun Apr 19 13:24:14 2015 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48019,8 +47991,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/newlines/Newlines.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/newlines/Newlines.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/newlines/Newlines.sh Sun Apr 19 13:24:14 2015 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48030,8 +48002,8 @@
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/stackmap/T4955930.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/stackmap/T4955930.sh Sun Apr 19 13:24:14 2015 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48041,8 +48013,8 @@
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh Sun Apr 19 13:24:14 2015 -0700
@@ -55,7 +55,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48052,8 +48024,8 @@
if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
then
ENV="env LANG=en_US.UTF-8"
---- ./langtools/test/tools/javah/6257087/foo.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javah/6257087/foo.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javah/6257087/foo.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javah/6257087/foo.sh Sun Apr 19 13:24:14 2015 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48063,8 +48035,8 @@
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javah/ConstMacroTest.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javah/ConstMacroTest.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javah/ConstMacroTest.sh Sun Apr 19 13:24:14 2015 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48074,8 +48046,8 @@
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javah/MissingParamClassTest.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javah/MissingParamClassTest.sh Sun Apr 19 13:24:14 2015 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48085,8 +48057,8 @@
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ReadOldClass.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javah/ReadOldClass.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javah/ReadOldClass.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javah/ReadOldClass.sh Sun Apr 19 13:24:14 2015 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -48096,8 +48068,8 @@
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javap/pathsep.sh Thu Dec 18 14:10:51 2014 -0800
-+++ ./langtools/test/tools/javap/pathsep.sh Sat Jan 24 12:35:01 2015 -0800
+--- ./langtools/test/tools/javap/pathsep.sh Fri Apr 10 09:17:27 2015 -0700
++++ ./langtools/test/tools/javap/pathsep.sh Sun Apr 19 13:24:14 2015 -0700
@@ -40,7 +40,7 @@
# set platform-dependent variables
OS=`uname -s`