# HG changeset patch
# User dsamersoff
# Date 1380768177 -7200
# Node ID b24f0afe8735cc6eb95324438d773de06c580be6
# Parent  827e8efd379a7479b50e6978d550385f9380b2d6# Parent  9e82f2c366264837d91fc52f663ad8a3694bd65b
Merge

diff -r 9e82f2c36626 -r b24f0afe8735 hotspot/make/windows/makefiles/fastdebug.make
--- a/hotspot/make/windows/makefiles/fastdebug.make	Wed Oct 02 22:27:23 2013 +0400
+++ b/hotspot/make/windows/makefiles/fastdebug.make	Thu Oct 03 04:42:57 2013 +0200
@@ -38,7 +38,7 @@
 !include ../local.make
 !include compile.make
 
-CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) /D "CHECK_UNHANDLED_OOPS"
+CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION)
 
 !include $(WorkSpace)/make/windows/makefiles/vm.make
 !include local.make
diff -r 9e82f2c36626 -r b24f0afe8735 hotspot/src/os/bsd/vm/os_bsd.cpp
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp	Wed Oct 02 22:27:23 2013 +0400
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp	Thu Oct 03 04:42:57 2013 +0200
@@ -100,6 +100,7 @@
 # include <stdint.h>
 # include <inttypes.h>
 # include <sys/ioctl.h>
+# include <sys/syscall.h>
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 # include <elf.h>
@@ -152,6 +153,7 @@
 // utility functions
 
 static int SR_initialize();
+static void unpackTime(timespec* absTime, bool isAbsolute, jlong time);
 
 julong os::available_memory() {
   return Bsd::available_memory();
@@ -247,7 +249,17 @@
    * since it returns a 64 bit value)
    */
   mib[0] = CTL_HW;
+
+#if defined (HW_MEMSIZE) // Apple
   mib[1] = HW_MEMSIZE;
+#elif defined(HW_PHYSMEM) // Most of BSD
+  mib[1] = HW_PHYSMEM;
+#elif defined(HW_REALMEM) // Old FreeBSD
+  mib[1] = HW_REALMEM;
+#else
+  #error No ways to get physmem
+#endif
+
   len = sizeof(mem_val);
   if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) {
        assert(len == sizeof(mem_val), "unexpected data size");
@@ -1904,7 +1916,7 @@
     bool timedwait(unsigned int sec, int nsec);
   private:
     jlong currenttime() const;
-    semaphore_t _semaphore;
+    os_semaphore_t _semaphore;
 };
 
 Semaphore::Semaphore() : _semaphore(0) {
@@ -1972,7 +1984,7 @@
 
 bool Semaphore::timedwait(unsigned int sec, int nsec) {
   struct timespec ts;
-  jlong endtime = unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
+  unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
 
   while (1) {
     int result = sem_timedwait(&_semaphore, &ts);
diff -r 9e82f2c36626 -r b24f0afe8735 hotspot/test/TEST.groups
--- a/hotspot/test/TEST.groups	Wed Oct 02 22:27:23 2013 +0400
+++ b/hotspot/test/TEST.groups	Thu Oct 03 04:42:57 2013 +0200
@@ -65,7 +65,6 @@
   gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java \
   gc/metaspace/TestMetaspacePerfCounters.java \
   runtime/6819213/TestBootNativeLibraryPath.java \
-  runtime/6878713/Test6878713.sh \
   runtime/6925573/SortMethodsTest.java \
   runtime/7107135/Test7107135.sh \
   runtime/7158988/FieldMonitor.java \