Browse Source

check for prefix on extern symbols in configure

Originally committed as revision 12484 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Måns Rullgård 17 years ago
parent
commit
b4d96ba2a8
2 changed files with 10 additions and 11 deletions
  1. +7
    -0
      configure
  2. +3
    -11
      libavutil/internal.h

+ 7
- 0
configure View File

@@ -1491,6 +1491,12 @@ if test "$?" != 0; then
die "C compiler test failed." die "C compiler test failed."
fi fi


check_cc <<EOF || die "Symbol mangling check failed."
int ff_extern;
EOF
sym=$(nm -P $TMPO)
extern_prefix=${sym%%ff_extern*}

check_asm inline_asm '""' check_asm inline_asm '""'


if enabled x86; then if enabled x86; then
@@ -2070,6 +2076,7 @@ enabled asmalign_pot &&
printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH || printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH ||
printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH


echo "#define EXTERN_PREFIX \"${extern_prefix}\"" >> $TMPH


echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH




+ 3
- 11
libavutil/internal.h View File

@@ -119,18 +119,10 @@
#endif #endif


// Use rip-relative addressing if compiling PIC code on x86-64. // Use rip-relative addressing if compiling PIC code on x86-64.
#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__DJGPP__) || \
defined(__OS2__) || defined(__APPLE__) || \
(defined (__OpenBSD__) && !defined(__ELF__))
# if defined(ARCH_X86_64) && defined(PIC)
# define MANGLE(a) "_" #a"(%%rip)"
# else
# define MANGLE(a) "_" #a
# endif
#elif defined(ARCH_X86_64) && defined(PIC)
# define MANGLE(a) #a"(%%rip)"
#if defined(ARCH_X86_64) && defined(PIC)
# define MANGLE(a) EXTERN_PREFIX #a"(%%rip)"
#else #else
# define MANGLE(a) #a
# define MANGLE(a) EXTERN_PREFIX #a
#endif #endif


/* debug stuff */ /* debug stuff */


Loading…
Cancel
Save