| Index: src/trusted/service_runtime/include/bits/wordsize.h
|
| diff --git a/src/trusted/service_runtime/include/bits/wordsize.h b/src/trusted/service_runtime/include/bits/wordsize.h
|
| index e1a468c4dfb55568127db5b1fa1e7456b787b90b..60b4c983a269661824b529dd63e592b24001665f 100644
|
| --- a/src/trusted/service_runtime/include/bits/wordsize.h
|
| +++ b/src/trusted/service_runtime/include/bits/wordsize.h
|
| @@ -12,12 +12,14 @@
|
| #ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_INCLUDE_BITS_WORDSIZE_H_
|
| #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_INCLUDE_BITS_WORDSIZE_H_
|
|
|
| -#if defined(__powerpc64__) || defined(__s390x__) || defined(__arch64__) || \
|
| - defined(__sparcv9) || defined(__x86_64__) || defined(_AMD64_) || \
|
| - defined(_M_AMD64)
|
| -#define __WORDSIZE 64
|
| -#else
|
| -#define __WORDSIZE 32
|
| +#if !defined(__WORDSIZE)
|
| +# if defined(__powerpc64__) || defined(__s390x__) || defined(__arch64__) || \
|
| + defined(__sparcv9) || defined(__x86_64__) || defined(_AMD64_) || \
|
| + defined(_M_AMD64)
|
| +# define __WORDSIZE 64
|
| +# else
|
| +# define __WORDSIZE 32
|
| +# endif
|
| #endif
|
|
|
| -#endif
|
| +#endif /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_INCLUDE_BITS_WORDSIZE_H_ */
|
|
|