aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK/include/mips
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2020-12-23 01:06:02 -0800
committerMartin Storsjö <martin@martin.st>2021-01-14 14:56:46 +0200
commitd284d42e71b125d9908ae2d6042d17ee09597ecb (patch)
tree758311576a2361eedc18c7fc435ad22df644f360 /libFDK/include/mips
parent2e64f76d2e246cd01cf87c12c06b300571ea3d3b (diff)
downloadfdk-aac-d284d42e71b125d9908ae2d6042d17ee09597ecb.tar.gz
fdk-aac-d284d42e71b125d9908ae2d6042d17ee09597ecb.tar.bz2
fdk-aac-d284d42e71b125d9908ae2d6042d17ee09597ecb.zip
fix compilation with mips16
Some users wrongly pass both -mips16 and -mdsp when compiling on MIPS platforms. Handle such a case. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libFDK/include/mips')
-rw-r--r--libFDK/include/mips/abs_mips.h2
-rw-r--r--libFDK/include/mips/scale_mips.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libFDK/include/mips/abs_mips.h b/libFDK/include/mips/abs_mips.h
index dbb2063..5644bc0 100644
--- a/libFDK/include/mips/abs_mips.h
+++ b/libFDK/include/mips/abs_mips.h
@@ -107,7 +107,7 @@ amm-info@iis.fraunhofer.de
#if defined(__GNUC__) && defined(__mips__)
-#if defined(__mips_dsp)
+#if defined(__mips_dsp) && !defined(__mips16)
#define FUNCTION_fixabs_D
#define FUNCTION_fixabs_I
#define FUNCTION_fixabs_S
diff --git a/libFDK/include/mips/scale_mips.h b/libFDK/include/mips/scale_mips.h
index 3c141fc..882ef35 100644
--- a/libFDK/include/mips/scale_mips.h
+++ b/libFDK/include/mips/scale_mips.h
@@ -103,7 +103,7 @@ amm-info@iis.fraunhofer.de
#ifndef SCALE_MIPS_H
#define SCALE_MIPS_H
-#if defined(__mips_dsp)
+#if defined(__mips_dsp) && !defined(__mips16)
/*!
*