Permalink
Browse files

openssl: revert empty_OPENSSL_cpuid_setup.patch

  • Loading branch information...
1 parent cfb6f08 commit 512be31809e315eb54e6913a45c0d46e6c52ec41 @piscisaureus piscisaureus committed Sep 12, 2012
@@ -97,8 +97,6 @@
# endif
#endif
-#define OPENSSL_CPUID_OBJ
-
/* crypto/opensslconf.h.in */
#ifdef OPENSSL_DOING_MAKEDEPEND
@@ -97,8 +97,6 @@
# endif
#endif
-#define OPENSSL_CPUID_OBJ
-
/* crypto/opensslconf.h.in */
#ifdef OPENSSL_DOING_MAKEDEPEND
@@ -100,8 +100,6 @@
# endif
#endif
-#define OPENSSL_CPUID_OBJ
-
/* crypto/opensslconf.h.in */
#ifdef OPENSSL_DOING_MAKEDEPEND
@@ -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
@@ -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
-

0 comments on commit 512be31

Please sign in to comment.