aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-06-15 19:44:30 +0000
committerReinhard Tartler <siretart@tauware.de>2010-06-15 19:44:30 +0000
commitd7e98ea6acd0e01b26ec1084eb00b9cb06e59111 (patch)
treead2c113808d130fa6ac70aaf21169a4734e7c4e0
parent8182bcae9068150ad47c7cbe80350795f2839193 (diff)
downloadffmpeg-0.6.tar.gz
configure: fix symver detection with icc 10v0.6
Apparently the compiler sometimes bypasses the normal assembler, in which case the asm label variant works. If the file contains any inline asm, this bypassing is not done, and the assembler chokes on invalid syntax. Inserting a dummy asm() statement in the test when the compiler supports it makes sure no shortcuts are taken and the test fails as it should. backport r23616 by mru Originally committed as revision 23618 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index ac09f808bd..0166829f77 100755
--- a/configure
+++ b/configure
@@ -253,6 +253,8 @@ EOF
exit 0
}
+quotes='""'
+
log(){
echo "$@" >> $logfile
}
@@ -2741,7 +2743,7 @@ if test_ldflags -Wl,--version-script,$TMPV; then
append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
check_cc <<EOF && enable symver_asm_label
void ff_foo(void) __asm__ ("av_foo@VERSION");
-void ff_foo(void) {}
+void ff_foo(void) { ${inline_asm+__asm__($quotes);} }
EOF
check_cc <<EOF && enable symver_gnu_asm
__asm__(".symver ff_foo,av_foo@VERSION");