# HG changeset patch
# User enevill
# Date 1430301613 0
#      Wed Apr 29 10:00:13 2015 +0000
# Node ID 3dd34d5a61548a440f43915472299bef569ff944
# Parent  105d045a69174d870b69bfe471b3f2d05a9f8ecc
8078245: AARCH64: JDK fails to build due to undefined symbol in libpng
Summary: Add -DPNG_ARM_NEON_OPT=0 to JDK flags to fix build
Reviewed-by: dholmes

diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
--- a/common/autoconf/flags.m4
+++ b/common/autoconf/flags.m4
@@ -485,6 +485,13 @@
     CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt"
   fi
 
+  # gcc on aarch64 automatically defines the symbol __ARM_NEON
+  # this causes build failures (undefined symbols in linpng)
+  # work around this by manually turning off ARM Neon optimization
+  if test "x$OPENJDK_TARGET_CPU_ARCH" = "xaarch64"; then
+    CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -DPNG_ARM_NEON_OPT=0"
+  fi
+
   if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
     AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
   fi