src/share/vm/runtime/os.cpp

rev 2694 : imported patch headers_only
rev 2695 : shared changes

*** 58,67 ****
--- 58,71 ----
  #endif
  #ifdef TARGET_OS_FAMILY_windows
  # include "os_windows.inline.hpp"
  # include "thread_windows.inline.hpp"
  #endif
+ #ifdef TARGET_OS_FAMILY_bsd
+ # include "os_bsd.inline.hpp"
+ # include "thread_bsd.inline.hpp"
+ #endif
  
  # include <signal.h>
  
  OSThread*         os::_starting_thread    = NULL;
  address           os::_polling_page       = NULL;
*** 114,124 ****
--- 118,132 ----
    struct tm time_struct;
    if (localtime_pd(&seconds_since_19700101, &time_struct) == NULL) {
      assert(false, "Failed localtime_pd");
      return NULL;
    }
+ #if defined(_ALLBSD_SOURCE)
+   const time_t zone = (time_t) time_struct.tm_gmtoff;
+ #else
    const time_t zone = timezone;
+ #endif
  
    // If daylight savings time is in effect,
    // we are 1 hour East of our time zone
    const time_t seconds_per_minute = 60;
    const time_t minutes_per_hour = 60;
*** 382,391 ****
--- 390,406 ----
      dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "java");
      _native_java_library = dll_load(buffer, ebuf, sizeof(ebuf));
      if (_native_java_library == NULL) {
        vm_exit_during_initialization("Unable to load native library", ebuf);
      }
+ 
+ #if defined(__OpenBSD__)
+     // Work-around OpenBSD's lack of $ORIGIN support by pre-loading libnet.so
+     // ignore errors
+     dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "net");
+     dll_load(buffer, ebuf, sizeof(ebuf));
+ #endif
    }
    static jboolean onLoaded = JNI_FALSE;
    if (onLoaded) {
      // We may have to wait to fire OnLoad until TLS is initialized.
      if (ThreadLocalStorage::is_initialized()) {