diff --git a/release/src/router/nettle/configure b/release/src/router/nettle/configure index 500bd92552e..0a191ab8ba1 100755 --- a/release/src/router/nettle/configure +++ b/release/src/router/nettle/configure @@ -6564,9 +6564,7 @@ if test "x$enable_assembler" = xyes ; then OPT_NETTLE_SOURCES="fat-arm.c $OPT_NETTLE_SOURCES" FAT_TEST_LIST="arch:5 arch:6,neon" else - case "$host_cpu" in - armv6* | armv7*) - if test "$enable_arm_neon" = auto ; then + if test "$enable_arm_neon" = auto ; then if test "$cross_compiling" = yes ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if assembler accepts Neon instructions" >&5 $as_echo_n "checking if assembler accepts Neon instructions... " >&6; } @@ -6613,12 +6611,14 @@ $as_echo "$enable_arm_neon" >&6; } fi fi - - asm_path="arm/v6 arm" - ;; - esac if test "x$enable_arm_neon" = xyes ; then - asm_path="arm/neon $asm_path" + asm_path="arm/neon arm/v6 $asm_path" + else + case "$host_cpu" in + armv678*) + asm_path="arm/v6 arm" + ;; + esac fi fi ;; diff --git a/release/src/router/nettle/configure.ac b/release/src/router/nettle/configure.ac index f4d9e905795..c458fa51321 100644 --- a/release/src/router/nettle/configure.ac +++ b/release/src/router/nettle/configure.ac @@ -447,15 +447,15 @@ if test "x$enable_assembler" = xyes ; then OPT_NETTLE_SOURCES="fat-arm.c $OPT_NETTLE_SOURCES" FAT_TEST_LIST="arch:5 arch:6,neon" else - case "$host_cpu" in - armv6* | armv7*) - NETTLE_CHECK_ARM_NEON - - asm_path="arm/v6 arm" - ;; - esac + NETTLE_CHECK_ARM_NEON if test "x$enable_arm_neon" = xyes ; then - asm_path="arm/neon $asm_path" + asm_path="arm/neon arm/v6 $asm_path" + else + case "$host_cpu" in + armv[678]*) + asm_path="arm/v6 arm" + ;; + esac fi fi ;;