diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-03-31 21:01:08 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-03-31 21:01:08 +0300 |
| commit | cd81b0ac5de5f0d6e87bbe726c3fbc17b1d15d16 (patch) | |
| tree | c89eeab16d6c1f547915274c1e8b4786303f912c /arch/arm64/include/uapi/asm/bitsperlong.h | |
| parent | f08976ec5730d9ff85aded9f4d904ef1b321bdd2 (diff) | |
| parent | 9b4db147ac19c2320edec431d93193f42e32d425 (diff) | |
Merge branch 'tracking-ilp32' into merge-linux-linaroll-20150331.0
Diffstat (limited to 'arch/arm64/include/uapi/asm/bitsperlong.h')
| -rw-r--r-- | arch/arm64/include/uapi/asm/bitsperlong.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h index fce9c2924fa3..bb716d04a9b5 100644 --- a/arch/arm64/include/uapi/asm/bitsperlong.h +++ b/arch/arm64/include/uapi/asm/bitsperlong.h @@ -16,7 +16,14 @@ #ifndef __ASM_BITSPERLONG_H #define __ASM_BITSPERLONG_H -#define __BITS_PER_LONG 64 +/* Assuming __LP64__ will be defined for native ELF64's and not for ILP32. */ +#ifdef __LP64__ +# define __BITS_PER_LONG 64 +#elif defined(__ILP32__) +# define __BITS_PER_LONG 32 +#else +# error "Unknown ABI; not ILP32 or LP64" +#endif #include <asm-generic/bitsperlong.h> |