[SCM] libav/experimental: fixes for PIC code on x86-64 patch by (Drew Hess <drew.hess gmail com>)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:42:26 UTC 2013
The following commit has been merged in the experimental branch:
commit a2c3bf82a79342bf43943cda5f2661f6433d8081
Author: Drew Hess <dhess at ilm.com>
Date: Sat Dec 18 03:07:15 2004 +0000
fixes for PIC code on x86-64 patch by (Drew Hess <drew.hess gmail com>)
Originally committed as revision 3757 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/common.h b/libavcodec/common.h
index fba2306..619719a 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -224,11 +224,20 @@ static inline float floorf(float f) {
# include "bswap.h"
+// Use rip-relative addressing if compiling PIC code on x86-64.
# if defined(__MINGW32__) || defined(__CYGWIN__) || \
defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
-# define MANGLE(a) "_" #a
+# if defined(ARCH_X86_64) && defined(PIC)
+# define MANGLE(a) "_" #a"(%%rip)"
+# else
+# define MANGLE(a) "_" #a
+# endif
# else
-# define MANGLE(a) #a
+# if defined(ARCH_X86_64) && defined(PIC)
+# define MANGLE(a) #a"(%%rip)"
+# else
+# define MANGLE(a) #a
+# endif
# endif
/* debug stuff */
diff --git a/libavcodec/libpostproc/mangle.h b/libavcodec/libpostproc/mangle.h
index f3894cc..aa09cd6 100644
--- a/libavcodec/libpostproc/mangle.h
+++ b/libavcodec/libpostproc/mangle.h
@@ -8,12 +8,21 @@
#define __MANGLE_H
/* Feel free to add more to the list, eg. a.out IMO */
+/* Use rip-relative addressing if compiling PIC code on x86-64. */
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \
(defined(__OpenBSD__) && !defined(__ELF__))
+#if defined(ARCH_X86_64) && defined(PIC)
+#define MANGLE(a) "_" #a"(%%rip)"
+#else
#define MANGLE(a) "_" #a
+#endif
+#else
+#if defined(ARCH_X86_64) && defined(PIC)
+#define MANGLE(a) #a"(%%rip)"
#else
#define MANGLE(a) #a
#endif
+#endif
#endif /* !__MANGLE_H */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list