From a82f5389d9673a48ab0facd6e77b2244dfe084c6 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 21 Dec 2011 18:28:34 +0100 Subject: [PATCH] deps: fix openssl build on x86_64 --- deps/openssl/config/piii/openssl/opensslconf-posix.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/deps/openssl/config/piii/openssl/opensslconf-posix.h b/deps/openssl/config/piii/openssl/opensslconf-posix.h index 7594f33..9f87f27 100644 --- a/deps/openssl/config/piii/openssl/opensslconf-posix.h +++ b/deps/openssl/config/piii/openssl/opensslconf-posix.h @@ -187,11 +187,19 @@ * for debuging the bignum libraries */ #undef SIXTY_FOUR_BIT_LONG #undef SIXTY_FOUR_BIT -#define THIRTY_TWO_BIT +#undef THIRTY_TWO_BIT #undef SIXTEEN_BIT #undef EIGHT_BIT + +/* Let's hope ARM never releases a 64 bits CPU... */ +#if __x86_64__ +# define SIXTY_FOUR_BIT +#else +# define THIRTY_TWO_BIT #endif +#endif /* defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) */ + #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) #define CONFIG_HEADER_RC4_LOCL_H /* if this is defined data[i] is used instead of *data, this is a %20 @@ -213,6 +221,10 @@ #define DES_PTR #endif +#if __x86_64__ +#undef DES_PTR +#endif + /* This helps C compiler generate the correct code for multiple functional * units. It reduces register dependancies at the expense of 2 more * registers */ -- 2.7.4