Merge branch 'master' of https://github.com/openjdk/jdk into fix/cons…

…tant-moving

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
 

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 \
     )
 
 ################################################################################

make/CreateJmods.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2024, 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
@@ -229,8 +229,21 @@ ifeq ($(INTERIM_JMOD), true)
   # Interim JMODs are not shipped anywhere, so there is no reason
   # to compress them at all.
   JMOD_FLAGS += --compress zip-0
+
+  JMOD_TARGET_OS := $(OPENJDK_BUILD_OS)
+  ifeq ($(JMOD_TARGET_OS), macosx)
+    JMOD_TARGET_OS := macos
+  endif
+
+  JMOD_TARGET_CPU := $(OPENJDK_BUILD_CPU)
+  ifeq ($(JMOD_TARGET_CPU), x86_64)
+    JMOD_TARGET_CPU := amd64
+  endif
+
+  JMOD_TARGET_PLATFORM := $(JMOD_TARGET_OS)-$(JMOD_TARGET_CPU)
 else
   JMOD_FLAGS += --compress $(JMOD_COMPRESS)
+  JMOD_TARGET_PLATFORM := $(OPENJDK_MODULE_TARGET_PLATFORM)
 endif
 
 # Create jmods in the support dir and then move them into place to keep the
@@ -242,7 +255,7 @@ $(eval $(call SetupExecute, create_$(JMOD_FILE), \
     SUPPORT_DIR := $(JMODS_SUPPORT_DIR), \
     PRE_COMMAND := $(RM) $(JMODS_DIR)/$(JMOD_FILE) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \
     COMMAND := $(JMOD) $(JMOD_SMALL_FLAGS) create --module-version $(VERSION_SHORT) \
-        --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
+        --target-platform '$(JMOD_TARGET_PLATFORM)' \
         --module-path $(JMODS_DIR) $(JMOD_FLAGS) \
         --date $(SOURCE_DATE_ISO_8601) \
         $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \

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))))

make/InterimImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, 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
@@ -46,10 +46,12 @@ $(INTERIM_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, INTERIM_MODULES_LIST)
 	$(call LogWarn, Creating interim jimage)
 	$(RM) -r $(INTERIM_IMAGE_DIR)
-	$(JLINK_TOOL) \
+	$(call MakeDir, $(INTERIM_IMAGE_DIR))
+	$(call ExecuteWithLog, $(INTERIM_IMAGE_DIR)/jlink, \
+	    $(JLINK_TOOL) \
 	    --output $(INTERIM_IMAGE_DIR) \
 	    --disable-plugin generate-jli-classes \
-	    --add-modules $(INTERIM_MODULES_LIST)
+	    --add-modules $(INTERIM_MODULES_LIST))
 	$(TOUCH) $@
 
 TARGETS += $(INTERIM_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)

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

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

make/autoconf/flags-cflags.m4

@@ -242,6 +242,8 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       WARNINGS_ENABLE_ALL_CFLAGS="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
 
+      # These warnings will never be turned on, since they generate too many
+      # false positives.
       DISABLED_WARNINGS="unused-parameter"
       # gcc10/11 on ppc generate lots of abi warnings about layout of aggregates containing vectors
       if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
@@ -259,7 +261,9 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
           -Wunused-function -Wundef -Wunused-value -Woverloaded-virtual"
       WARNINGS_ENABLE_ALL="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
 
-      DISABLED_WARNINGS="unknown-warning-option unused-parameter unused"
+      # These warnings will never be turned on, since they generate too many
+      # false positives.
+      DISABLED_WARNINGS="unknown-warning-option unused-parameter"
       ;;
   esac
   AC_SUBST(DISABLE_WARNING_PREFIX)

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"

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

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)

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])

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
 

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

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

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.])

make/autoconf/toolchain_microsoft.m4

@@ -161,7 +161,7 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
   # version, pass -vcvars_ver=<toolset_version> 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"

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.

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
 

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.

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

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.