diff --git a/configure b/configure index 8c241cfcf1..16860d2514 100755 --- a/configure +++ b/configure @@ -1491,6 +1491,12 @@ if test "$?" != 0; then die "C compiler test failed." fi +check_cc <> $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 diff --git a/libavutil/internal.h b/libavutil/internal.h index 6f1dd80639..ccb0974ad2 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -119,18 +119,10 @@ #endif // 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 -# define MANGLE(a) #a +# define MANGLE(a) EXTERN_PREFIX #a #endif /* debug stuff */