< prev index next >

make/hotspot/lib/CompileJvm.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2013, 2019, 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. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2013, 2018, 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. Oracle designates this
*** 54,66 **** # These files and directories are always excluded JVM_EXCLUDE_FILES += args.cc JVM_EXCLUDES += adlc # Needed by vm_version.cpp ! ifeq ($(call isTargetCpu, x86_64), true) OPENJDK_TARGET_CPU_VM_VERSION := amd64 ! else ifeq ($(call isTargetCpu, sparcv9), true) OPENJDK_TARGET_CPU_VM_VERSION := sparc else OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU) endif --- 54,66 ---- # 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 OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU) endif
*** 105,161 **** ################################################################################ # Platform specific setup # ARM source selection ! ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, arm)), true) JVM_EXCLUDE_PATTERNS += arm_64 ! else ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), true) # 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 ! ifeq ($(call isTargetOs, linux macosx windows), true) JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp endif ! ifeq ($(call isTargetCpu, x86), true) JVM_EXCLUDE_PATTERNS += x86_64 ! else ifeq ($(call isTargetCpu, x86_64), true) JVM_EXCLUDE_PATTERNS += x86_32 endif # Inline assembly for solaris ! ifeq ($(call isTargetOs, solaris), true) ! ifeq ($(call isTargetCpu, x86_64), true) JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.il ! else ifeq ($(call isTargetCpu, sparcv9), true) JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il endif # Exclude warnings in devstudio 12.6 ifeq ($(CC_VERSION_NUMBER), 5.15) DISABLED_WARNINGS_solstudio += SEC_ARR_OUTSIDE_BOUND_READ \ SEC_ARR_OUTSIDE_BOUND_WRITE endif endif ! ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpu, sparcv9)), true) 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 ($(call isTargetOs, windows), true) ! ifeq ($(call isTargetCpuBits, 64), true) RC_DESC := 64-Bit$(SPACE) endif JVM_RCFLAGS += -D"HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(RC_DESC)$(JVM_VARIANT) VM" endif --- 105,161 ---- ################################################################################ # 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 # Exclude warnings in devstudio 12.6 ifeq ($(CC_VERSION_NUMBER), 5.15) DISABLED_WARNINGS_solstudio += SEC_ARR_OUTSIDE_BOUND_READ \ SEC_ARR_OUTSIDE_BOUND_WRITE 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
*** 164,176 **** # 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) - # This source set is reused so save in cache. - $(call FillFindCache, $(JVM_SRC_DIRS)) - ################################################################################ # Now set up the actual compilation of the main hotspot native library $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \ NAME := jvm, \ --- 164,173 ----
*** 200,221 **** 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), \ - DEFINE_THIS_FILE := false, \ )) # Always recompile vm_version.cpp if libjvm needs to be relinked. This ensures # that the internal vm version is updated as it relies on __DATE__ and __TIME__ # macros. VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/vm_version$(OBJ_SUFFIX) $(VM_VERSION_OBJ): $(filter-out $(VM_VERSION_OBJ) $(JVM_MAPFILE), \ $(BUILD_LIBJVM_TARGET_DEPS)) ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) ! ifeq ($(call isTargetOs, windows), true) # 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), \ --- 197,217 ---- 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), \ )) # Always recompile vm_version.cpp if libjvm needs to be relinked. This ensures # that the internal vm version is updated as it relies on __DATE__ and __TIME__ # macros. VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/vm_version$(OBJ_SUFFIX) $(VM_VERSION_OBJ): $(filter-out $(VM_VERSION_OBJ) $(JVM_MAPFILE), \ $(BUILD_LIBJVM_TARGET_DEPS)) ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) ! 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), \
< prev index next >