feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2747 from dgarske/sizeof_long

Browse Source 
Improvements for detection of 64-bit support
This commit is contained in:
JacobBarthelmeh
2020-01-17 15:10:44 -07:00
committed by GitHub
parent 204ef9543a c38d5e9a29
commit 87859f9e81
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wolfssl/wolfcrypt/types.h
View File

@ -61,12 +61,22 @@
#endif #endif
/* try to set SIZEOF_LONG or LONG_LONG if user didn't */ /* try to set SIZEOF_LONG or SIZEOF_LONG_LONG if user didn't */
#if !defined(_MSC_VER) && !defined(__BCPLUSPLUS__) && !defined(__EMSCRIPTEN__) #if defined(_MSC_VER) || defined(HAVE_LIMITS_H)
#if !defined(SIZEOF_LONG_LONG) && !defined(SIZEOF_LONG)
#include <limits.h>
#if defined(ULONG_MAX) && (ULONG_MAX == 0xffffffffUL)
#define SIZEOF_LONG 4
#endif
#if defined(ULLONG_MAX) && (ULLONG_MAX == 0xffffffffffffffffULL)
#define SIZEOF_LONG_LONG 8
#endif
#endif
#elif !defined(__BCPLUSPLUS__) && !defined(__EMSCRIPTEN__)
#if !defined(SIZEOF_LONG_LONG) && !defined(SIZEOF_LONG) #if !defined(SIZEOF_LONG_LONG) && !defined(SIZEOF_LONG)
#if (defined(__alpha__) || defined(__ia64__) || \ #if (defined(__alpha__) || defined(__ia64__) || \
defined(_ARCH_PPC64) || defined(__mips64) || \ defined(_ARCH_PPC64) || defined(__mips64) || \
defined(__x86_64__) || \ defined(__x86_64__) || defined(__s390x__ ) || \
((defined(sun) || defined(__sun)) && \ ((defined(sun) || defined(__sun)) && \
(defined(LP64) || defined(_LP64)))) (defined(LP64) || defined(_LP64))))
/* long should be 64bit */ /* long should be 64bit */
@ -104,7 +114,7 @@
/* These platforms have 64-bit CPU registers. */ /* These platforms have 64-bit CPU registers. */
#if (defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || \ #if (defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || \
defined(__mips64) || defined(__x86_64__) || defined(_M_X64)) || \ defined(__mips64) || defined(__x86_64__) || defined(_M_X64)) || \
defined(__aarch64__) || defined(__sparc64__) || \ defined(__aarch64__) || defined(__sparc64__) || defined(__s390x__ ) || \
(defined(__riscv_xlen) && (__riscv_xlen == 64)) (defined(__riscv_xlen) && (__riscv_xlen == 64))
typedef word64 wolfssl_word; typedef word64 wolfssl_word;
#define WC_64BIT_CPU #define WC_64BIT_CPU