--- hotspot/make/bsd/makefiles/saproc.make.orig	2016-09-10 17:20:48.846341000 +0200
+++ hotspot/make/bsd/makefiles/saproc.make	2016-09-10 17:22:07.545984000 +0200
@@ -57,15 +57,21 @@
   SALIBS = -lutil -lthread_db
   SAARCH = $(ARCHFLAG)
 else
-  ifeq ($(OS_VENDOR), Darwin)
-    SASRCFILES = $(SASRCDIR)/MacosxDebuggerLocal.m
-    SALIBS = -g -framework Foundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks -framework JavaNativeFoundation -framework Security -framework CoreFoundation
-    #objc compiler blows up on -march=i586, perhaps it should not be included in the macosx intel 32-bit C++ compiles?
-    SAARCH = $(subst -march=i586,,$(ARCHFLAG))
-  else
-    SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
-    SALIBS = 
+  ifeq ($(OS_VENDOR), BSDSUniX)
+    SASRCFILES = $(NON_STUB_SASRCFILES)
+    SALIBS = -lutil -lthread_db
     SAARCH = $(ARCHFLAG)
+  else
+    ifeq ($(OS_VENDOR), Darwin)
+      SASRCFILES = $(SASRCDIR)/MacosxDebuggerLocal.m
+      SALIBS = -g -framework Foundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks -framework JavaNativeFoundation -framework Security -framework CoreFoundation
+      #objc compiler blows up on -march=i586, perhaps it should not be included in the macosx intel 32-bit C++ compiles?
+      SAARCH = $(subst -march=i586,,$(ARCHFLAG))
+    else
+      SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
+      SALIBS = 
+      SAARCH = $(ARCHFLAG)
+    endif
   endif
 endif