From 6e9b1e0244155ea65be25067ee79b9a2d367fdc2 Mon Sep 17 00:00:00 2001
From: "Field G. Van Zee" <field@cs.utexas.edu>
Date: Fri, 7 Jun 2019 13:10:16 -0500
Subject: [PATCH] Adjust -fopenmp-simd for icc's preferred syntax.

Details:
- Use -qopenmp-simd instead of -fopenmp-simd when compiling with Intel
  icc. Recall that this option is used for SIMD auto-vectorization in
  reference kernels only. Support for the -f option has been completely
  deprecated and removed in newer versions of icc in favor of -q. Thanks
  to Victor Eijkhout for reporting this issue and suggesting the fix.
---
 common.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common.mk b/common.mk
index 999df774b..4551ee1e3 100644
--- a/common.mk
+++ b/common.mk
@@ -763,8 +763,18 @@ endif
 # --- #pragma omp simd flags (used for reference kernels only) ---
 
 ifeq ($(PRAGMA_OMP_SIMD),yes)
+ifeq ($(CC_VENDOR),gcc)
 COMPSIMDFLAGS := -fopenmp-simd
 else
+ifeq ($(CC_VENDOR),clang)
+COMPSIMDFLAGS := -fopenmp-simd
+else
+ifeq ($(CC_VENDOR),icc)
+COMPSIMDFLAGS := -qopenmp-simd
+endif
+endif
+endif
+else # ifeq ($(PRAGMA_OMP_SIMD),no)
 COMPSIMDFLAGS :=
 endif