summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Sedoi <bsnote@gmail.com>2013-06-12 18:47:10 +0300
committerBen Noordhuis <info@bnoordhuis.nl>2013-06-13 13:27:58 +0200
commit884b25356f20cd95412d86a413283c98d0ac5ed2 (patch)
treef37bc105665a6f72983ac659a60596b4352bf155
parente8500274e04bab2eb630b4000cbd35be8d23d3fd (diff)
downloadnode-new-884b25356f20cd95412d86a413283c98d0ac5ed2.tar.gz
openssl: add missing configuration pieces for MIPS
-rwxr-xr-xconfigure2
-rw-r--r--deps/openssl/config/opensslconf.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/configure b/configure
index 4747dd2a16..77add2b42c 100755
--- a/configure
+++ b/configure
@@ -381,6 +381,7 @@ def host_arch_cc():
'__x86_64__' : 'x64',
'__i386__' : 'ia32',
'__arm__' : 'arm',
+ '__mips__' : 'mips',
}
rtn = 'ia32' # default
@@ -402,6 +403,7 @@ def host_arch_win():
'AMD64' : 'x64',
'x86' : 'ia32',
'arm' : 'arm',
+ 'mips' : 'mips',
}
return matchup.get(arch, 'ia32')
diff --git a/deps/openssl/config/opensslconf.h b/deps/openssl/config/opensslconf.h
index 9bf23692d6..5dd3d411a2 100644
--- a/deps/openssl/config/opensslconf.h
+++ b/deps/openssl/config/opensslconf.h
@@ -179,7 +179,7 @@
* - elder Alpha because it lacks byte load/store instructions;
*/
# undef RC4_INT
-# if defined(__arm__)
+# if defined(__arm__) || defined(__mips__)
# define RC4_INT unsigned char
# else
# define RC4_INT unsigned int
@@ -194,7 +194,7 @@
# define RC4_CHUNK unsigned long long
# elif (defined(_M_X64) || defined(__x86_64__)) && !defined(_WIN32)
# define RC4_CHUNK unsigned long
-# elif defined(__arm__)
+# elif defined(__arm__) || defined(__mips__)
# define RC4_CHUNK unsigned long
# else
/* On x86 RC4_CHUNK is not defined */
@@ -253,7 +253,7 @@
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
# define CONFIG_HEADER_BF_LOCL_H
# undef BF_PTR
-# if defined(__arm__)
+# if defined(__arm__) || defined(__mips__)
# define BF_PTR
# endif
#endif /* HEADER_BF_LOCL_H */