Skip to content

Commit e4fdd03

Browse files
committed
8209115: adjust libsplashscreen linux ppc64le builds for easier libpng update
Backport-of: 8044814
1 parent c9ce60b commit e4fdd03

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

make/lib/Awt2dLibraries.gmk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,12 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
826826
LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
827827
-DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0
828828

829+
ifeq ($(OPENJDK_TARGET_OS), linux)
830+
ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
831+
LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
832+
endif
833+
endif
834+
829835
ifeq ($(OPENJDK_TARGET_OS), macosx)
830836
LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
831837

src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,10 @@
293293
# endif
294294
#endif /* PNG_MIPS_MSA_OPT > 0 */
295295

296-
#ifdef PNG_POWERPC_VSX_API_SUPPORTED
297296
#if PNG_POWERPC_VSX_OPT > 0
298297
# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx
299298
# define PNG_POWERPC_VSX_IMPLEMENTATION 1
300299
#endif
301-
#endif
302-
303300

304301

305302
/* Is this a build of a DLL where compilation of the object modules requires

0 commit comments

Comments
 (0)