Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / bfin / config_bfin.h

diff --git a/libavcodec/bfin/config_bfin.h b/libavcodec/bfin/config_bfin.h
index eac2e1e2e789c5d26bed92cba2586060ee247a31..f3a2c6ebc6ef8220b4f8ffc52d55eca864ecbfa3 100644 (file)
--- a/libavcodec/bfin/config_bfin.h
+++ b/libavcodec/bfin/config_bfin.h
@@ -1,6 +1,4 @@
 /*
- * config_bfin.h
- *
  * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
  *
  * This file is part of FFmpeg.
@@ -29,12 +27,22 @@ DEFUN(put_pixels_clamped,mL1,
 
       rts;
 */
+
+#ifndef AVCODEC_BFIN_CONFIG_BFIN_H
+#define AVCODEC_BFIN_CONFIG_BFIN_H
+
+#include "config.h"
+
 #ifndef DEFUN
 
+#define mL3 .text
 #ifndef mL1
+#if defined(__FDPIC__) && CONFIG_SRAM
 #define mL1 .l1.text
+#else
+#define mL1 mL3
+#endif
 #endif
-#define mL3 .text
 
 #define DEFUN(fname,where,interface) \
         .section where;              \
@@ -46,6 +54,12 @@ DEFUN(put_pixels_clamped,mL1,
 #define DEFUN_END(fname) \
         .size _ff_bfin_ ## fname, . - _ff_bfin_ ## fname
 
+#ifdef __FDPIC__
+#define RELOC(reg,got,obj) reg = [got + obj@GOT17M4]
+#else
+#define RELOC(reg,got,obj) reg.L = obj; reg.H = obj
+#endif
 
 #endif
 
+#endif /* AVCODEC_BFIN_CONFIG_BFIN_H */