diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-09-13 01:11:06 +0200 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-09-25 08:51:03 -0700 |
| commit | d2fb507556498b9450b6397ac17e821edcab9a68 (patch) | |
| tree | 2cd735b9ca0e09913ae3c9350bea78be4801eedc /deps/openssl | |
| parent | 09ac9d0b2c1ee99c9d023ee3aa5a42109aecf09e (diff) | |
| download | node-new-d2fb507556498b9450b6397ac17e821edcab9a68.tar.gz | |
openssl: revert empty_OPENSSL_cpuid_setup.patch
Diffstat (limited to 'deps/openssl')
5 files changed, 1 insertions, 18 deletions
diff --git a/deps/openssl/config/k8/openssl/opensslconf-posix.h b/deps/openssl/config/k8/openssl/opensslconf-posix.h index d18925b94a..06852209d2 100644 --- a/deps/openssl/config/k8/openssl/opensslconf-posix.h +++ b/deps/openssl/config/k8/openssl/opensslconf-posix.h @@ -97,8 +97,6 @@ # endif #endif -#define OPENSSL_CPUID_OBJ - /* crypto/opensslconf.h.in */ #ifdef OPENSSL_DOING_MAKEDEPEND diff --git a/deps/openssl/config/piii/openssl/opensslconf-posix.h b/deps/openssl/config/piii/openssl/opensslconf-posix.h index 7594f33f62..d935d431ce 100644 --- a/deps/openssl/config/piii/openssl/opensslconf-posix.h +++ b/deps/openssl/config/piii/openssl/opensslconf-posix.h @@ -97,8 +97,6 @@ # endif #endif -#define OPENSSL_CPUID_OBJ - /* crypto/opensslconf.h.in */ #ifdef OPENSSL_DOING_MAKEDEPEND diff --git a/deps/openssl/config/piii/openssl/opensslconf-win32.h b/deps/openssl/config/piii/openssl/opensslconf-win32.h index c27b492427..b4cdf04f1b 100644 --- a/deps/openssl/config/piii/openssl/opensslconf-win32.h +++ b/deps/openssl/config/piii/openssl/opensslconf-win32.h @@ -100,8 +100,6 @@ # endif #endif -#define OPENSSL_CPUID_OBJ - /* crypto/opensslconf.h.in */ #ifdef OPENSSL_DOING_MAKEDEPEND diff --git a/deps/openssl/openssl/crypto/cryptlib.c b/deps/openssl/openssl/crypto/cryptlib.c index 387a9879ca..24fe123e14 100644 --- a/deps/openssl/openssl/crypto/cryptlib.c +++ b/deps/openssl/openssl/crypto/cryptlib.c @@ -690,7 +690,7 @@ void OPENSSL_cpuid_setup(void) unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; } #endif int OPENSSL_NONPIC_relocated = 0; -#if !defined(OPENSSL_CPUID_SETUP) +#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) void OPENSSL_cpuid_setup(void) {} #endif diff --git a/deps/openssl/patches/empty_OPENSSL_cpuid_setup.patch b/deps/openssl/patches/empty_OPENSSL_cpuid_setup.patch deleted file mode 100644 index 58e52ad1fd..0000000000 --- a/deps/openssl/patches/empty_OPENSSL_cpuid_setup.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openssl-1.0.0f-origin/crypto/cryptlib.c 2011-06-22 23:39:00.000000000 +0800 -+++ openssl-1.0.0f/crypto/cryptlib.c 2012-01-19 02:17:50.261681856 +0800 -@@ -690,7 +690,7 @@ - unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; } - #endif - int OPENSSL_NONPIC_relocated = 0; --#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) -+#if !defined(OPENSSL_CPUID_SETUP) - void OPENSSL_cpuid_setup(void) {} - #endif - |