[FFmpeg-cvslog] r23618 - in branches/0.6: . configure

siretart subversion
Tue Jun 15 21:44:30 CEST 2010


Author: siretart
Date: Tue Jun 15 21:44:30 2010
New Revision: 23618

Log:
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.

backport r23616 by mru

Modified:
   branches/0.6/   (props changed)
   branches/0.6/configure

Modified: branches/0.6/configure
==============================================================================
--- branches/0.6/configure	Tue Jun 15 21:44:09 2010	(r23617)
+++ branches/0.6/configure	Tue Jun 15 21:44:30 2010	(r23618)
@@ -253,6 +253,8 @@ EOF
   exit 0
 }
 
+quotes='""'
+
 log(){
     echo "$@" >> $logfile
 }
@@ -2741,7 +2743,7 @@ if test_ldflags -Wl,--version-script,$TM
     append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
     check_cc <<EOF && enable symver_asm_label
 void ff_foo(void) __asm__ ("av_foo at 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 at VERSION");



More information about the ffmpeg-cvslog mailing list