8209115: adjust libsplashscreen linux ppc64le builds for easier libpng update

[martinuy]

The 11u patch does not apply cleanly because of the file paths and because the context for the change in jdk/make/lib/Awt2dLibraries.gmk is slightly different.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8209115: adjust libsplashscreen linux ppc64le builds for easier libpng update (Bug - P4)

Reviewers

• Andrew John Hughes (@gnu-andrew - Reviewer)
• Paul Hohensee (@phohensee - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/371/head:pull/371
$ git checkout pull/371

Update a local copy of the PR:
$ git checkout pull/371
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/371/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 371

View PR using the GUI difftool:
$ git pr show -t 371

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/371.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back mbalao! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[mlbridge]

Webrevs

• 00: Full (e25b9ea4)

[gnu-andrew]

Backport looks good to me (clean bar a little context difference). Please add the jdk8u-fix-request label to the bug for approval.

[openjdk]

@martinuy This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8209115: adjust libsplashscreen linux ppc64le builds for easier libpng update

Reviewed-by: andrew, phh

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[gnu-andrew]

The situation here is a bit ugly. JDK-8195615 is not listed as being in 8u, but it seems it was silently included in JDK-8208353 ("Upgrade JDK 8u to libpng 1.6.35"). This is the version of libpng that adds PPC and x86 optimisations to the library. Prior to that, there were only ones for ARM (see the -DPNG_ARM_NEON_OPT=0 in the context) and MIPS.

The reason this is problematic in OpenJDK seems to be because the sources don't include the subdirectories with this optimised code. It isn't a problem on x86 because SSE has to be explicitly enabled, but it is enabled on PPC, so we have to force it back off.

The Makefile logic for libpng upstream looks like this:

if PNG_ARM_NEON
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\
        arm/filter_neon.S arm/filter_neon_intrinsics.c \
        arm/palette_neon_intrinsics.c
endif

if PNG_MIPS_MSA
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += mips/mips_init.c\
        mips/filter_msa_intrinsics.c
endif

if PNG_INTEL_SSE
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += intel/intel_init.c\
        intel/filter_sse2_intrinsics.c
endif

if PNG_POWERPC_VSX
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += powerpc/powerpc_init.c\
        powerpc/filter_vsx_intrinsics.c
endif

OpenJDK doesn't have any of these files in the subdirectories. It is filter_vsx_intrinsics.c that contains the missing png_init_filter_functions_vsx that triggered JDK-8195615.

[gnu-andrew]

Thanks. Approved.

[martinuy]

/integrate

[openjdk]

Going to push as commit 50069a8.

[openjdk]

@martinuy Pushed as commit 50069a8.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.