| Revision | d7e98ea6acd0e01b26ec1084eb00b9cb06e59111 (tree) |
|---|---|
| Zeit | 2010-06-16 04:44:30 |
| Autor | Reinhard Tartler <siretart@tauw...> |
| Commiter | Reinhard Tartler |
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
Originally committed as revision 23618 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
| @@ -253,6 +253,8 @@ EOF | ||
| 253 | 253 | exit 0 |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | +quotes='""' | |
| 257 | + | |
| 256 | 258 | log(){ |
| 257 | 259 | echo "$@" >> $logfile |
| 258 | 260 | } |
| @@ -2741,7 +2743,7 @@ if test_ldflags -Wl,--version-script,$TMPV; then | ||
| 2741 | 2743 | append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' |
| 2742 | 2744 | check_cc <<EOF && enable symver_asm_label |
| 2743 | 2745 | void ff_foo(void) __asm__ ("av_foo@VERSION"); |
| 2744 | -void ff_foo(void) {} | |
| 2746 | +void ff_foo(void) { ${inline_asm+__asm__($quotes);} } | |
| 2745 | 2747 | EOF |
| 2746 | 2748 | check_cc <<EOF && enable symver_gnu_asm |
| 2747 | 2749 | __asm__(".symver ff_foo,av_foo@VERSION"); |
Fork
configure