< prev index next >

make/lib/CompileJvm.gmk

Print this page
rev 11647 : 8161258: Simplify including platform files.
Summary: Include patform files with macros cpu_header() etc. Do various cleanups of macro usages. Remove _64/_32 from adlc generated files and platform .hpp files. Merge stubRoutines_x86*.hpp. Remove empty mutex_<os>* files.
Reviewed-by: dholmes, coleenp, kbarrett


  43 JVM_SRC_ROOTS += $(HOTSPOT_TOPDIR)/src
  44 
  45 JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \
  46         $d/share/vm \
  47         $d/os/$(HOTSPOT_TARGET_OS)/vm \
  48         $d/os/$(HOTSPOT_TARGET_OS_TYPE)/vm \
  49         $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/vm \
  50         $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH)/vm \
  51     ))) \
  52     $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles \
  53     $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles \
  54     #
  55 
  56 JVM_CFLAGS_INCLUDES += \
  57     $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \
  58     -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \
  59     -I$(HOTSPOT_TOPDIR)/src/share/vm/precompiled \
  60     -I$(HOTSPOT_TOPDIR)/src/share/vm/prims \
  61     #
  62 





  63 JVM_CFLAGS_TARGET_DEFINES += \
  64     -DTARGET_OS_FAMILY_$(HOTSPOT_TARGET_OS) \
  65     -DTARGET_ARCH_MODEL_$(HOTSPOT_TARGET_CPU) \
  66     -DTARGET_ARCH_$(HOTSPOT_TARGET_CPU_ARCH) \
  67     -DTARGET_OS_ARCH_MODEL_$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU) \
  68     -DTARGET_OS_ARCH_$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \
  69     -DTARGET_COMPILER_$(HOTSPOT_TOOLCHAIN_TYPE) \
  70     -D$(HOTSPOT_TARGET_CPU_DEFINE) \
  71     -DHOTSPOT_LIB_ARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' \
  72     #
  73 
  74 ifeq ($(DEBUG_LEVEL), release)
  75   # For hotspot, release builds differ internally between "optimized" and "product"
  76   # in that "optimize" does not define PRODUCT.
  77   ifneq ($(HOTSPOT_DEBUG_LEVEL), optimized)
  78     JVM_CFLAGS_DEBUGLEVEL := -DPRODUCT
  79   endif
  80 else ifeq ($(DEBUG_LEVEL), fastdebug)
  81   JVM_CFLAGS_DEBUGLEVEL := -DASSERT
  82   ifeq ($(filter $(OPENJDK_TARGET_OS), windows aix), )
  83     # NOTE: Old build did not define CHECK_UNHANDLED_OOPS on Windows and AIX.
  84     JVM_CFLAGS_DEBUGLEVEL += -DCHECK_UNHANDLED_OOPS
  85   endif
  86 else ifeq ($(DEBUG_LEVEL), slowdebug)
  87   # _NMT_NOINLINE_ informs NMT that no inlining is done by the compiler
  88   JVM_CFLAGS_DEBUGLEVEL := -DASSERT -D_NMT_NOINLINE_




  43 JVM_SRC_ROOTS += $(HOTSPOT_TOPDIR)/src
  44 
  45 JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \
  46         $d/share/vm \
  47         $d/os/$(HOTSPOT_TARGET_OS)/vm \
  48         $d/os/$(HOTSPOT_TARGET_OS_TYPE)/vm \
  49         $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/vm \
  50         $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH)/vm \
  51     ))) \
  52     $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles \
  53     $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles \
  54     #
  55 
  56 JVM_CFLAGS_INCLUDES += \
  57     $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \
  58     -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \
  59     -I$(HOTSPOT_TOPDIR)/src/share/vm/precompiled \
  60     -I$(HOTSPOT_TOPDIR)/src/share/vm/prims \
  61     #
  62 
  63 # INCLUDE_SUFFIX_* is only meant for including the proper
  64 # platform files. Don't use it to guard code. Use the value of
  65 # HOTSPOT_TARGET_CPU_DEFINE etc. instead.
  66 # Remaining TARGET_ARCH_* is needed to distinguish closed and open
  67 # 64-bit ARM ports (also called AARCH64).
  68 JVM_CFLAGS_TARGET_DEFINES += \


  69     -DTARGET_ARCH_$(HOTSPOT_TARGET_CPU_ARCH) \
  70     -DINCLUDE_SUFFIX_OS=_$(HOTSPOT_TARGET_OS) \
  71     -DINCLUDE_SUFFIX_CPU=_$(HOTSPOT_TARGET_CPU_ARCH) \
  72     -DTARGET_COMPILER_$(HOTSPOT_TOOLCHAIN_TYPE) \
  73     -D$(HOTSPOT_TARGET_CPU_DEFINE) \
  74     -DHOTSPOT_LIB_ARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' \
  75     #
  76 
  77 ifeq ($(DEBUG_LEVEL), release)
  78   # For hotspot, release builds differ internally between "optimized" and "product"
  79   # in that "optimize" does not define PRODUCT.
  80   ifneq ($(HOTSPOT_DEBUG_LEVEL), optimized)
  81     JVM_CFLAGS_DEBUGLEVEL := -DPRODUCT
  82   endif
  83 else ifeq ($(DEBUG_LEVEL), fastdebug)
  84   JVM_CFLAGS_DEBUGLEVEL := -DASSERT
  85   ifeq ($(filter $(OPENJDK_TARGET_OS), windows aix), )
  86     # NOTE: Old build did not define CHECK_UNHANDLED_OOPS on Windows and AIX.
  87     JVM_CFLAGS_DEBUGLEVEL += -DCHECK_UNHANDLED_OOPS
  88   endif
  89 else ifeq ($(DEBUG_LEVEL), slowdebug)
  90   # _NMT_NOINLINE_ informs NMT that no inlining is done by the compiler
  91   JVM_CFLAGS_DEBUGLEVEL := -DASSERT -D_NMT_NOINLINE_


< prev index next >