8209115: adjust libsplashscreen linux ppc64le builds for easier libpn…

…g update Backport-of: 8044814e305c53ff22ec1831411481c4f4dc1f62
openjdk · Jan 25, 2023 · e4fdd03 · e4fdd03
1 parent c9ce60b
commit e4fdd03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
@@ -826,6 +826,12 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
                             -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0
 
+  ifeq ($(OPENJDK_TARGET_OS), linux)
+    ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
+      LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
+    endif
+  endif
+
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
 

diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
@@ -293,13 +293,10 @@
 #  endif
 #endif /* PNG_MIPS_MSA_OPT > 0 */
 
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
 #if PNG_POWERPC_VSX_OPT > 0
 #  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx
 #  define PNG_POWERPC_VSX_IMPLEMENTATION 1
 #endif
-#endif
-
 
 
 /* Is this a build of a DLL where compilation of the object modules requires