diff options
| author |   Carl Smith <carl.smith@alliedtelesis.co.nz> | 2018-07-26 15:45:28 +1200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-07-27 12:04:37 +0000 |
| commit | 28d4271d1a9103099e6711fc58f9a479c8722e60 (patch) | |
| tree | 40839c9981cbcf4e14585c118955d28993c407f9 /src/vppinfra/types.h | |
| parent | fc5dda3d0a96fd9722cdac055dfa4865823d5ebd (diff) | |
mips64: Add timer and longjump support
Also correct types.h for mips64 which could never be hit
as _mips was part of the previous ifdef.
Change-Id: Id0435c8fc960c5d25c43129b9d9f1606e39ba8e3
Signed-off-by: Carl Smith <carl.smith@alliedtelesis.co.nz>
Diffstat (limited to 'src/vppinfra/types.h')
| -rw-r--r-- | src/vppinfra/types.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vppinfra/types.h b/src/vppinfra/types.h index 5fd378314f3..c5e7f09ef23 100644 --- a/src/vppinfra/types.h +++ b/src/vppinfra/types.h @@ -64,7 +64,7 @@ typedef unsigned int u128 __attribute__ ((mode (TI))); #endif #endif -#if (defined(i386) || defined(_mips) || defined(powerpc) || defined (__SPU__) || defined(__sparc__) || defined(__arm__) || defined (__xtensa__) || defined(__TMS320C6X__)) +#if (defined(i386) || (defined(_mips) && __mips != 64) || defined(powerpc) || defined (__SPU__) || defined(__sparc__) || defined(__arm__) || defined (__xtensa__) || defined(__TMS320C6X__)) typedef signed int i32; typedef signed long long i64; @@ -73,16 +73,16 @@ typedef unsigned int u32; typedef unsigned long long u64; #endif /* CLIB_AVOID_CLASH_WITH_LINUX_TYPES */ -#elif defined(_mips) && __mips == 64 -#define log2_uword_bits 6 -#define clib_address_bits _MIPS_SZPTR - -#elif defined(alpha) || defined(__x86_64__) || defined (__powerpc64__) || defined (__aarch64__) +#elif defined(alpha) || (defined(_mips) && __mips == 64) || defined(__x86_64__) || defined (__powerpc64__) || defined (__aarch64__) typedef signed int i32; typedef signed long i64; #define log2_uword_bits 6 +#if defined(_mips) +#define clib_address_bits _MIPS_SZPTR +#else #define clib_address_bits 64 +#endif #ifndef CLIB_AVOID_CLASH_WITH_LINUX_TYPES typedef unsigned int u32; |