From 99382d2f7fe50719090143b88334caf8fc277e2e Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Mon, 28 Jan 2019 13:07:17 -0700
Subject: [PATCH] util: Move architecture detection to crc32c.c

This is only needed within the c file. It doesn't
need to be in the public header.

Change-Id: I0e072ea5eddc6edc84faecee9ef50fb2c20dbb24
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/442426
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 include/spdk/crc32.h | 16 ----------------
 lib/util/crc32c.c    | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/include/spdk/crc32.h b/include/spdk/crc32.h
index dbe961f12..83df6fdb6 100644
--- a/include/spdk/crc32.h
+++ b/include/spdk/crc32.h
@@ -46,22 +46,6 @@
 extern "C" {
 #endif
 
-#if defined(__aarch64__) || defined(__AARCH64__)
-#ifdef __ARM_FEATURE_CRC32
-#define SPDK_HAVE_ARM_CRC
-#include <arm_acle.h>
-#endif
-#endif
-
-#if defined(__x86_64__) && defined(__SSE4_2__)
-#ifdef SPDK_CONFIG_ISAL
-#define SPDK_HAVE_ISAL
-#include <isa-l/include/crc.h>
-#else
-#define SPDK_HAVE_SSE4_2
-#include <x86intrin.h>
-#endif
-#endif
 /**
  * IEEE CRC-32 polynomial (bit reflected)
  */
diff --git a/lib/util/crc32c.c b/lib/util/crc32c.c
index 65c8a673c..babb3c730 100644
--- a/lib/util/crc32c.c
+++ b/lib/util/crc32c.c
@@ -33,6 +33,23 @@
 
 #include "spdk/crc32.h"
 
+#if defined(__aarch64__) || defined(__AARCH64__)
+#ifdef __ARM_FEATURE_CRC32
+#define SPDK_HAVE_ARM_CRC
+#include <arm_acle.h>
+#endif
+#endif
+
+#if defined(__x86_64__) && defined(__SSE4_2__)
+#ifdef SPDK_CONFIG_ISAL
+#define SPDK_HAVE_ISAL
+#include <isa-l/include/crc.h>
+#else
+#define SPDK_HAVE_SSE4_2
+#include <x86intrin.h>
+#endif
+#endif
+
 #ifdef SPDK_HAVE_ISAL
 
 uint32_t