*** old/make/bsd/makefiles/saproc.make	Wed Mar 13 23:31:52 2013
--- new/make/bsd/makefiles/saproc.make	Wed Mar 13 23:31:52 2013

*** 1,7 ****
--- 1,7 ----
  #
! # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.

*** 22,32 ****
--- 22,32 ----
  #  
  #
  
  # Rules to build serviceability agent library, used by vm.make
  
! # libsaproc.so(dylib): serviceability agent
  SAPROC   = saproc
  
  ifeq ($(OS_VENDOR), Darwin)
    LIBSAPROC   = lib$(SAPROC).dylib
  else

*** 35,59 ****
--- 35,65 ----
  
  AGENT_DIR = $(GAMMADIR)/agent
  
  SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
  
! NON_STUB_SASRCFILES = $(SASRCDIR)/salibelf.c                 \
! BSD_NON_STUB_SASRCFILES = $(SASRCDIR)/salibelf.c             \
                        $(SASRCDIR)/symtab.c                   \
                        $(SASRCDIR)/libproc_impl.c             \
                        $(SASRCDIR)/ps_proc.c                  \
                        $(SASRCDIR)/ps_core.c                  \
                        $(SASRCDIR)/BsdDebuggerLocal.c         \
                        $(AGENT_DIR)/src/share/native/sadis.c
  
+ DARWIN_NON_STUB_SASRCFILES = $(SASRCDIR)/symtab.c            \
+                       $(SASRCDIR)/libproc_impl.c             \
+                       $(SASRCDIR)/ps_core.c                  \
+                       $(SASRCDIR)/MacosxDebuggerLocal.m      \
+                       $(AGENT_DIR)/src/share/native/sadis.c
+ 
  ifeq ($(OS_VENDOR), FreeBSD)
!   SASRCFILES = $(BSD_NON_STUB_SASRCFILES)
    SALIBS = -lutil -lthread_db
    SAARCH = $(ARCHFLAG)
  else
    ifeq ($(OS_VENDOR), Darwin)
!     SASRCFILES = $(SASRCDIR)/MacosxDebuggerLocal.m
!     SASRCFILES = $(DARWIN_NON_STUB_SASRCFILES)
      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