aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-06-15 18:06:28 +0000
committerMåns Rullgård <mans@mansr.com>2010-06-15 18:06:28 +0000
commit0884fadf68817e3325bbe82d875cf470238f44d1 (patch)
tree07f566c3a434322d22536de58a27df86caeac660 /configure
parentccc87908a98e7fcbf69fb70ceda7efa5c6e545ec (diff)
downloadffmpeg-0884fadf68817e3325bbe82d875cf470238f44d1.tar.gz
configure: fix symver detection with icc 10
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. Originally committed as revision 23616 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 7016e5bc02..70ad8a5700 100755
--- a/configure
+++ b/configure
@@ -252,6 +252,8 @@ EOF
exit 0
}
+quotes='""'
+
log(){
echo "$@" >> $logfile
}
@@ -2723,7 +2725,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");