PKGBUILDs/extra/libvpx/fix-armhf-link.patch

96 lines
2.9 KiB
Diff
Raw Normal View History

2015-04-21 11:57:20 +00:00
diff --git a/build/make/configure.sh b/build/make/configure.sh
2015-04-21 12:40:23 +00:00
index 25c9f80..1675044 100644
2015-04-21 11:57:20 +00:00
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -623,10 +623,14 @@ process_common_toolchain() {
2013-12-07 21:39:15 +00:00
2015-04-21 11:57:20 +00:00
# detect tgt_isa
case "$gcctarget" in
+ armv6*-gnueabihf)
+ tgt_isa=armv6
+ float_abi=hard
+ ;;
armv6*)
tgt_isa=armv6
;;
- armv7*-hardfloat*)
+ armv7*-gnueabihf)
tgt_isa=armv7
float_abi=hard
;;
@@ -634,6 +638,10 @@ process_common_toolchain() {
tgt_isa=armv7
float_abi=softfp
;;
+ armv5te*)
+ tgt_isa=armv5te
+ float_abi=soft
+ ;;
*x86_64*|*amd64*)
tgt_isa=x86_64
;;
2015-04-21 12:40:23 +00:00
@@ -811,7 +819,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.
@@ -825,13 +833,16 @@ process_common_toolchain() {
soft_enable media
soft_enable fast_unaligned
;;
+ armv5)
+ soft_enable media
+ soft_enable fast_unaligned
+ ;;
esac
asm_conversion_cmd="cat"
2013-12-07 21:39:15 +00:00
2015-04-21 11:57:20 +00:00
case ${tgt_cc} in
2013-12-07 21:39:15 +00:00
gcc)
2015-04-21 11:57:20 +00:00
- CROSS=${CROSS:-arm-none-linux-gnueabi-}
link_with_cc=gcc
setup_gnu_toolchain
arch_int=${tgt_isa##armv}
2015-04-21 12:40:23 +00:00
@@ -839,13 +850,6 @@ process_common_toolchain() {
2015-04-21 11:57:20 +00:00
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
2013-12-07 21:39:15 +00:00
-#ifndef __ARM_PCS_VFP
-#error "not hardfp"
-#endif
-EOF
2015-04-21 11:57:20 +00:00
- fi
check_add_cflags -march=armv7-a -mfloat-abi=${float_abi}
check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
2013-12-07 21:39:15 +00:00
2015-04-21 12:40:23 +00:00
@@ -854,8 +858,8 @@ EOF
2015-04-21 11:57:20 +00:00
check_add_asflags -mfpu=neon
2013-12-07 21:39:15 +00:00
fi
2015-04-21 11:57:20 +00:00
else
2015-04-21 12:40:23 +00:00
- check_add_cflags -march=${tgt_isa}
- check_add_asflags -march=${tgt_isa}
2015-04-21 11:57:20 +00:00
+ check_add_cflags -march=${tgt_isa} -mfloat-abi=${float_abi}
+ check_add_asflags -march=${tgt_isa} -mfloat-abi=${float_abi}
fi
2015-04-21 12:40:23 +00:00
enabled debug && add_asflags -g
diff --git a/configure b/configure
index f3708f9..7fb89ca 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} armv6-darwin-gcc"
all_platforms="${all_platforms} armv6-linux-rvct"
all_platforms="${all_platforms} armv6-linux-gcc"