make/linux/makefiles/vm.make

*** 1,7 ****
  #
! # Copyright (c) 1999, 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.
--- 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.
*** 43,54 ****
  
  # read machine-specific adjustments (%%% should do this via buildtree.make?)
  ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    include $(MAKEFILES_DIR)/zeroshark.make
  else
!   include $(MAKEFILES_DIR)/$(BUILDARCH).make
!   -include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make
  endif
  
  # set VPATH so make knows where to look for source files
  # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
  # The adfiles directory contains ad_<arch>.[ch]pp.
--- 43,55 ----
  
  # read machine-specific adjustments (%%% should do this via buildtree.make?)
  ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    include $(MAKEFILES_DIR)/zeroshark.make
  else
!   BUILDARCH_MAKE = $(MAKEFILES_DIR)/$(BUILDARCH).make
!   ALT_BUILDARCH_MAKE = $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make
!   include $(if $(wildcard $(ALT_BUILDARCH_MAKE)),$(ALT_BUILDARCH_MAKE),$(BUILDARCH_MAKE))
  endif
  
  # set VPATH so make knows where to look for source files
  # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
  # The adfiles directory contains ad_<arch>.[ch]pp.