From 803f61d818d135441dd8a0363e5bb614febf8492 Mon Sep 17 00:00:00 2001
From: Matthew Barr <matthew.barr@intel.com>
Date: Wed, 29 Mar 2017 13:04:27 +1100
Subject: [PATCH] ICC doesn't have a __POPCNT__ macro

---
 src/util/popcount.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/util/popcount.h b/src/util/popcount.h
index d882a672..15361380 100644
--- a/src/util/popcount.h
+++ b/src/util/popcount.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Intel Corporation
+ * Copyright (c) 2015-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -30,8 +30,8 @@
  * \brief Platform specific popcount functions
  */
 
-#ifndef POPCOUNT_H_075D843B4545B6
-#define POPCOUNT_H_075D843B4545B6
+#ifndef UTIL_POPCOUNT_H_
+#define UTIL_POPCOUNT_H_
 
 #include "ue2common.h"
 
@@ -40,6 +40,8 @@
 #define HAVE_POPCOUNT_INSTR
 #elif defined(_WIN32) && defined(__AVX__) // TODO: fix win preproc
 #define HAVE_POPCOUNT_INSTR
+#elif defined(__INTEL_COMPILER) && defined(__SSE4_2__)
+#define HAVE_POPCOUNT_INSTR
 #endif
 
 static really_inline
@@ -76,5 +78,5 @@ u32 popcount64(u64a x) {
 #endif
 }
 
-#endif /* POPCOUNT_H_075D843B4545B6 */
+#endif /* UTIL_POPCOUNT_H_ */