Skip to content

Commit 50069a8

Browse files
committedSep 19, 2023
8209115: adjust libsplashscreen linux ppc64le builds for easier libpng update
Reviewed-by: andrew, phh Backport-of: e4fdd0391733756f5b898371a66b38869d625c77
1 parent c519409 commit 50069a8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed
 

‎jdk/make/lib/Awt2dLibraries.gmk

+6
Original file line numberDiff line numberDiff line change
@@ -1159,6 +1159,12 @@ ifndef BUILD_HEADLESS_ONLY
11591159
-DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0 \
11601160
$(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
11611161

1162+
ifeq ($(OPENJDK_TARGET_OS), linux)
1163+
ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
1164+
LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
1165+
endif
1166+
endif
1167+
11621168
ifeq ($(OPENJDK_TARGET_OS), macosx)
11631169
LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
11641170
$(LIBSPLASHSCREEN_CFLAGS)

‎jdk/src/share/native/sun/awt/libpng/pngpriv.h

-3
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)
Please sign in to comment.