[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: speexdsp: disable NEON just once

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
ee5cd413 by Rémi Denis-Courmont at 2022-10-05T13:41:18+00:00
contrib: speexdsp: disable NEON just once

On AArch64, NEON is unconditionally disabled right above. This was only
adding it a second time on all AArch64 targets other than iOS and
Android, with no real effects.

On non-ARM architectures, the flag is useless, and HAVE_NEON is
meaningless so ignore it.

On AArch32, HAVE_NEON is still abode by; this patch is a no-op.

- - - - -
885a3fb6 by Rémi Denis-Courmont at 2022-10-05T13:41:18+00:00
contrib: don't set useless HAVE_NEON on AArch64

This was cargo-culted on Android and (desktop) macOS, and had no
actual effects. The only uses of the flag in contribs are:
- in main.mak, and only on iOS, thus no effects on AArch64,
- in the FFmpeg package, explicitly only on AArch32,
- in the speexdsp, effectively only on AArch32 (see previous commit).

On AArch64, NEON is enabled by default. iOS, non-Android Linux and
Windows builds have relied on this from the beginning.

This patch is effectively a no-op. Fixes #27379.

- - - - -


2 changed files:

- contrib/bootstrap
- contrib/src/speexdsp/rules.mak


Changes:

=====================================
contrib/bootstrap
=====================================
@@ -246,7 +246,6 @@ check_android_sdk()
 	add_make "ANDROID_API := ${ANDROID_API}"
 	[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
 	[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
-	[ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_NEON"
 	[ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_ARMV8A"
 	[ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ] && add_make_enabled "HAVE_ARMV6"
 }
@@ -282,7 +281,6 @@ case "${OS}" in
 			case "${HOST}" in
 			    *arm64*|*aarch64*)
 			    add_make "PLATFORM_SHORT_ARCH := arm64"
-			    add_make_enabled "HAVE_NEON"
 			    ;;
 			    *x86_64*)
 			    add_make "PLATFORM_SHORT_ARCH := x86_64"


=====================================
contrib/src/speexdsp/rules.mak
=====================================
@@ -23,9 +23,11 @@ ifeq ($(ARCH),aarch64)
 # old neon, not compatible with aarch64
 SPEEXDSP_CONF += --disable-neon
 endif
+ifeq ($(ARCH),arm)
 ifndef HAVE_NEON
 SPEEXDSP_CONF += --disable-neon
 endif
+endif
 ifndef HAVE_FPU
 SPEEXDSP_CONF += --enable-fixed-point
 ifeq ($(ARCH),arm)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/dde50606ee55d36bcc9a2115fa0a360f59fc8684...885a3fb66858381da0c9e110d4607d664281f205

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/dde50606ee55d36bcc9a2115fa0a360f59fc8684...885a3fb66858381da0c9e110d4607d664281f205
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance