openjdk/jdk8u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk8u.git synced 2025-12-12 00:34:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

8209115: adjust libsplashscreen linux ppc64le builds for easier libpng update

Browse Source 
Reviewed-by: andrew, phh
Backport-of: e4fdd0391733756f5b898371a66b38869d625c77
This commit is contained in:
Martin Balao 2023-09-19 01:36:16 +00:00 committed by Andrew John Hughes
parent b24b03f9db
commit 1d6f9bd1ea
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/make/lib/Awt2dLibraries.gmk
View File

@ -1159,6 +1159,12 @@ ifndef BUILD_HEADLESS_ONLY
-DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0 \ -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0 \
$(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir)) $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
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) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \ LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
$(LIBSPLASHSCREEN_CFLAGS) $(LIBSPLASHSCREEN_CFLAGS)

3
jdk/src/share/native/sun/awt/libpng/pngpriv.h
View File

@ -293,13 +293,10 @@
# endif # endif
#endif /* PNG_MIPS_MSA_OPT > 0 */ #endif /* PNG_MIPS_MSA_OPT > 0 */
#ifdef PNG_POWERPC_VSX_API_SUPPORTED
#if PNG_POWERPC_VSX_OPT > 0 #if PNG_POWERPC_VSX_OPT > 0
# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx # define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx
# define PNG_POWERPC_VSX_IMPLEMENTATION 1 # define PNG_POWERPC_VSX_IMPLEMENTATION 1
#endif #endif
#endif
/* Is this a build of a DLL where compilation of the object modules requires /* Is this a build of a DLL where compilation of the object modules requires