diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk index 1a8b6382f81..dbb23de093c 100644 --- a/make/CompileInterimLangtools.gmk +++ b/make/CompileInterimLangtools.gmk @@ -65,7 +65,7 @@ $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.ja $(SED) $(INTERIM_TOOL_PROVIDER_PATTERN) $< > $@ java.compiler.interim_EXTRA_FILES := \ - $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java + $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java TARGETS += $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index b1b7a83498d..62c91ee5f78 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -75,12 +75,12 @@ $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.pr CreateHkTargets = \ $(call FilterExcludedTranslations, \ - $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \ - $(subst /share/classes,, \ - $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \ - ) \ - ), \ - .properties \ + $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \ + $(subst /share/classes,, \ + $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \ + ) \ + ), \ + .properties \ ) ################################################################################ diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk index ed9cd136c3f..6dd29b1db10 100644 --- a/make/InitSupport.gmk +++ b/make/InitSupport.gmk @@ -205,7 +205,7 @@ ifeq ($(HAS_SPEC),) ifeq ($$(patsubst !%,,$$(CONF)),) # A CONF starting with ! means we should negate the search term matching_confs := $$(strip $$(foreach var, $$(all_confs), \ - $$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var)))) + $$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var)))) else matching_confs := $$(strip $$(foreach var, $$(all_confs), \ $$(if $$(findstring $$(CONF), $$(var)), $$(var)))) diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4 index 0c084561f2e..884d0ea5aa5 100644 --- a/make/autoconf/basic_tools.m4 +++ b/make/autoconf/basic_tools.m4 @@ -129,7 +129,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION], if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then MAKE_VERSION_EXPR="-e 4\." MAKE_REQUIRED_VERSION="4.0" - else + else MAKE_VERSION_EXPR="-e 3\.8[[12]] -e 4\." MAKE_REQUIRED_VERSION="3.81" fi diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4 index 8d272c28ad5..126eb45bb1a 100644 --- a/make/autoconf/boot-jdk.m4 +++ b/make/autoconf/boot-jdk.m4 @@ -602,11 +602,12 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK], BUILD_JDK_FOUND="no" if test "x$with_build_jdk" != "x"; then BOOTJDK_CHECK_BUILD_JDK([ - if test "x$with_build_jdk" != x; then - BUILD_JDK=$with_build_jdk - BUILD_JDK_FOUND=maybe - AC_MSG_NOTICE([Found potential Build JDK using configure arguments]) - fi]) + if test "x$with_build_jdk" != x; then + BUILD_JDK=$with_build_jdk + BUILD_JDK_FOUND=maybe + AC_MSG_NOTICE([Found potential Build JDK using configure arguments]) + fi + ]) EXTERNAL_BUILDJDK=true else if test "x$COMPILE_TYPE" = "xcross"; then diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4 index fab8bec789b..8183a0af7d0 100644 --- a/make/autoconf/flags-ldflags.m4 +++ b/make/autoconf/flags-ldflags.m4 @@ -168,9 +168,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP], # MIPS ABI does not support GNU hash style if test "x${OPENJDK_$1_CPU}" = xmips || - test "x${OPENJDK_$1_CPU}" = xmipsel || - test "x${OPENJDK_$1_CPU}" = xmips64 || - test "x${OPENJDK_$1_CPU}" = xmips64el; then + test "x${OPENJDK_$1_CPU}" = xmipsel || + test "x${OPENJDK_$1_CPU}" = xmips64 || + test "x${OPENJDK_$1_CPU}" = xmips64el; then $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=sysv" else $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=gnu" diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index 76e95127f73..fac7f76de23 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -235,8 +235,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], else HOTSPOT_OVERRIDE_LIBPATH=${with_jni_libpath} if test "x$OPENJDK_TARGET_OS" != "xlinux" && - test "x$OPENJDK_TARGET_OS" != "xbsd" && - test "x$OPENJDK_TARGET_OS" != "xaix"; then + test "x$OPENJDK_TARGET_OS" != "xbsd" && + test "x$OPENJDK_TARGET_OS" != "xaix"; then AC_MSG_RESULT([fail]) AC_MSG_ERROR([Overriding JNI library path is supported only on Linux, BSD and AIX.]) fi @@ -421,8 +421,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER], CHECK_AVAILABLE: [ AC_MSG_CHECKING([if AddressSanitizer (asan) is available]) if test "x$TOOLCHAIN_TYPE" = "xgcc" || - test "x$TOOLCHAIN_TYPE" = "xclang" || - test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then + test "x$TOOLCHAIN_TYPE" = "xclang" || + test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -431,7 +431,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER], ], IF_ENABLED: [ if test "x$TOOLCHAIN_TYPE" = "xgcc" || - test "x$TOOLCHAIN_TYPE" = "xclang"; then + test "x$TOOLCHAIN_TYPE" = "xclang"; then # ASan is simply incompatible with gcc -Wstringop-truncation. See # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85650 # It's harmless to be suppressed in clang as well. @@ -707,9 +707,8 @@ AC_DEFUN([JDKOPT_ALLOW_ABSOLUTE_PATHS_IN_OUTPUT], [ AC_ARG_ENABLE([absolute-paths-in-output], [AS_HELP_STRING([--disable-absolute-paths-in-output], - [Set to disable to prevent any absolute paths from the build to end up in - any of the build output. @<:@disabled in release builds, otherwise enabled@:>@]) - ]) + [Set to disable to prevent any absolute paths from the build to end up in + any of the build output. @<:@disabled in release builds, otherwise enabled@:>@])]) AC_MSG_CHECKING([if absolute paths should be allowed in the build output]) if test "x$enable_absolute_paths_in_output" = "xno"; then diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4 index 7c9ecad7779..7f73a085bd7 100644 --- a/make/autoconf/jdk-version.m4 +++ b/make/autoconf/jdk-version.m4 @@ -93,7 +93,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS], UTIL_ARG_WITH(NAME: jdk-rc-name, TYPE: string, DEFAULT: $PRODUCT_NAME $JDK_RC_PLATFORM_NAME, DESC: [Set JDK RC name. This is used for FileDescription and ProductName - properties of MS Windows binaries.], + properties of MS Windows binaries.], DEFAULT_DESC: [from branding.conf], CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE]) AC_SUBST(JDK_RC_NAME) @@ -105,7 +105,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS], RESULT: COMPANY_NAME, DEFAULT: $COMPANY_NAME, DESC: [Set vendor name. Among others, used to set the 'java.vendor' - and 'java.vm.vendor' system properties.], + and 'java.vm.vendor' system properties.], DEFAULT_DESC: [from branding.conf], CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE]) AC_SUBST(COMPANY_NAME) diff --git a/make/autoconf/lib-bundled.m4 b/make/autoconf/lib-bundled.m4 index 3e0217ac6bd..6987250e906 100644 --- a/make/autoconf/lib-bundled.m4 +++ b/make/autoconf/lib-bundled.m4 @@ -119,7 +119,7 @@ AC_DEFUN_ONCE([LIB_SETUP_GIFLIB], AC_DEFUN_ONCE([LIB_SETUP_LIBPNG], [ AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng], - [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) + [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) PKG_CHECK_MODULES(PNG, libpng, [LIBPNG_FOUND=yes], [LIBPNG_FOUND=no]) AC_MSG_CHECKING([for which libpng to use]) diff --git a/make/autoconf/lib-freetype.m4 b/make/autoconf/lib-freetype.m4 index 6a710934247..9171b7bfc2a 100644 --- a/make/autoconf/lib-freetype.m4 +++ b/make/autoconf/lib-freetype.m4 @@ -73,11 +73,11 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE], [ AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype], [specify whether to use 'system' or 'bundled' freetype. - The selected option applies to both build time and run time. - The default behaviour can be platform dependent. - If using 'system' and either the include files or libraries cannot be - located automatically, then additionally specify both using - --with-freetype-include and --with-freetype-lib.])]) + The selected option applies to both build time and run time. + The default behaviour can be platform dependent. + If using 'system' and either the include files or libraries cannot be + located automatically, then additionally specify both using + --with-freetype-include and --with-freetype-lib.])]) AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include], [specify directory for the freetype include files])]) AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib], @@ -95,8 +95,10 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE], FREETYPE_CFLAGS= FREETYPE_LIBS= - if (test "x$with_freetype_include" = "x" && test "x$with_freetype_lib" != "x") || \ - (test "x$with_freetype_include" != "x" && test "x$with_freetype_lib" = "x"); then + if (test "x$with_freetype_include" = "x" && \ + test "x$with_freetype_lib" != "x") || \ + (test "x$with_freetype_include" != "x" && \ + test "x$with_freetype_lib" = "x"); then AC_MSG_ERROR([Must specify both or neither of --with-freetype-include and --with-freetype-lib]) fi @@ -126,8 +128,8 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE], fi if test "x$FREETYPE_TO_USE" = "xsystem" && \ - (test "x$OPENJDK_TARGET_OS" = "xwindows" || \ - test "x$OPENJDK_TARGET_OS" = "xmacosx"); then + (test "x$OPENJDK_TARGET_OS" = "xwindows" || \ + test "x$OPENJDK_TARGET_OS" = "xmacosx"); then AC_MSG_ERROR([Only bundled freetype can be specified on Mac and Windows]) fi diff --git a/make/autoconf/lib-hsdis.m4 b/make/autoconf/lib-hsdis.m4 index 9b9f24d0da1..bd78768d03e 100644 --- a/make/autoconf/lib-hsdis.m4 +++ b/make/autoconf/lib-hsdis.m4 @@ -163,8 +163,8 @@ AC_DEFUN([LIB_BUILD_BINUTILS], # We don't know the version, not checking for libsframe.a if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \ - test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \ - test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then + test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \ + test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then AC_MSG_NOTICE([Found binutils binaries in binutils install directory -- not building]) else # On Windows, we cannot build with the normal Microsoft CL, but must instead use @@ -267,8 +267,10 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS], elif test "x$BINUTILS_INSTALL_DIR" != x; then disasm_header="\"$BINUTILS_INSTALL_DIR/include/dis-asm.h\"" if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \ - test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \ - (test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib32/libiberty.a); then + test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \ + (test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || \ + test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a || \ + test -e $BINUTILS_INSTALL_DIR/lib32/libiberty.a); then HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB -I$BINUTILS_INSTALL_DIR/include" # libiberty ignores --libdir and may be installed in $BINUTILS_INSTALL_DIR/lib, $BINUTILS_INSTALL_DIR/lib32 diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index e29ef2221a6..b68fef7bbba 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 @@ -99,12 +99,12 @@ AC_DEFUN([LIB_SETUP_JVM_LIBS], if HOTSPOT_CHECK_JVM_VARIANT(zero); then if test "x$OPENJDK_$1_OS" = xlinux && (test "x$OPENJDK_$1_CPU" = xarm || - test "x$OPENJDK_$1_CPU" = xm68k || - test "x$OPENJDK_$1_CPU" = xmips || - test "x$OPENJDK_$1_CPU" = xmipsel || - test "x$OPENJDK_$1_CPU" = xppc || - test "x$OPENJDK_$1_CPU" = xsh || - test "x$OPENJDK_$1_CPU" = xriscv32); then + test "x$OPENJDK_$1_CPU" = xm68k || + test "x$OPENJDK_$1_CPU" = xmips || + test "x$OPENJDK_$1_CPU" = xmipsel || + test "x$OPENJDK_$1_CPU" = xppc || + test "x$OPENJDK_$1_CPU" = xsh || + test "x$OPENJDK_$1_CPU" = xriscv32); then BASIC_JVM_LIBS_$1="$BASIC_JVM_LIBS_$1 -latomic" fi fi diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4 index df610cc489b..4d84269d697 100644 --- a/make/autoconf/platform.m4 +++ b/make/autoconf/platform.m4 @@ -390,7 +390,7 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD], AC_DEFUN([PLATFORM_SETUP_TARGET_CPU_BITS], [ AC_ARG_WITH(target-bits, [AS_HELP_STRING([--with-target-bits], - [build 32-bit or 64-bit binaries (for platforms that support it), e.g. --with-target-bits=32 @<:@guessed@:>@])]) + [build 32-bit or 64-bit binaries (for platforms that support it), e.g. --with-target-bits=32 @<:@guessed@:>@])]) # We have three types of compiles: # native == normal compilation, target system == build system @@ -665,7 +665,7 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET], AC_DEFUN([PLATFORM_CHECK_DEPRECATION], [ AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@], - [Suppress the error when configuring for a deprecated port @<:@no@:>@])]) + [Suppress the error when configuring for a deprecated port @<:@no@:>@])]) if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then if test "x$enable_deprecated_ports" = "xyes"; then AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.]) diff --git a/make/autoconf/toolchain_microsoft.m4 b/make/autoconf/toolchain_microsoft.m4 index 51bba487192..387e3717718 100644 --- a/make/autoconf/toolchain_microsoft.m4 +++ b/make/autoconf/toolchain_microsoft.m4 @@ -161,7 +161,7 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE], # version, pass -vcvars_ver= argument to vcvarsall.bat. AC_ARG_WITH(msvc-toolset-version, [AS_HELP_STRING([--with-msvc-toolset-version], [specific MSVC toolset version to use, passed as -vcvars_ver argument to - pass to vcvarsall.bat (Windows only)])]) + pass to vcvarsall.bat (Windows only)])]) TARGET_CPU="$1" VS_VERSION="$2" diff --git a/make/common/FindTests.gmk b/make/common/FindTests.gmk index b12630349c0..14f0ef0b431 100644 --- a/make/common/FindTests.gmk +++ b/make/common/FindTests.gmk @@ -56,7 +56,7 @@ $(foreach root, $(JTREG_TESTROOTS), \ $(eval include $(root)/TEST.ROOT) \ $(eval $(root)_JTREG_GROUP_FILES := $$(addprefix $(root)/, $$(groups))) \ $(eval JTREG_GROUP_FILES += $$($(root)_JTREG_GROUP_FILES)) \ - ) \ + ) \ ) # Cache the expensive to calculate test names in a generated makefile. diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk index ca363f7cb54..927def164be 100644 --- a/make/common/JavaCompilation.gmk +++ b/make/common/JavaCompilation.gmk @@ -255,9 +255,9 @@ define SetupJavaCompilationBody $1_JAVAC := $$(INTERIM_LANGTOOLS_ARGS) -m jdk.compiler.interim/com.sun.tools.javac.Main ifeq ($$($1_SMALL_JAVA), true) - $1_JAVAC_CMD := $$(JAVA_SMALL) $$($1_JAVA_FLAGS) $$($1_JAVAC) + $1_JAVAC_CMD := $$(JAVA_SMALL) $$($1_JAVA_FLAGS) $$($1_JAVAC) else - $1_JAVAC_CMD := $$(JAVA) $$($1_JAVA_FLAGS) $$($1_JAVAC) + $1_JAVAC_CMD := $$(JAVA) $$($1_JAVA_FLAGS) $$($1_JAVAC) endif endif diff --git a/make/common/JdkNativeCompilation.gmk b/make/common/JdkNativeCompilation.gmk index 846597ecee9..78b2444e3ba 100644 --- a/make/common/JdkNativeCompilation.gmk +++ b/make/common/JdkNativeCompilation.gmk @@ -196,10 +196,10 @@ define AddJdkLibrary # Determine if the library in question is static. # Ideally, we should not hardcode these ifeq ($(call isTargetOs, aix)+$$($1_$2_MODULE):$$($1_$2_NAME), true+java.base:jli) - $1_$2_STATIC_LIBRARY := true + $1_$2_STATIC_LIBRARY := true endif ifeq ($$($1_$2_MODULE):$$($1_$2_NAME), gtest:gtest) - $1_$2_STATIC_LIBRARY := true + $1_$2_STATIC_LIBRARY := true endif # Setup $1_$2_LIBPATH. diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk index 5af1967e54b..c780a6c1728 100644 --- a/make/common/MakeBase.gmk +++ b/make/common/MakeBase.gmk @@ -247,7 +247,7 @@ DependOnVariableFileName = \ DependOnVariableWriteFile = \ $(call MakeDir, $(dir $($1_filename))) \ $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ - $($1_filename)) \ + $($1_filename)) \ # Does the actual work with parameters stripped. # If the file exists AND the contents is the same as the variable, do nothing diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index fa885dacb6d..e6c1609cecb 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -221,7 +221,7 @@ FindTransitiveDepsForModule = \ $(foreach m, $(call FindDepsForModule, $1), \ $(call FindDepsForModule, $m) \ $(foreach n, $(call FindDepsForModule, $m), \ - $(call FindDepsForModule, $n)))) + $(call FindDepsForModule, $n)))) # Find dependencies ("requires") transitively in 3 levels for a set of modules. # Param 1: List of modules to find dependencies for. @@ -240,7 +240,7 @@ FindTransitiveIndirectDepsForModule = \ $(foreach m, $(call FindIndirectExportsForModule, $1), \ $(call FindIndirectExportsForModule, $m) \ $(foreach n, $(call FindIndirectExportsForModule, $m), \ - $(call FindIndirectExportsForModule, $n)))) + $(call FindIndirectExportsForModule, $n)))) # Finds indirect exported modules transitively in 3 levels for a set of modules. # Param 1: List of modules to find indirect exported modules for. diff --git a/make/common/Utils.gmk b/make/common/Utils.gmk index 7f1cbd61f38..ea853919de5 100644 --- a/make/common/Utils.gmk +++ b/make/common/Utils.gmk @@ -270,11 +270,11 @@ Or = \ ifeq ($(IS_GNU_DATE), yes) EpochToISO8601 = \ $(shell $(DATE) --utc --date="@$(strip $1)" \ - +"$(ISO_8601_FORMAT_STRING)" 2> /dev/null) + +"$(ISO_8601_FORMAT_STRING)" 2> /dev/null) else EpochToISO8601 = \ $(shell $(DATE) -u -j -f "%s" "$(strip $1)" \ - +"$(ISO_8601_FORMAT_STRING)" 2> /dev/null) + +"$(ISO_8601_FORMAT_STRING)" 2> /dev/null) endif ################################################################################ diff --git a/make/common/native/DebugSymbols.gmk b/make/common/native/DebugSymbols.gmk index 7e014f416d6..f7a5a4021e2 100644 --- a/make/common/native/DebugSymbols.gmk +++ b/make/common/native/DebugSymbols.gmk @@ -94,7 +94,7 @@ define CreateDebugSymbols $1 += $$($1_DEBUGINFO_ZIP) endif - endif # !STATIC_LIBRARY + endif # !STATIC_LIBRARY endif # $1_DEBUG_SYMBOLS != false endif # COPY_DEBUG_SYMBOLS endef diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk index 4c37fd1ebe6..8dada3cec0a 100644 --- a/make/hotspot/gensrc/GensrcAdlc.gmk +++ b/make/hotspot/gensrc/GensrcAdlc.gmk @@ -204,11 +204,11 @@ ifeq ($(call check-jvm-feature, compiler2), true) INSERT_FILENAME_AWK_SCRIPT := \ '{ \ - if (CUR_FN != FILENAME) { CUR_FN=FILENAME; NR_BASE=NR-1; need_lineno=1 } \ - if (need_lineno && $$0 !~ /\/\//) \ - { print "\n\n\#line " (NR-NR_BASE) " \"" FILENAME "\""; need_lineno=0 }; \ - print \ - }' + if (CUR_FN != FILENAME) { CUR_FN=FILENAME; NR_BASE=NR-1; need_lineno=1 } \ + if (need_lineno && $$0 !~ /\/\//) \ + { print "\n\n\#line " (NR-NR_BASE) " \"" FILENAME "\""; need_lineno=0 }; \ + print \ + }' $(SINGLE_AD_SRCFILE): $(AD_SRC_FILES) $(call LogInfo, Preprocessing adlc files $(^F)) diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk index a0136870d8c..c4c030810fc 100644 --- a/make/hotspot/lib/JvmFeatures.gmk +++ b/make/hotspot/lib/JvmFeatures.gmk @@ -47,9 +47,10 @@ endif ifeq ($(call check-jvm-feature, zero), true) JVM_EXCLUDES += opto libadt JVM_EXCLUDE_PATTERNS += c1_ c1/ c2_ runtime_ /c2/ - JVM_EXCLUDE_FILES += templateInterpreter.cpp templateInterpreterGenerator.cpp \ - bcEscapeAnalyzer.cpp ciTypeFlow.cpp - JVM_CFLAGS_FEATURES += -DZERO -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS) + JVM_EXCLUDE_FILES += templateInterpreter.cpp \ + templateInterpreterGenerator.cpp bcEscapeAnalyzer.cpp ciTypeFlow.cpp + JVM_CFLAGS_FEATURES += -DZERO \ + -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS) JVM_LIBS_FEATURES += $(LIBFFI_LIBS) ifeq ($(ENABLE_LIBFFI_BUNDLING), true) JVM_LDFLAGS_FEATURES += $(call SET_EXECUTABLE_ORIGIN,/..) @@ -69,7 +70,8 @@ endif ifeq ($(call check-jvm-feature, minimal), true) JVM_CFLAGS_FEATURES += -DMINIMAL_JVM -DVMTYPE=\"Minimal\" ifeq ($(call isTargetOs, linux), true) - # Override the default -g with a more liberal strip policy for the minimal JVM + # Override the default -g with a more liberal strip policy for the + # minimal JVM JVM_STRIPFLAGS := --strip-unneeded endif endif @@ -80,11 +82,14 @@ endif ifneq ($(call check-jvm-feature, jvmti), true) JVM_CFLAGS_FEATURES += -DINCLUDE_JVMTI=0 - JVM_EXCLUDE_FILES += jvmtiGetLoadedClasses.cpp jvmtiThreadState.cpp jvmtiExtensions.cpp \ - jvmtiImpl.cpp jvmtiManageCapabilities.cpp jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp \ - jvmtiCodeBlobEvents.cpp jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp jvmtiEnvThreadState.cpp \ - jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \ - jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp jvmtiAgentList.cpp jfrJvmtiAgent.cpp + JVM_EXCLUDE_FILES += jvmtiGetLoadedClasses.cpp jvmtiThreadState.cpp \ + jvmtiExtensions.cpp jvmtiImpl.cpp jvmtiManageCapabilities.cpp \ + jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp jvmtiCodeBlobEvents.cpp \ + jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp \ + jvmtiEnvThreadState.cpp jvmtiTagMap.cpp jvmtiEventController.cpp \ + evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \ + jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp \ + jvmtiAgentList.cpp jfrJvmtiAgent.cpp endif ifneq ($(call check-jvm-feature, jvmci), true) @@ -166,8 +171,10 @@ ifeq ($(call check-jvm-feature, link-time-opt), true) # later on if desired JVM_OPTIMIZATION := HIGHEST_JVM ifeq ($(call isCompiler, gcc), true) - JVM_CFLAGS_FEATURES += -flto=auto -fuse-linker-plugin -fno-strict-aliasing -fno-fat-lto-objects - JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto=auto -fuse-linker-plugin -fno-strict-aliasing + JVM_CFLAGS_FEATURES += -flto=auto -fuse-linker-plugin -fno-strict-aliasing \ + -fno-fat-lto-objects + JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto=auto \ + -fuse-linker-plugin -fno-strict-aliasing else ifeq ($(call isCompiler, microsoft), true) JVM_CFLAGS_FEATURES += -GL JVM_LDFLAGS_FEATURES += -LTCG:INCREMENTAL diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk index c25c07ae242..51147b71af9 100644 --- a/make/modules/java.desktop/lib/ClientLibraries.gmk +++ b/make/modules/java.desktop/lib/ClientLibraries.gmk @@ -281,51 +281,51 @@ endif ################################################################################ ifeq ($(USE_EXTERNAL_HARFBUZZ), true) - LIBFONTMANAGER_EXTRA_SRC = - LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS) - LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) + LIBFONTMANAGER_EXTRA_SRC = + LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS) + LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) else - LIBFONTMANAGER_EXTRA_SRC = libharfbuzz + LIBFONTMANAGER_EXTRA_SRC = libharfbuzz - ifeq ($(call isTargetOs, windows), false) - HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \ + ifeq ($(call isTargetOs, windows), false) + HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \ -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \ -DHB_NO_PRAGMA_GCC_DIAGNOSTIC - endif - ifeq ($(call isTargetOs, linux macosx), true) - HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY - endif + endif + ifeq ($(call isTargetOs, linux macosx), true) + HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY + endif - # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later. - # hb-subset and hb-style APIs are not needed, excluded to cut on compilation - # time. - LIBFONTMANAGER_EXCLUDE_FILES += gsubgpos-context.cc hb-ft.cc hb-style.cc \ + # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later. + # hb-subset and hb-style APIs are not needed, excluded to cut on compilation + # time. + LIBFONTMANAGER_EXCLUDE_FILES += gsubgpos-context.cc hb-ft.cc hb-style.cc \ hb-subset-cff-common.cc hb-subset-cff1.cc hb-subset-cff2.cc \ hb-subset-input.cc hb-subset-instancer-solver.cc hb-subset-plan.cc \ hb-subset.cc - # list of disabled warnings and the compilers for which it was specifically - # added. - # array-bounds -> GCC 12 on Alpine Linux - # parentheses -> GCC 6 - # range-loop-analysis -> clang on Xcode12 + # list of disabled warnings and the compilers for which it was specifically + # added. + # array-bounds -> GCC 12 on Alpine Linux + # parentheses -> GCC 6 + # range-loop-analysis -> clang on Xcode12 - HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers \ - strict-aliasing unused-result array-bounds parentheses \ + HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers \ + strict-aliasing unused-result array-bounds parentheses \ unused-variable - # noexcept-type required for GCC 7 builds. Not required for GCC 8+. - # expansion-to-defined required for GCC 9 builds. Not required for GCC 10+. - # maybe-uninitialized required for GCC 8 builds. Not required for GCC 9+. - # calloc-transposed-args required for GCC 14 builds. (fixed upstream in - # Harfbuzz 032c931e1c0cfb20f18e5acb8ba005775242bd92) - HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess noexcept-type \ - expansion-to-defined dangling-reference maybe-uninitialized \ - calloc-transposed-args - HARFBUZZ_DISABLED_WARNINGS_clang := missing-field-initializers \ + # noexcept-type required for GCC 7 builds. Not required for GCC 8+. + # expansion-to-defined required for GCC 9 builds. Not required for GCC 10+. + # maybe-uninitialized required for GCC 8 builds. Not required for GCC 9+. + # calloc-transposed-args required for GCC 14 builds. (fixed upstream in + # Harfbuzz 032c931e1c0cfb20f18e5acb8ba005775242bd92) + HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess noexcept-type \ + expansion-to-defined dangling-reference maybe-uninitialized \ + calloc-transposed-args + HARFBUZZ_DISABLED_WARNINGS_clang := missing-field-initializers \ range-loop-analysis - HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244 + HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244 - LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) + LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) endif LIBFONTMANAGER_EXTRA_HEADER_DIRS := \ diff --git a/make/modules/jdk.accessibility/Launcher.gmk b/make/modules/jdk.accessibility/Launcher.gmk index 6ea52b244d7..2499cf56616 100644 --- a/make/modules/jdk.accessibility/Launcher.gmk +++ b/make/modules/jdk.accessibility/Launcher.gmk @@ -93,7 +93,7 @@ ifeq ($(call isTargetOs, windows), true) LIBS_windows := advapi32.lib comctl32.lib gdi32.lib user32.lib, \ VERSIONINFO_RESOURCE := \ $(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \ - )) + )) TARGETS += $$(BUILD_JACCESSWALKER$1) endef