[FFmpeg-devel] [PATCH v2] mips/asmdefs: use asm/sgidefs.h header on linux

[James Cowgill]

Unfortunately android < api 21 (lollipop) doesn't have the sgidefs.h header,
but the linux kernel does have an almost equivalent asm/sgidefs.h which will
do so use that header if we can.

Change _ABI64 to _MIPS_SIM_ABI64 which is defined in both headers.

Signed-off-by: James Cowgill <james410 at cowgill.org.uk>
---
 configure                | 4 ++++
 libavutil/mips/asmdefs.h | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 1ea2032..a5ff67c 100755
--- a/configure
+++ b/configure
@@ -1642,6 +1642,7 @@ HEADERS_LIST="
     alsa_asoundlib_h
     altivec_h
     arpa_inet_h
+    asm_sgidefs_h
     asm_types_h
     cdio_paranoia_h
     cdio_paranoia_paranoia_h
@@ -4570,6 +4571,9 @@ EOF
 
 elif enabled mips; then
 
+    check_header asm/sgidefs.h || check_header sgidefs.h || \
+        die "either asm/sgidefs.h or sgidefs.h is required on mips"
+
     check_inline_asm loongson '"dmult.g $1, $2, $3"'
 
     # Enable minimum ISA based on selected options
diff --git a/libavutil/mips/asmdefs.h b/libavutil/mips/asmdefs.h
index a3a5ee3..0e911cb 100644
--- a/libavutil/mips/asmdefs.h
+++ b/libavutil/mips/asmdefs.h
@@ -27,9 +27,13 @@
 #ifndef AVUTIL_MIPS_ASMDEFS_H
 #define AVUTIL_MIPS_ASMDEFS_H
 
+#if HAVE_ASM_SGIDEFS_H
+#include <asm/sgidefs.h>
+#else
 #include <sgidefs.h>
+#endif
 
-#if _MIPS_SIM == _ABI64
+#if _MIPS_SIM == _MIPS_SIM_ABI64
 # define PTRSIZE        " 8 "
 # define PTRLOG         " 3 "
 # define PTR_ADDU       "daddu "
-- 
2.1.4