< prev index next >

make/hotspot/lib/JvmFlags.gmk

Print this page

        

*** 21,45 **** # 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. # ! # Include support files that will setup compiler flags due to the selected ! # jvm feature set, and specific file overrides. ! include lib/JvmFeatures.gmk ! include lib/JvmOverrideFiles.gmk ! ! $(eval $(call IncludeCustomExtension, hotspot/lib/CompileJvm.gmk)) ! ! ################################################################################ ! # Setup compilation of the main Hotspot native library (libjvm). ! ! JVM_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm ! JVM_MAPFILE := $(JVM_OUTPUTDIR)/mapfile ################################################################################ ! # Platform independent setup # This variable may be added to by a custom extension JVM_SRC_ROOTS += $(TOPDIR)/src/hotspot JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \ --- 21,34 ---- # 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. # ! $(eval $(call IncludeCustomExtension, hotspot/lib/JvmFlags.gmk)) ################################################################################ ! # Setup JVM_CFLAGS. These are shared between GensrcDtrace.gmk and CompileJvm.gmk. # This variable may be added to by a custom extension JVM_SRC_ROOTS += $(TOPDIR)/src/hotspot JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \
*** 47,63 **** $d/os/$(HOTSPOT_TARGET_OS) \ $d/os/$(HOTSPOT_TARGET_OS_TYPE) \ $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH) \ $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \ ))) \ ! $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles \ ! $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles \ # JVM_CFLAGS_INCLUDES += \ ! $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \ ! -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \ -I$(TOPDIR)/src/hotspot/share/precompiled \ -I$(TOPDIR)/src/hotspot/share/include \ -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \ --- 36,50 ---- $d/os/$(HOTSPOT_TARGET_OS) \ $d/os/$(HOTSPOT_TARGET_OS_TYPE) \ $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH) \ $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \ ))) \ ! $(JVM_VARIANT_OUTPUTDIR)/gensrc # JVM_CFLAGS_INCLUDES += \ ! $(patsubst %,-I%,$(JVM_SRC_DIRS)) \ -I$(TOPDIR)/src/hotspot/share/precompiled \ -I$(TOPDIR)/src/hotspot/share/include \ -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
*** 102,330 **** $(JVM_CFLAGS_FEATURES) \ $(JVM_CFLAGS_INCLUDES) \ $(EXTRA_CFLAGS) \ # - JVM_LDFLAGS += \ - $(SHARED_LIBRARY_FLAGS) \ - $(JVM_LDFLAGS_FEATURES) \ - $(EXTRA_LDFLAGS) \ - # - - JVM_LIBS += \ - $(JVM_LIBS_FEATURES) \ - # - - # These files and directories are always excluded - JVM_EXCLUDE_FILES += args.cc - JVM_EXCLUDES += adlc - - # Needed by vm_version.cpp - ifeq ($(OPENJDK_TARGET_CPU), x86_64) - OPENJDK_TARGET_CPU_VM_VERSION := amd64 - else ifeq ($(OPENJDK_TARGET_CPU), sparcv9) - OPENJDK_TARGET_CPU_VM_VERSION := sparc - else ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm) - ifeq ($(OPENJDK_TARGET_CPU), aarch64) - # This sets the Oracle Aarch64 port to use arm64 - # while the original Aarch64 port uses aarch64 - OPENJDK_TARGET_CPU_VM_VERSION := arm64 - endif - else - OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU) - endif - - CFLAGS_VM_VERSION := \ - $(VERSION_CFLAGS) \ - -DHOTSPOT_VERSION_STRING='"$(VERSION_STRING)"' \ - -DDEBUG_LEVEL='"$(DEBUG_LEVEL)"' \ - -DHOTSPOT_BUILD_USER='"$(USERNAME)"' \ - -DHOTSPOT_VM_DISTRO='"$(HOTSPOT_VM_DISTRO)"' \ - -DCPU='"$(OPENJDK_TARGET_CPU_VM_VERSION)"' \ - # - # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. ifeq ($(USE_PRECOMPILED_HEADER), false) JVM_CFLAGS += -DDONT_USE_PRECOMPILED_HEADER endif - - ################################################################################ - # Platform specific setup - - # ARM source selection - - ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-arm) - JVM_EXCLUDE_PATTERNS += arm_64 - - else ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-aarch64) - # For 64-bit arm builds, we use the 64 bit hotspot/src/cpu/arm - # hotspot sources if HOTSPOT_TARGET_CPU_ARCH is set to arm. - # Exclude the aarch64 and 32 bit arm files for this build. - ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm) - JVM_EXCLUDE_PATTERNS += arm_32 aarch64 - endif - endif - - ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), ) - JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp - endif - - ifeq ($(OPENJDK_TARGET_CPU), x86) - JVM_EXCLUDE_PATTERNS += x86_64 - else ifeq ($(OPENJDK_TARGET_CPU), x86_64) - JVM_EXCLUDE_PATTERNS += x86_32 - endif - - # Inline assembly for solaris - ifeq ($(OPENJDK_TARGET_OS), solaris) - ifeq ($(OPENJDK_TARGET_CPU), x86_64) - JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.il - else ifeq ($(OPENJDK_TARGET_CPU), sparcv9) - JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il - endif - endif - - ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9) - ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), false) - # NOTE: In the old build, we weirdly enough set -g/-g0 always, regardless - # of if debug symbols were needed. Without it, compilation fails on - # sparc! :-( - JVM_CFLAGS += -g0 - endif - endif - - ifeq ($(OPENJDK_TARGET_OS), windows) - ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) - RC_DESC := 64-Bit$(SPACE) - endif - JVM_RCFLAGS += -D"HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(RC_DESC)$(JVM_VARIANT) VM" - endif - - JVM_OPTIMIZATION ?= HIGHEST_JVM - - # Need to set JVM_STRIPFLAGS to the default value from SPEC since the STRIPFLAGS - # parameter to SetupNativeCompilation allows an empty value to override the - # default. - JVM_STRIPFLAGS ?= $(STRIPFLAGS) - - ################################################################################ - # Now set up the actual compilation of the main hotspot native library - - $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \ - NAME := jvm, \ - TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ - OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \ - SRC := $(JVM_SRC_DIRS), \ - EXTRA_FILES := $(DTRACE_EXTRA_SOURCE_FILES), \ - EXCLUDES := $(JVM_EXCLUDES), \ - EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \ - EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \ - EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \ - CFLAGS := $(JVM_CFLAGS), \ - vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ - arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ - DISABLED_WARNINGS_clang := tautological-compare, \ - DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \ - 1540-1088 1500-010, \ - ASFLAGS := $(JVM_ASFLAGS), \ - LDFLAGS := $(JVM_LDFLAGS), \ - LIBS := $(JVM_LIBS), \ - OPTIMIZATION := $(JVM_OPTIMIZATION), \ - OBJECT_DIR := $(JVM_OUTPUTDIR)/objs, \ - MAPFILE := $(JVM_MAPFILE), \ - USE_MAPFILE_FOR_SYMBOLS := true, \ - STRIPFLAGS := $(JVM_STRIPFLAGS), \ - EMBED_MANIFEST := true, \ - RC_FLAGS := $(JVM_RCFLAGS), \ - VERSIONINFO_RESOURCE := $(TOPDIR)/src/hotspot/os/windows/version.rc, \ - PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ - PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \ - )) - - ifeq ($(OPENJDK_TARGET_OS), windows) - # It doesn't matter which jvm.lib file gets exported, but we need - # to pick just one. - ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN)) - $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \ - DEST := $(LIB_OUTPUTDIR), \ - FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \ - )) - TARGETS += $(COPY_JVM_LIB) - endif - endif - - # AIX warning explanation: - # 1500-010 : (W) WARNING in ...: Infinite loop. Program may not stop. - # There are several infinite loops in the vm, so better suppress. - # 1540-0198 : (W) The omitted keyword "private" is assumed for base class "...". - # 1540-0216 : (W) An expression of type .. cannot be converted to type .. - # In hotspot this fires for functionpointer to pointer conversions - # 1540-1088 : (W) The exception specification is being ignored. - # In hotspot this is caused by throw() in declaration of new() in nmethod.hpp. - # 1540-1090 : (I) The destructor of "..." might not be called. - # 1540-1639 : (I) The behavior of long type bit fields has changed ... - - # Include mapfile generation. It relies on BUILD_LIBJVM_ALL_OBJS which is only - # defined after the above call to BUILD_LIBJVM. Mapfile will be generated - # after all object files are built, but before the jvm library is linked. - include lib/JvmMapfile.gmk - - TARGETS += $(BUILD_LIBJVM) - - ################################################################################ - # Hotspot disallows the use of global operators 'new' and 'delete'. This build - # time check helps enforce this requirement. If you trigger this check and the - # reference is not obvious from the source, GNU objdump can be used to help find - # the reference if compiled with GCC: - # - # objdump -lrdSC <path/to/file.o> - # - # -C demangle - # -d disassemble - # -r print relocation entries, interspersed with the disassembly - # -S print source code, intermixed with disassembly - # -l include filenames and line numbers - # - # Search the output for the operator(s) of interest, to see where they are - # referenced. - - ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), ) - - DEMANGLED_REGEXP := [^:]operator (new|delete) - - # Running c++filt to find offending symbols in all files is too expensive, - # especially on Solaris, so use mangled names when looking for symbols. - # Save the demangling for when something is actually found. - ifeq ($(TOOLCHAIN_TYPE), solstudio) - MANGLED_SYMS := \ - __1c2n6FL_pv_ \ - __1c2N6FL_pv_ \ - __1c2k6Fpv_v_ \ - __1c2K6Fpv_v_ \ - # - UNDEF_PATTERN := UNDEF - else - MANGLED_SYMS := \ - _ZdaPv \ - _ZdlPv \ - _Znam \ - _Znwm \ - # - UNDEF_PATTERN := ' U ' - endif - - define SetupOperatorNewDeleteCheck - $1.op_check: $1 - if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \ - | $(GREP) $(UNDEF_PATTERN)`" ]; then \ - $(ECHO) "$$<: Error: Use of global operators new and delete is not allowed in Hotspot:"; \ - $(NM) $$< | $(CXXFILT) | $(EGREP) '$(DEMANGLED_REGEXP)' | $(GREP) $(UNDEF_PATTERN); \ - $(ECHO) "See: $(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \ - exit 1; \ - fi - $(TOUCH) $$@ - - TARGETS += $1.op_check - endef - - $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o))) - endif --- 89,97 ----
< prev index next >