From e69364b700a6c0cb411ddc7737bc8e9e701d0cb8 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 27 Apr 2007 09:32:31 +0000
Subject: [PATCH] =?UTF-8?q?Mark=20code=20parts=20that=20cannot=20work=20on?=
 =?UTF-8?q?=20AMD64=20due=20to=20broken=20relocations=20as=20such.=20This?=
 =?UTF-8?q?=20allows=20building=20shared=20libraries=20on=20AMD64=20again.?=
 =?UTF-8?q?=20based=20on=20a=20patch=20by=20Diego=20'Flameeyes'=20Petten?=
 =?UTF-8?q?=C3=B2=20and=20suggestions=20by=20Michael=20original=20thread:?=
 =?UTF-8?q?=20Date:=20Wed,=2018=20Apr=202007=2011:26:12=20+0200=20Subject:?=
 =?UTF-8?q?=20[Ffmpeg-devel]=20[PATCH]=20(try=202)=20Build=20shared=20libr?=
 =?UTF-8?q?aries=20on=20AMD64=20again?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally committed as revision 8849 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/cabac.h  | 10 +++++-----
 libavcodec/h264.c   |  2 +-
 libavutil/x86_cpu.h |  4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index 0b820039f9..0f83d7c0f3 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -376,7 +376,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st
 #define BYTE        "16"
 #define BYTEEND     "20"
 #endif
-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE)
+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
     int bit;
 
 #ifndef BRANCHLESS_CABAC_DECODER
@@ -532,7 +532,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st
     );
     bit&=1;
 #endif /* BRANCHLESS_CABAC_DECODER */
-#else /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) */
+#else /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
     int s = *state;
     int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s];
     int bit, lps_mask attribute_unused;
@@ -571,7 +571,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st
     if(!(c->low & CABAC_MASK))
         refill2(c);
 #endif /* BRANCHLESS_CABAC_DECODER */
-#endif /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) */
+#endif /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
     return bit;
 }
 
@@ -680,7 +680,7 @@ static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
 
 //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
 //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard)
-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE)
+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
 static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
     void *end= significant_coeff_ctx_base + max_coeff - 1;
     int minusstart= -(int)significant_coeff_ctx_base;
@@ -786,7 +786,7 @@ static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coe
     );
     return coeff_count;
 }
-#endif /* defined(ARCH_X86) && && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) */
+#endif /* defined(ARCH_X86) && && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
 
 /**
  *
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 79b605ccad..b5bd0a8a71 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6111,7 +6111,7 @@ static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n
             index[coeff_count++] = last;\
         }
         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE)
+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
         coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
     } else {
         coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
index ebd60ff7f4..2cbef0b785 100644
--- a/libavutil/x86_cpu.h
+++ b/libavutil/x86_cpu.h
@@ -61,4 +61,8 @@
 #  define CONFIG_7REGS 1
 #endif
 
+#if defined(ARCH_X86_64) && defined(PIC)
+#  define BROKEN_RELOCATIONS 1
+#endif
+
 #endif /* AVUTIL_X86CPU_H */