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

[frescor/ffmpeg.git] / configure

diff --git a/configure b/configure
index 92bc1ae04c776338e33cab75e8ce00b844d39b65..0a44b14868ea1b42bde88b3358c87837683b0363 100755 (executable)
--- a/configure
+++ b/configure
@@ -1758,7 +1758,6 @@ case "$arch" in
     ;;
     arm|armv[4567]*l)
         arch="arm"
-        spic=$shared
     ;;
     avr32)
     ;;
@@ -2058,11 +2057,14 @@ check_deps $ARCH_EXT_LIST
 
 disabled optimizations || check_cflags -fomit-frame-pointer
 
-if enabled pic; then
+enable_pic() {
+    enable pic
     add_cppflags -DPIC
     add_cflags   -fPIC
     add_asflags  -fPIC
-fi
+}
+
+enabled pic && enable_pic
 
 check_cc <<EOF || die "Symbol mangling check failed."
 int ff_extern;
@@ -2109,6 +2111,8 @@ EOF
     enabled iwmmxt  && check_asm iwmmxt  '"wunpckelub wr6, wr4"'
     enabled neon    && check_asm neon    '"vadd.i16 q0, q0, q0"'
 
+    enabled_all armv6t2 shared !pic && enable_pic
+
 elif enabled mips; then
 
     check_asm loongson '"dmult.g $1, $2, $3"'