Commit 613252d0 authored by mru's avatar mru

configure: enable PIC in per-arch section instead of separately

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19524 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b9fe9406
...@@ -1687,6 +1687,7 @@ case "$arch" in ...@@ -1687,6 +1687,7 @@ case "$arch" in
arch="alpha" arch="alpha"
enable fast_64bit enable fast_64bit
check_cflags -mieee check_cflags -mieee
pic=$shared
;; ;;
arm|armv[4567]*l) arm|armv[4567]*l)
arch="arm" arch="arm"
...@@ -1699,24 +1700,29 @@ case "$arch" in ...@@ -1699,24 +1700,29 @@ case "$arch" in
ia64) ia64)
arch="ia64" arch="ia64"
enable fast_64bit enable fast_64bit
pic=$shared
;; ;;
m68k) m68k)
arch="m68k" arch="m68k"
;; ;;
mips|mipsel|IP*) mips|mipsel|IP*)
arch="mips" arch="mips"
pic=$shared
;; ;;
mips64) mips64)
arch="mips" arch="mips"
subarch="mips64" subarch="mips64"
enable fast_64bit enable fast_64bit
pic=$shared
;; ;;
parisc|hppa) parisc|hppa)
arch="parisc" arch="parisc"
pic=$shared
;; ;;
parisc64|hppa64) parisc64|hppa64)
arch="parisc" arch="parisc"
enable fast_64bit enable fast_64bit
pic=$shared
;; ;;
"Power Macintosh"|ppc|powerpc) "Power Macintosh"|ppc|powerpc)
arch="ppc" arch="ppc"
...@@ -1736,11 +1742,13 @@ case "$arch" in ...@@ -1736,11 +1742,13 @@ case "$arch" in
;; ;;
sparc) sparc)
arch="sparc" arch="sparc"
pic=$shared
;; ;;
sun4u|sparc64) sun4u|sparc64)
arch="sparc" arch="sparc"
subarch="sparc64" subarch="sparc64"
enable fast_64bit enable fast_64bit
pic=$shared
;; ;;
i386|i486|i586|i686|i86pc|BePC) i386|i486|i586|i686|i86pc|BePC)
arch="x86" arch="x86"
...@@ -1753,7 +1761,7 @@ case "$arch" in ...@@ -1753,7 +1761,7 @@ case "$arch" in
enable cmov enable cmov
enable fast_cmov enable fast_cmov
enable fast_unaligned enable fast_unaligned
check_cc <<EOF && enable fast_64bit && subarch="x86_64" check_cc <<EOF && enable fast_64bit && subarch="x86_64" && pic=$shared
int test[sizeof(char*) - 7]; int test[sizeof(char*) - 7];
EOF EOF
;; ;;
...@@ -2375,15 +2383,7 @@ elif enabled gcc; then ...@@ -2375,15 +2383,7 @@ elif enabled gcc; then
check_cflags -fno-tree-vectorize check_cflags -fno-tree-vectorize
fi fi
# PIC flags for shared library objects where they are needed enabled pic && LIBOBJFLAGS='$(PIC)'
if enabled shared; then
# LIBOBJFLAGS may have already been set in the OS configuration
if test -z "$LIBOBJFLAGS" ; then
case "${subarch-$arch}" in
x86_64|ia64|alpha|sparc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;;
esac
fi
fi
if enabled gprof; then if enabled gprof; then
add_cflags -p add_cflags -p
......
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