diff --git a/.hgtags b/.hgtags
index 997056ebee..74501d0adc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1422,3 +1422,4 @@ d24969e49a6af3353c84b9a0f9aedd4736156b66 jdk8u302-b01
 8a152c8e9f14e3bdeebd7bf4e8eb2a6e8f9bbb7c jdk8u302-b02
 99e4a82f17e8debc5225d1c8834acdac673aa676 jdk8u302-b03
 362d99aef38e6e179061f221df20bbb9f65b8f89 jdk8u302-b04
+54326de2a1d7847ea63e7bcf4ebc1a9699cb8885 jdk8u302-b05
diff --git a/ci.jsonnet b/ci.jsonnet
index efab409c61..8d695ef2ef 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -90,7 +90,7 @@
 
     OpenJDK:: {
         local jdk_version = "8u302",
-        local jdk_build = "05",
+        local jdk_build = "06",
 
         name+: "-openjdk",
         downloads+: {
diff --git a/make/bsd/makefiles/gcc.make b/make/bsd/makefiles/gcc.make
index 1af2666a3e..93f7454595 100644
--- a/make/bsd/makefiles/gcc.make
+++ b/make/bsd/makefiles/gcc.make
@@ -376,7 +376,15 @@ ASFLAGS += -x assembler-with-cpp
 # Linker flags
 
 # statically link libstdc++.so, work with gcc but ignored by g++
-STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+ifeq ($(OS_VENDOR), Darwin)
+  ifeq ($(USE_CLANG), true)
+    STATIC_STDCXX = -Wl,-Bstatic -lc++ -Wl,-Bdynamic
+  else
+    STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+  endif
+else
+  STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+endif
 
 ifeq ($(USE_CLANG),)
   # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
diff --git a/make/bsd/makefiles/jsig.make b/make/bsd/makefiles/jsig.make
index f4e03452af..39ad1314b7 100644
--- a/make/bsd/makefiles/jsig.make
+++ b/make/bsd/makefiles/jsig.make
@@ -54,6 +54,11 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
 
 LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
 
+ifeq ($(OS_VENDOR), Darwin)
+# bring in minimum version argument or we'll fail on OSX 10.10
+LFLAGS_JSIG += $(LFLAGS)
+endif
+
 # DEBUG_BINARIES overrides everything, use full -g debug information
 ifeq ($(DEBUG_BINARIES), true)
   JSIG_DEBUG_CFLAGS = -g
diff --git a/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp b/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
index 018feea1e0..5e76705f89 100644
--- a/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
+++ b/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -846,7 +846,7 @@ static void current_stack_region(address * bottom, size_t * size) {
   *size = pthread_get_stacksize_np(self);
   // workaround for OS X 10.9.0 (Mavericks)
   // pthread_get_stacksize_np returns 128 pages even though the actual size is 2048 pages
-  if (pthread_main_np() == 1) {
+  if (::pthread_main_np() == 1) {
     if ((*size) < (DEFAULT_MAIN_THREAD_STACK_PAGES * (size_t)getpagesize())) {
       char kern_osrelease[256];
       size_t kern_osrelease_size = sizeof(kern_osrelease);
diff --git a/src/share/vm/utilities/ostream.cpp b/src/share/vm/utilities/ostream.cpp
index fc17aeb040..6502a0808d 100644
--- a/src/share/vm/utilities/ostream.cpp
+++ b/src/share/vm/utilities/ostream.cpp
@@ -673,7 +673,10 @@ void test_snprintf(PrintFn pf, bool expect_count) {
 static int vsnprintf_wrapper(char* buf, size_t len, const char* fmt, ...) {
   va_list args;
   va_start(args, fmt);
+PRAGMA_DIAG_PUSH
+PRAGMA_FORMAT_NONLITERAL_IGNORED_INTERNAL
   int result = os::vsnprintf(buf, len, fmt, args);
+PRAGMA_DIAG_POP
   va_end(args);
   return result;
 }