diff options
| author | Martin Storsjo <martin@martin.st> | 2014-11-07 09:32:48 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2014-11-07 09:32:48 +0200 |
| commit | 6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f (patch) | |
| tree | da3cf1b27c50bd6d81be8b0183f494d15539027a /libFDK | |
| parent | ce1863444a9e1d825c53bb3929f0b8fe664a6464 (diff) | |
| parent | d149516e1a3a63549d2c654b1398544d5de46a3e (diff) | |
| download | fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.gz fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.bz2 fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libFDK')
| -rw-r--r-- | libFDK/include/FDK_archdef.h | 2 | ||||
| -rw-r--r-- | libFDK/include/cplx_mul.h | 2 | ||||
| -rw-r--r-- | libFDK/include/mips/cplx_mul.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libFDK/include/FDK_archdef.h b/libFDK/include/FDK_archdef.h index cffb943..a831727 100644 --- a/libFDK/include/FDK_archdef.h +++ b/libFDK/include/FDK_archdef.h @@ -215,7 +215,7 @@ amm-info@iis.fraunhofer.de #else - #error >>>> Please set architecture characterization defines for your platform (FDK_HIGH_PERFORMANCE)! <<<< + #warning >>>> Please set architecture characterization defines for your platform (FDK_HIGH_PERFORMANCE)! <<<< #endif /* Architecture switches */ diff --git a/libFDK/include/cplx_mul.h b/libFDK/include/cplx_mul.h index 093ffa6..ce5c9f7 100644 --- a/libFDK/include/cplx_mul.h +++ b/libFDK/include/cplx_mul.h @@ -96,7 +96,7 @@ amm-info@iis.fraunhofer.de #if defined(__CC_ARM) || defined(__arm__) || defined(_M_ARM) /* cppp replaced: elif */ #include "arm/cplx_mul.h" -#elif defined(__GNUC__) && defined(__mips__) /* cppp replaced: elif */ +#elif defined(__GNUC__) && defined(__mips__) && __mips_isa_rev < 6 #include "mips/cplx_mul.h" #endif /* #if defined all cores: bfin, arm, etc. */ diff --git a/libFDK/include/mips/cplx_mul.h b/libFDK/include/mips/cplx_mul.h index e05d2b6..43cdbd0 100644 --- a/libFDK/include/mips/cplx_mul.h +++ b/libFDK/include/mips/cplx_mul.h @@ -89,7 +89,7 @@ amm-info@iis.fraunhofer.de ******************************************************************************/ -#if defined(__GNUC__) && defined(__mips__) +#if defined(__GNUC__) && defined(__mips__) && __mips_isa_rev < 6 //#define FUNCTION_cplxMultDiv2_32x16 |