From b8d8ec09eefa77b20a8dc7678f506688ecb726fe Mon Sep 17 00:00:00 2001
From: eska <eska@eska.me>
Date: Thu, 12 May 2016 17:06:34 +0200
Subject: [PATCH] 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)

(cherry picked from commit 2392824dbab773b365dc77b8a75c1b75f42b93d8)
---
 drivers/builtin_openssl2/SCsub     | 1 -
 drivers/builtin_openssl2/nocpuid.c | 7 -------
 2 files changed, 8 deletions(-)
 delete mode 100644 drivers/builtin_openssl2/nocpuid.c

diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub
index 395dd21eef4..06d6b07c116 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 88246067bd0..00000000000
--- a/drivers/builtin_openssl2/nocpuid.c
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "openssl/crypto.h"
-
-
-void OPENSSL_cpuid_setup() {
-
-}