[vlc-commits] contrib: vpx: remove armv7 only linker flag

[Victorien Le Couviour--Tuffet]

vlc | branch: master | Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet at gmail.com> | Wed Sep 19 16:56:19 2018 +0200| [6e6ef97b3179133afdbc61b974820ef8203e82e1] | committer: Thomas Guillem

contrib: vpx: remove armv7 only linker flag

Fixes android NDK 17 build:
This flag is already forced by compile-libvlc.sh (vlc-android) for armv7
only, so it can be completly removed from this configure script when
compiling for android platforms.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e6ef97b3179133afdbc61b974820ef8203e82e1
---

 contrib/src/vpx/libvpx-android-fix_cortex_a8-flag.patch | 15 +++++++++++++++
 contrib/src/vpx/rules.mak                               |  1 +
 2 files changed, 16 insertions(+)

diff --git a/contrib/src/vpx/libvpx-android-fix_cortex_a8-flag.patch b/contrib/src/vpx/libvpx-android-fix_cortex_a8-flag.patch
new file mode 100644
index 0000000000..3ff5e83588
--- /dev/null
+++ b/contrib/src/vpx/libvpx-android-fix_cortex_a8-flag.patch
@@ -0,0 +1,15 @@
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index a658544..86db9b9 100644
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -988,10 +988,6 @@ EOF
+               add_ldflags "--sysroot=${alt_libc}"
+             fi
+ 
+-            # linker flag that routes around a CPU bug in some
+-            # Cortex-A8 implementations (NDK Dev Guide)
+-            add_ldflags "-Wl,--fix-cortex-a8"
+-
+             enable_feature pic
+             soft_enable realtime_only
+             if [ ${tgt_isa} = "armv7" ]; then
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 2e296fec38..3d463b92ee 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -19,6 +19,7 @@ libvpx: libvpx-$(VPX_VERSION).tar.gz .sum-vpx
 	$(APPLY) $(SRC)/vpx/libvpx-ios.patch
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/vpx/libvpx-android.patch
+	$(APPLY) $(SRC)/vpx/libvpx-android-fix_cortex_a8-flag.patch
 endif
 	$(APPLY) $(SRC)/vpx/0001-ads2gas-Add-a-noelf-option.patch
 	$(APPLY) $(SRC)/vpx/0002-configure-Add-an-armv7-win32-gcc-target.patch