7141242: build-infra merge: Rename CPP->CXX and LINK->LD
Summary: Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker.
Reviewed-by: dholmes, ohrstrom
## Copyright (c) 1998, 2011, 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.## This code is distributed in the hope that it will be useful, but WITHOUT# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License# version 2 for more details (a copy is included in the LICENSE file that# accompanied this code).## You should have received a copy of the GNU General Public License version# 2 along with this work; if not, write to the Free Software Foundation,# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.## Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA# or visit www.oracle.com if you need additional information or have any# questions.# ## Rules to build JVM and related libraries, included from vm.make in the build# directory.# Common build rules.MAKEFILES_DIR=$(GAMMADIR)/make/$(Platform_os_family)/makefilesinclude $(MAKEFILES_DIR)/rules.makeinclude $(GAMMADIR)/make/altsrc.makedefault: build#----------------------------------------------------------------------# DefsGENERATED = ../generatedDEP_DIR = $(GENERATED)/dependencies# reads the generated files defining the set of .o's and the .o .h dependencies-include $(DEP_DIR)/*.d# read machine-specific adjustments (%%% should do this via buildtree.make?)include $(MAKEFILES_DIR)/$(BUILDARCH).make# 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.# The jvmtifiles directory contains jvmti*.[ch]ppSrc_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifilesVPATH += $(Src_Dirs_V:%=%:)# set INCLUDES for C preprocessorSrc_Dirs_I += $(GENERATED)INCLUDES += $(Src_Dirs_I:%=-I%)# SYMFLAG is used by {dtrace,jsig,saproc}.make.ifneq ($(OBJCOPY),) # always build with debug info when we can create .debuginfo files # and disable 'lazy debug info' so the .so has everything. SYMFLAG = -g -xselse ifeq (${VERSION}, debug) SYMFLAG = -g else SYMFLAG = endifendif# The following variables are defined in the generated flags.make file.BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\""JRE_VERSION = -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""CXXFLAGS = \ ${SYSDEFS} \ ${INCLUDES} \ ${BUILD_VERSION} \ ${BUILD_TARGET} \ ${BUILD_USER} \ ${HS_LIB_ARCH} \ ${VM_DISTRO}# This is VERY important! The version define must only be supplied to vm_version.o# If not, ccache will not re-use the cache at all, since the version string might contain# a time and date. vm_version.o: CXXFLAGS += ${JRE_VERSION} # CFLAGS_WARN holds compiler options to suppress/enable warnings.CFLAGS += $(CFLAGS_WARN)# Do not use C++ exception handlingCFLAGS += $(CFLAGS/NOEX)# Extra flags from gnumake's invocation or environmentCFLAGS += $(EXTRA_CFLAGS) -DINCLUDE_TRACE# Math Library (libm.so), do not use -lm.# There might be two versions of libm.so on the build system:# libm.so.1 and libm.so.2, and we want libm.so.1.# Depending on the Solaris release being used to build with,# /usr/lib/libm.so could point at a libm.so.2, so we are# explicit here so that the libjvm.so you have built will work on an# older Solaris release that might not have libm.so.2.# This is a critical factor in allowing builds on Solaris 10 or newer# to run on Solaris 8 or 9.#LIBM=/usr/lib$(ISA_DIR)/libm.so.1ifeq ("${Platform_compiler}", "sparcWorks")# The whole megilla:ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 505), 1)# Old Comment: List the libraries in the order the compiler was designed for# Not sure what the 'designed for' comment is referring too above.# The order may not be too significant anymore, but I have placed this# older libm before libCrun, just to make sure it's found and used first.LIBS += -lsocket -lsched -ldl $(LIBM) -lCrun -lthread -ldoor -lc -ldemangleelseifeq ($(COMPILER_REV_NUMERIC), 502)# SC6.1 has it's own libm.so: specifying anything else provokes a name conflict.LIBS += -ldl -lthread -lsocket -lm -lsched -ldoor -ldemangleelseLIBS += -ldl -lthread -lsocket $(LIBM) -lsched -ldoor -ldemangleendif # 502endif # 505elseLIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc -ldemangleendif # sparcWorksifeq ("${Platform_arch}", "sparc")LIBS += -lkstatendif# By default, link the *.o into the library, not the executable.LINK_INTO$(LINK_INTO) = LIBJVMJDK_LIBDIR = $(JAVA_HOME)/jre/lib/$(LIBARCH)#----------------------------------------------------------------------# jvm_db & dtraceinclude $(MAKEFILES_DIR)/dtrace.make#----------------------------------------------------------------------# JVMJVM = jvmLIBJVM = lib$(JVM).soLIBJVM_G = lib$(JVM)$(G_SUFFIX).soLIBJVM_DEBUGINFO = lib$(JVM).debuginfoLIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfoSPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadtSOURCE_PATHS=\ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vmSOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vmSOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vmSOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vmSOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ find $(HS_ALT_SRC)/share/vm/jfr -type d; \ fi)CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))CORE_PATHS+=$(GENERATED)/jvmtifilesCOMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1COMPILER2_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/opto)COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/optoCOMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadtCOMPILER2_PATHS += $(GENERATED)/adfiles# Include dirs per type.Src_Dirs/CORE := $(CORE_PATHS)Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)Src_Dirs/ZERO := $(CORE_PATHS)Src_Dirs/SHARK := $(CORE_PATHS)Src_Dirs := $(Src_Dirs/$(TYPE))COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*COMPILER1_SPECIFIC_FILES := c1_\*SHARK_SPECIFIC_FILES := sharkZERO_SPECIFIC_FILES := zero# Always exclude these.Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp# Exclude per type.Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cppSrc_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cppSrc_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cppSrc_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES)Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))# Special handling of arch model.ifeq ($(Platform_arch_model), x86_32)Src_Files_EXCLUDE += \*x86_64\*endififeq ($(Platform_arch_model), x86_64)Src_Files_EXCLUDE += \*x86_32\*endif# Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.define findsrc $(notdir $(shell find $(1)/. ! -name . -prune \ -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \ -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \)))endefSrc_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))Obj_Files = $(sort $(addsuffix .o,$(basename $(Src_Files))))JVM_OBJ_FILES = $(Obj_Files) $(DTRACE_OBJS)vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))mapfile : $(MAPFILE) $(MAPFILE_DTRACE_OPT) vm.def rm -f $@ cat $(MAPFILE) $(MAPFILE_DTRACE_OPT) \ | $(NAWK) '{ \ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") { \ system ("cat vm.def"); \ } else { \ print $$0; \ } \ }' > $@mapfile_reorder : mapfile $(MAPFILE_DTRACE_OPT) $(REORDERFILE) rm -f $@ cat $^ > $@vm.def: $(Obj_Files) sh $(GAMMADIR)/make/solaris/makefiles/build_vm_def.sh *.o > $@ifeq ($(LINK_INTO),AOUT) LIBJVM.o = LIBJVM_MAPFILE = LIBS_VM = $(LIBS)else LIBJVM.o = $(JVM_OBJ_FILES) LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM))ifndef USE_GCC LIBS_VM = $(LIBS)else # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to # get around library dependency and compatibility issues. Must use gcc not # g++ to link. LFLAGS_VM += $(STATIC_LIBGCC) LIBS_VM += $(STATIC_STDCXX) $(LIBS)endifendififdef USE_GCCLINK_VM = $(LINK_LIB.CC)elseLINK_VM = $(LINK_LIB.CXX)endif# making the library:$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) @echo Linking vm... $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1ifneq ($(OBJCOPY),) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ ifeq ($(STRIP_POLICY),all_strip) $(QUIETLY) $(STRIP) $@ else ifeq ($(STRIP_POLICY),min_strip) $(QUIETLY) $(STRIP) -x $@ # implied else here is no stripping at all endif endif $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)endifendif # filter -sbfast -xsbfastDEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)install_jvm: $(LIBJVM) @echo "Copying $(LIBJVM) to $(DEST_JVM)" $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \ cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO) $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"#----------------------------------------------------------------------# Other files# Gamma launcherinclude $(MAKEFILES_DIR)/launcher.make# Signal interposition libraryinclude $(MAKEFILES_DIR)/jsig.make# Serviceability agentinclude $(MAKEFILES_DIR)/saproc.make#----------------------------------------------------------------------build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(LIBJVM_DTRACE) $(BUILDLIBSAPROC) dtraceCheckinstall: install_jvm install_jsig install_saproc.PHONY: default build install install_jvm