From f2f96fb86d42396716b3e556da7a930956e712fb Mon Sep 17 00:00:00 2001 From: Marcus Oakland Date: Mon, 24 Feb 2014 14:48:50 +0000 Subject: AArch64: Make LONG 4 bytes The libSYS/include/machine_type.h header file states LONG should be "Data type representing 4 byte signed integer on all supported platforms" but only provided for defining LONG as INT and ULONG as UINT when __x86_64__ was defined. This has been changed to when __LP64__ is defined, so that it also applies to AArch64. The change to libFDK/include/common_fix.h is then needed to get the project to compile. Change-Id: Iea42d7eca97dcc9da772a05b207d134cb999a72a Signed-off-by: Marcus Oakland --- libFDK/include/common_fix.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libFDK') diff --git a/libFDK/include/common_fix.h b/libFDK/include/common_fix.h index 79c87ac..d2d11f4 100644 --- a/libFDK/include/common_fix.h +++ b/libFDK/include/common_fix.h @@ -226,7 +226,7 @@ FDK_INLINE FIXP_SGL fAbs(FIXP_SGL x) { return fixabs_S(x); } /* workaround for TI C6x compiler but not for TI ARM9E compiler */ -#if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__) +#if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__LP64__) FDK_INLINE INT fAbs(INT x) { return fixabs_I(x); } #endif @@ -336,7 +336,7 @@ FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b) { return fixmax_S(a,b); } /* workaround for TI C6x compiler but not for TI ARM9E */ -#if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__)) || (FIX_FRACT == 1) +#if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__LP64__)) || (FIX_FRACT == 1) FDK_INLINE INT fMax(INT a, INT b) { return fixmax_I(a,b); } FDK_INLINE INT fMin(INT a, INT b) -- cgit v1.2.3 From 8609bfea36ebcd6e307408dd557101a8e2fa89d4 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Fri, 28 Feb 2014 17:16:31 -0800 Subject: Temporary workaround for 64-bit build error Replace #error by #warning so we can build 64-bit Change-Id: Ib52fbfb0e5e945ff04ba51ae06b4e3393886d7b7 --- libFDK/include/FDK_archdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libFDK') diff --git a/libFDK/include/FDK_archdef.h b/libFDK/include/FDK_archdef.h index da63aee..5dbc138 100644 --- a/libFDK/include/FDK_archdef.h +++ b/libFDK/include/FDK_archdef.h @@ -203,7 +203,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 */ -- cgit v1.2.3 From 5c51a5898e4a97c19b83c2e366355c41718c5e10 Mon Sep 17 00:00:00 2001 From: Duane Sand Date: Tue, 8 Jul 2014 17:48:36 -0700 Subject: [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6 Change-Id: I3dacd96cf9d5cf9c3d34d612ebb0456d64bc23bc --- libFDK/include/cplx_mul.h | 2 +- libFDK/include/mips/cplx_mul.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libFDK') 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 -- cgit v1.2.3