Skip to content

Commit e05dff1

Browse files
bnoordhuisindutny
authored andcommitted
deps: openssl - add x32 support
This commit adds preliminary x32 support. Configure with: $ ./configure --dest-cpu=x32 PR-URL: node-forward/node#24 Reviewed-By: Fedor Indutny <[email protected]>
1 parent ab71223 commit e05dff1

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

deps/openssl/config/opensslconf.h

+8-17
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,8 @@
190190
* boundary. See crypto/rc4/rc4_enc.c for further details.
191191
*/
192192
# undef RC4_CHUNK
193-
# if (defined(_M_X64) || defined(__x86_64__)) && defined(_WIN32)
193+
# if defined(_M_X64) || defined(__x86_64__)
194194
# define RC4_CHUNK unsigned long long
195-
# elif (defined(_M_X64) || defined(__x86_64__)) && !defined(_WIN32)
196-
# define RC4_CHUNK unsigned long
197195
# elif defined(__arm__)
198196
# define RC4_CHUNK unsigned long
199197
# else
@@ -205,21 +203,12 @@
205203
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
206204
* %20 speed up (longs are 8 bytes, int's are 4). */
207205
# undef DES_LONG
208-
# if defined(_M_X64) || defined(__x86_64__) || defined(__arm__) || defined(__mips__)
209-
# define DES_LONG unsigned int
210-
# elif defined(_M_IX86) || defined(__i386__)
211-
# define DES_LONG unsigned long
212-
# endif
206+
# define DES_LONG unsigned int
213207
#endif
214208

215209
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
216210
# define CONFIG_HEADER_BN_H
217211

218-
# undef BL_LLONG
219-
# if defined(_M_IX86) || defined(__i386__) || defined(__arm__)
220-
# define BL_LLONG
221-
# endif
222-
223212
/* Should we define BN_DIV2W here? */
224213

225214
/* Only one for the following should be defined */
@@ -231,10 +220,12 @@
231220
# undef THIRTY_TWO_BIT
232221
# undef SIXTEEN_BIT
233222
# undef EIGHT_BIT
234-
# if (defined(_M_X64) || defined(__x86_64__)) && defined(_WIN32)
235-
# define SIXTY_FOUR_BIT
236-
# elif (defined(_M_X64) || defined(__x86_64__)) && !defined(_WIN32)
237-
# define SIXTY_FOUR_BIT_LONG
223+
# if defined(_M_X64) || defined(__x86_64__)
224+
# if defined(_WIN64) || defined(_LP64)
225+
# define SIXTY_FOUR_BIT_LONG
226+
# else
227+
# define SIXTY_FOUR_BIT
228+
# endif
238229
# elif defined(_M_IX86) || defined(__i386__) || defined(__arm__) || defined(__mips__)
239230
# define THIRTY_TWO_BIT
240231
# endif

0 commit comments

Comments
 (0)