< 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

*** 58,73 **** -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \ -I$(HOTSPOT_TOPDIR)/src/share/vm/precompiled \ -I$(HOTSPOT_TOPDIR)/src/share/vm/prims \ # JVM_CFLAGS_TARGET_DEFINES += \ - -DTARGET_OS_FAMILY_$(HOTSPOT_TARGET_OS) \ - -DTARGET_ARCH_MODEL_$(HOTSPOT_TARGET_CPU) \ -DTARGET_ARCH_$(HOTSPOT_TARGET_CPU_ARCH) \ ! -DTARGET_OS_ARCH_MODEL_$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU) \ ! -DTARGET_OS_ARCH_$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \ -DTARGET_COMPILER_$(HOTSPOT_TOOLCHAIN_TYPE) \ -D$(HOTSPOT_TARGET_CPU_DEFINE) \ -DHOTSPOT_LIB_ARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' \ # --- 58,76 ---- -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \ -I$(HOTSPOT_TOPDIR)/src/share/vm/precompiled \ -I$(HOTSPOT_TOPDIR)/src/share/vm/prims \ # + # INCLUDE_SUFFIX_* is only meant for including the proper + # platform files. Don't use it to guard code. Use the value of + # HOTSPOT_TARGET_CPU_DEFINE etc. instead. + # Remaining TARGET_ARCH_* is needed to distinguish closed and open + # 64-bit ARM ports (also called AARCH64). JVM_CFLAGS_TARGET_DEFINES += \ -DTARGET_ARCH_$(HOTSPOT_TARGET_CPU_ARCH) \ ! -DINCLUDE_SUFFIX_OS=_$(HOTSPOT_TARGET_OS) \ ! -DINCLUDE_SUFFIX_CPU=_$(HOTSPOT_TARGET_CPU_ARCH) \ -DTARGET_COMPILER_$(HOTSPOT_TOOLCHAIN_TYPE) \ -D$(HOTSPOT_TARGET_CPU_DEFINE) \ -DHOTSPOT_LIB_ARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' \ #
< prev index next >