Commit e276d9e8 authored by Måns Rullgård's avatar Måns Rullgård

ARM: force PIC for shared libs only with ARMv6T2 and later

Originally committed as revision 20207 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b8c0db99
...@@ -1758,7 +1758,6 @@ case "$arch" in ...@@ -1758,7 +1758,6 @@ case "$arch" in
;; ;;
arm|armv[4567]*l) arm|armv[4567]*l)
arch="arm" arch="arm"
spic=$shared
;; ;;
avr32) avr32)
;; ;;
...@@ -2058,11 +2057,14 @@ check_deps $ARCH_EXT_LIST ...@@ -2058,11 +2057,14 @@ check_deps $ARCH_EXT_LIST
disabled optimizations || check_cflags -fomit-frame-pointer disabled optimizations || check_cflags -fomit-frame-pointer
if enabled pic; then enable_pic() {
enable pic
add_cppflags -DPIC add_cppflags -DPIC
add_cflags -fPIC add_cflags -fPIC
add_asflags -fPIC add_asflags -fPIC
fi }
enabled pic && enable_pic
check_cc <<EOF || die "Symbol mangling check failed." check_cc <<EOF || die "Symbol mangling check failed."
int ff_extern; int ff_extern;
...@@ -2109,6 +2111,8 @@ EOF ...@@ -2109,6 +2111,8 @@ EOF
enabled iwmmxt && check_asm iwmmxt '"wunpckelub wr6, wr4"' enabled iwmmxt && check_asm iwmmxt '"wunpckelub wr6, wr4"'
enabled neon && check_asm neon '"vadd.i16 q0, q0, q0"' enabled neon && check_asm neon '"vadd.i16 q0, q0, q0"'
enabled_all armv6t2 shared !pic && enable_pic
elif enabled mips; then elif enabled mips; then
check_asm loongson '"dmult.g $1, $2, $3"' check_asm loongson '"dmult.g $1, $2, $3"'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment