summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreska <eska@eska.me>2016-05-12 17:06:34 +0200
committereska <eska@eska.me>2016-05-12 17:06:34 +0200
commit2392824dbab773b365dc77b8a75c1b75f42b93d8 (patch)
treed6aa07b828e126c1dbce92ecbe4a2a8db02e8e9a
parent48dc4d92a8f3c9eb42456eda2433c6fcaff0c723 (diff)
Remove nocpuid.c from builtin OpenSSL
Since opensslconf.h no longer defines OPENSSL_CPUID_OBJ, OpenSSL defines OPENSSL_cpuid_setup itself (with the same empty definition)
-rw-r--r--drivers/builtin_openssl2/SCsub1
-rw-r--r--drivers/builtin_openssl2/nocpuid.c7
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub
index 395dd21eef..06d6b07c11 100644
--- a/drivers/builtin_openssl2/SCsub
+++ b/drivers/builtin_openssl2/SCsub
@@ -2,7 +2,6 @@ Import('env')
Import('env_ssl')
openssl_sources = [
-"nocpuid.c",
"ssl/t1_lib.c",
"ssl/t1_ext.c",
"ssl/s3_srvr.c",
diff --git a/drivers/builtin_openssl2/nocpuid.c b/drivers/builtin_openssl2/nocpuid.c
deleted file mode 100644
index 88246067bd..0000000000
--- a/drivers/builtin_openssl2/nocpuid.c
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "openssl/crypto.h"
-
-
-void OPENSSL_cpuid_setup() {
-
-}