[libpng17] Test for 'arm*' not just 'arm' in the host_cpu configure variable.

3 files changed, 13 insertions, 9 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 6dd0fa128..6520ecb79 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta11 - April 24, 2013
+Libpng 1.7.0beta11 - April 26, 2013
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -265,7 +265,8 @@ Version 1.7.0beta09 [April 24, 2013]
 Version 1.7.0beta10 [April 24, 2013]
   Attempt to fix the PNG_ARM_NEON configuration mess.
 
-Version 1.7.0beta11 [April 24, 2013]
+Version 1.7.0beta11 [April 26, 2013]
+  Test for 'arm*' not just 'arm' in the host_cpu configure variable.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 53287fc09..c80ea73a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4550,10 +4550,11 @@ Version 1.7.0beta09 [April 24, 2013]
     Previously the ARM NEON specific files were still built if the option
     was switched 'off' as opposed to being explicitly disabled.
 
-Version 1.7.0beta09 [April 24, 2013]
+Version 1.7.0beta10 [April 24, 2013]
   Attempt to fix the PNG_ARM_NEON configuration mess.
 
-Version 1.7.0beta11 [April 24, 2013]
+Version 1.7.0beta11 [April 26, 2013]
+  Test for 'arm*' not just 'arm' in the host_cpu configure variable.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/configure.ac b/configure.ac
index 6b610bc83..7f02fb5c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,14 +368,16 @@ AC_ARG_ENABLE([arm-neon],
          AC_MSG_ERROR([--enable-arm-neon=${enable_arm_neon}: invalid value])
    esac])
 
-# If enable/disable was not specified default to using the optimizations if the
-# host CPU is ARM and the comppiler is targeting a NEON host.  The latter test
-# is done in scripts/pnglibconf.dfa by checking for __ARM_NEON__.  The
-# AM_CONDITIONAL below controls whether the ARM NEON source files are built.
+# Add ARM specific files to all builds where the host_cpu is arm ('arm*') or
+# where ARM optimizations were explicitly requested (this allows a fallback if a
+# future host CPU does not match 'arm*')
 
 AM_CONDITIONAL([PNG_ARM_NEON],
    [test "$enable_arm_neon" != 'no' &&
-    test "$host_cpu" = 'arm' -o "$enable_arm_neon" != ''])
+    case "$host_cpu" in
+      arm*) :;;
+      *)    test "$enable_arm_neon" != '';;
+    esac])
 
 AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])