make/bsd/makefiles/vm.make

*** 1,7 ****
  #
! # Copyright (c) 1999, 2015, 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.
--- 1,7 ----
  #
! # Copyright (c) 1999, 2016, 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.
*** 140,158 ****
  include $(MAKEFILES_DIR)/dtrace.make
  
  #----------------------------------------------------------------------
  # JVM
  
! JVM    = jvm
  ifeq ($(OS_VENDOR), Darwin)
    LIBJVM   = lib$(JVM).$(LIBRARY_SUFFIX)
    CFLAGS  += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE
  
    LIBJVM_DEBUGINFO   = lib$(JVM).$(LIBRARY_SUFFIX).dSYM
    LIBJVM_DIZ         = lib$(JVM).diz
  else
!   LIBJVM   = lib$(JVM).so
  
    LIBJVM_DEBUGINFO   = lib$(JVM).debuginfo
    LIBJVM_DIZ         = lib$(JVM).diz
  endif
  
--- 140,158 ----
  include $(MAKEFILES_DIR)/dtrace.make
  
  #----------------------------------------------------------------------
  # JVM
  
! JVM = jvm
  ifeq ($(OS_VENDOR), Darwin)
    LIBJVM   = lib$(JVM).$(LIBRARY_SUFFIX)
    CFLAGS  += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE
  
    LIBJVM_DEBUGINFO   = lib$(JVM).$(LIBRARY_SUFFIX).dSYM
    LIBJVM_DIZ         = lib$(JVM).diz
  else
!   LIBJVM = lib$(JVM).so
  
    LIBJVM_DEBUGINFO   = lib$(JVM).debuginfo
    LIBJVM_DIZ         = lib$(JVM).diz
  endif
  
*** 299,311 ****
    LFLAGS_VM$(LDNOMAP)      += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
    LFLAGS_VM                += $(SONAMEFLAG:SONAME=$(LIBJVM))
  
    ifeq ($(OS_VENDOR), Darwin)
      ifneq ($(STATIC_BUILD),true)
!     LFLAGS_VM += -Xlinker -rpath -Xlinker @loader_path/.
!     LFLAGS_VM += -Xlinker -rpath -Xlinker @loader_path/..
!     LFLAGS_VM += -Xlinker -install_name -Xlinker @rpath/$(@F)
      endif
    else
      LFLAGS_VM                += -Wl,-z,defs
    endif
  
--- 299,311 ----
    LFLAGS_VM$(LDNOMAP)      += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
    LFLAGS_VM                += $(SONAMEFLAG:SONAME=$(LIBJVM))
  
    ifeq ($(OS_VENDOR), Darwin)
      ifneq ($(STATIC_BUILD),true)
!       LFLAGS_VM += -Xlinker -rpath -Xlinker @loader_path/.
!       LFLAGS_VM += -Xlinker -rpath -Xlinker @loader_path/..
!       LFLAGS_VM += -Xlinker -install_name -Xlinker @rpath/$(@F)
      endif
    else
      LFLAGS_VM                += -Wl,-z,defs
    endif
  
*** 361,379 ****
  $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
  ifeq ($(STATIC_BUILD),true)
          echo Linking static vm...;
          $(LINK_LIB.CC) $@ $(LIBJVM.o)
  else
!         $(QUIETLY) {                                                    \
!             echo $(LOG_INFO) Linking vm...;                                         \
!             $(LINK_LIB.CXX/PRE_HOOK)                                     \
!             $(LINK_VM) $(LD_SCRIPT_FLAG)                                \
!                        $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \
!             $(LINK_LIB.CXX/POST_HOOK)                                    \
!             rm -f $@.1; ln -s $@ $@.1;                                  \
          }
- 
  endif
  
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    ifeq ($(OS_VENDOR), Darwin)
          $(DSYMUTIL) $@
--- 361,378 ----
  $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
  ifeq ($(STATIC_BUILD),true)
          echo Linking static vm...;
          $(LINK_LIB.CC) $@ $(LIBJVM.o)
  else
!         $(QUIETLY) {                                                        \
!             echo $(LOG_INFO) Linking vm...;                                 \
!             $(LINK_LIB.CXX/PRE_HOOK)                                        \
!             $(LINK_VM) $(LD_SCRIPT_FLAG)                                    \
!                        $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM);   \
!             $(LINK_LIB.CXX/POST_HOOK)                                       \
!             rm -f $@.1; ln -s $@ $@.1;                                      \
          }
  endif
  
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    ifeq ($(OS_VENDOR), Darwin)
          $(DSYMUTIL) $@
*** 431,438 ****
          echo "Doing vm.make build:"
  else
  build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(EXPORTED_SYMBOLS)
  endif
  
! install: install_jvm install_jsigs
  
  .PHONY: default build install install_jvm
--- 430,437 ----
          echo "Doing vm.make build:"
  else
  build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(EXPORTED_SYMBOLS)
  endif
  
! install: install_jvm install_jsig
  
  .PHONY: default build install install_jvm