Merge

Author: theaoqi

.github/actions/upload-bundles/action.yml

@@ -32,6 +32,9 @@ inputs:
   debug-suffix:
     description: 'File name suffix denoting debug level, possibly empty'
     required: false
+  bundle-suffix:
+    description: 'Bundle name suffix, possibly empty'
+    required: false
 
 runs:
   using: composite
@@ -75,7 +78,7 @@ runs:
     - name: 'Upload bundles artifact'
       uses: actions/upload-artifact@v4
       with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.bundle-suffix }}
         path: bundles
         retention-days: 1
       if: steps.bundles.outputs.bundles-found == 'true'

.github/workflows/build-linux.yml

@@ -61,6 +61,9 @@ on:
       make-arguments:
         required: false
         type: string
+      bundle-suffix:
+        required: false
+        type: string
 
 jobs:
   build-linux:
@@ -71,10 +74,6 @@ jobs:
       fail-fast: false
       matrix:
         debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
 
     steps:
       - name: 'Checkout the JDK source'
@@ -118,7 +117,7 @@ jobs:
         run: >
           bash configure
           --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
+          ${{ matrix.debug-level == 'debug' && '--with-debug-level=fastdebug' || '' }}
           --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-jtreg=${{ steps.jtreg.outputs.path }}
@@ -133,17 +132,14 @@ jobs:
       - name: 'Build'
         id: build
         uses: ./.github/actions/do-build
-        env:
-          # Only build static-libs-bundles for release builds.
-          # For debug builds, building static-libs often exceeds disk space.
-          STATIC_LIBS: ${{ matrix.debug-level == 'release' && 'static-libs-bundles' }}
         with:
-          make-target: '${{ inputs.make-target }} ${STATIC_LIBS} ${{ inputs.make-arguments }}'
+          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
+          debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
+          debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
+          bundle-suffix: ${{ inputs.bundle-suffix }}

.github/workflows/main.yml

@@ -225,6 +225,43 @@ jobs:
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
+  build-linux-x64-static:
+    name: linux-x64-static
+    needs: prepare
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x64
+      make-target: 'static-jdk-image'
+      # There are issues with fastdebug static build in GHA due to space limit.
+      # Only do release build for now.
+      debug-levels: '[ "release" ]'
+      gcc-major-version: '10'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+      # It currently doesn't produce any bundles, but probably will do in
+      # the future.
+      bundle-suffix: "-static"
+    if: needs.prepare.outputs.linux-x64 == 'true'
+
+  build-linux-x64-static-libs:
+    name: linux-x64-static-libs
+    needs: prepare
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x64
+      make-target: 'static-libs-bundles'
+      # Only build static-libs-bundles for release builds.
+      # For debug builds, building static-libs often exceeds disk space.
+      debug-levels: '[ "release" ]'
+      gcc-major-version: '10'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+      # Upload static libs bundles separately to avoid interference with normal linux-x64 bundle.
+      # This bundle is not used by testing jobs, but downstreams use it to check that
+      # dependent projects, e.g. libgraal, builds fine.
+      bundle-suffix: "-static-libs"
+    if: needs.prepare.outputs.linux-x64-variants == 'true'
+
   build-linux-cross-compile:
     name: linux-cross-compile
     needs: prepare

make/Docs.gmk

@@ -98,14 +98,14 @@ JAVA_WARNINGS_ARE_ERRORS ?= -Werror
 
 # The initial set of options for javadoc
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
-    -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
+    -serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
     --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-    -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
+    -serialwarn -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
     -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
@@ -673,7 +673,7 @@ ifeq ($(ENABLE_PANDOC), true)
 
   $(foreach m, $(ALL_MODULES), \
     $(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
-          $(call FindModuleManDirs, $m))))) \
+          $(call FindModuleManDirsForDocs, $m))))) \
     $(if $(MAN_$m), \
       $(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
         FILES := $(MAN_$m), \

make/autoconf/flags-cflags.m4

@@ -715,11 +715,13 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       if test "x$FLAGS_CPU" = xppc64; then
         # -mminimal-toc fixes `relocation truncated to fit' error for gcc 4.1.
         # Use ppc64 instructions, but schedule for power5
-        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -mminimal-toc -mcpu=powerpc64 -mtune=power5"
+        $1_CFLAGS_CPU="-mcpu=powerpc64 -mtune=power5"
+        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -mminimal-toc"
       elif test "x$FLAGS_CPU" = xppc64le; then
         # Little endian machine uses ELFv2 ABI.
         # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
-        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10"
+        $1_CFLAGS_CPU="-mcpu=power8 -mtune=power10"
+        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2"
       fi
     elif test "x$FLAGS_CPU" = xs390x; then
       $1_CFLAGS_CPU="-mbackchain -march=z10"

make/common/MakeIncludeEnd.gmk

@@ -34,12 +34,12 @@ ifneq ($(NO_CUSTOM_EXTENSIONS), true)
 endif
 
 # Pop our helper name off the stack
-HELPER_STACK := $(wordlist 2, $(words $(HELPER_STACK)), $(HELPER_STACK))
+INCLUDE_STACK := $(wordlist 2, $(words $(INCLUDE_STACK)), $(INCLUDE_STACK))
 
 # Print an indented message, also counting the top-level makefile as a level
 ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Leave $(THIS_INCLUDE))
+  $(info :$(foreach s, top $(INCLUDE_STACK) $(SNIPPET_STACK),    )Leave $(THIS_INCLUDE))
 endif
 
 # Restore the previous helper name
-THIS_INCLUDE := $(firstword $(HELPER_STACK))
+THIS_INCLUDE := $(firstword $(INCLUDE_STACK))

make/common/MakeIncludeStart.gmk

@@ -39,11 +39,11 @@ else
 endif
 
 ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Enter $(THIS_INCLUDE) [$(THIS_INCLUDE_MSG)])
+  $(info :$(foreach s, top $(INCLUDE_STACK) $(SNIPPET_STACK),    )Enter $(THIS_INCLUDE) [$(THIS_INCLUDE_MSG)])
 endif
 
-ifneq ($(filter $(THIS_INCLUDE), $(HELPER_STACK)), )
-  $(error Internal makefile error: Include loop detected: $(THIS_INCLUDE) $(HELPER_STACK))
+ifneq ($(filter $(THIS_INCLUDE), $(INCLUDE_STACK)), )
+  $(error Internal makefile error: Include loop detected: $(THIS_INCLUDE) $(INCLUDE_STACK))
 endif
 
 ifeq ($(words $(MAKEFILE_LIST)), 2)
@@ -66,7 +66,7 @@ ifneq ($(IS_PREINIT_ENV), true)
 endif
 
 # Push our helper name onto the stack
-HELPER_STACK := $(THIS_INCLUDE) $(HELPER_STACK)
+INCLUDE_STACK := $(THIS_INCLUDE) $(INCLUDE_STACK)
 
 # Setup an automatic include guard
 ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)

make/common/MakeSnippetEnd.gmk

@@ -34,12 +34,12 @@ ifneq ($(NO_CUSTOM_EXTENSIONS), true)
 endif
 
 # Pop our helper name off the stack
-HELPER_STACK := $(wordlist 2, $(words $(HELPER_STACK)), $(HELPER_STACK))
+SNIPPET_STACK := $(wordlist 2, $(words $(SNIPPET_STACK)), $(SNIPPET_STACK))
 
 # Print an indented message, also counting the top-level makefile as a level
 ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Leave $(THIS_SNIPPET))
+  $(info :$(foreach s, top $(INCLUDE_STACK) $(SNIPPET_STACK),    )Leave $(THIS_SNIPPET))
 endif
 
 # Restore the previous helper name
-THIS_SNIPPET := $(firstword $(HELPER_STACK))
+THIS_SNIPPET := $(firstword $(SNIPPET_STACK))

make/common/MakeSnippetStart.gmk

@@ -33,11 +33,11 @@ endif
 
 # Print an indented message, also counting the top-level makefile as a level
 ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Enter $(THIS_SNIPPET) [snippet])
+  $(info :$(foreach s, top $(INCLUDE_STACK) $(SNIPPET_STACK),    )Enter $(THIS_SNIPPET) [snippet])
 endif
 
 # Push our helper name onto the stack
-HELPER_STACK := $(THIS_SNIPPET) $(HELPER_STACK)
+SNIPPET_STACK := $(THIS_SNIPPET) $(SNIPPET_STACK)
 
 # Hook to include the corresponding custom file, if present.
 ifneq ($(NO_CUSTOM_EXTENSIONS), true)

make/common/Modules.gmk

@@ -87,7 +87,10 @@ SRC_SUBDIRS += share/classes
 
 SPEC_SUBDIRS += share/specs
 
-MAN_SUBDIRS += share/man windows/man
+MAN_SUBDIRS += share/man $(TARGET_OS)/man
+
+# The docs should include the sum of all man pages for all platforms
+MAN_DOCS_SUBDIRS += share/man windows/man
 
 # Find all module-info.java files for the current build target platform and
 # configuration.
@@ -153,6 +156,10 @@ FindModuleManDirs = \
     $(strip $(wildcard \
         $(foreach sub, $(MAN_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
 
+FindModuleManDirsForDocs = \
+    $(strip $(wildcard \
+        $(foreach sub, $(MAN_DOCS_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
+
 # Construct the complete module source path
 GetModuleSrcPath = \
     $(call PathList, \