From 45ae6536d67f14a75fe61cfc3cba35696c0f3da4 Mon Sep 17 00:00:00 2001
From: Ed Nevill <enevill@openjdk.org>
Date: Tue, 5 May 2015 09:08:20 +0000
Subject: [PATCH] 8078245: AARCH64: JDK fails to build due to undefined symbol
 in libpng

Add -DPNG_ARM_NEON_OPT=0 to LIBSPLASHSCREEN_CFLAGS flags

Reviewed-by: dholmes, ihse, erikj
---
 jdk/make/lib/Awt2dLibraries.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
index 254f446a000..f0847a60e4b 100644
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
@@ -827,7 +827,7 @@ ifndef BUILD_HEADLESS_ONLY
     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
   endif
 
-  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
+  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
       $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
       $(LIBJAVA_HEADER_FLAGS) \
       #