PKGBUILDs/extra/libvpx/fix-armhf-link.patch
2016-08-05 00:03:30 +00:00

72 lines
2.4 KiB
Diff

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 4f0071b..56abe0e 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -680,6 +680,10 @@ process_common_toolchain() {
aarch64*)
tgt_isa=arm64
;;
+ armv6*-gnueabihf)
+ tgt_isa=armv6
+ float_abi=hard
+ ;;
armv6*)
tgt_isa=armv6
;;
@@ -691,6 +695,10 @@ process_common_toolchain() {
tgt_isa=armv7
float_abi=softfp
;;
+ armv5te*)
+ tgt_isa=armv5te
+ float_abi=soft
+ ;;
*x86_64*|*amd64*)
tgt_isa=x86_64
;;
@@ -876,7 +884,7 @@ process_common_toolchain() {
soft_enable neon
;;
armv7|armv7s)
- soft_enable neon
+ #soft_enable neon
# Only enable neon_asm when neon is also enabled.
enabled neon && soft_enable neon_asm
# If someone tries to force it through, die.
@@ -927,13 +935,6 @@ process_common_toolchain() {
check_add_asflags --defsym ARCHITECTURE=${arch_int}
tune_cflags="-mtune="
if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
- if [ -z "${float_abi}" ]; then
- check_cpp <<EOF && float_abi=hard || float_abi=softfp
-#ifndef __ARM_PCS_VFP
-#error "not hardfp"
-#endif
-EOF
- fi
check_add_cflags -march=armv7-a -mfloat-abi=${float_abi}
check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
@@ -945,8 +946,8 @@ EOF
check_add_cflags -march=armv8-a
check_add_asflags -march=armv8-a
else
- check_add_cflags -march=${tgt_isa}
- check_add_asflags -march=${tgt_isa}
+ check_add_cflags -march=${tgt_isa} -mfloat-abi=${float_abi}
+ check_add_asflags -march=${tgt_isa} -mfloat-abi=${float_abi}
fi
enabled debug && add_asflags -g
diff --git a/configure b/configure
index f82ee04..911733f 100755
--- a/configure
+++ b/configure
@@ -97,6 +97,7 @@ EOF
# all_platforms is a list of all supported target platforms. Maintain
# alphabetically by architecture, generic-gnu last.
+all_platforms="${all_platforms} armv5te-linux-gcc"
all_platforms="${all_platforms} arm64-darwin-gcc"
all_platforms="${all_platforms} arm64-linux-gcc"
all_platforms="${all_platforms} armv6-linux-rvct"