cleanup changes of building for Intel(R) Many Integrated Core Architecture

llvm-svn: 226271

1 files changed, 15 insertions, 7 deletions

diff --git a/openmp/runtime/tools/common.inc b/openmp/runtime/tools/common.inc
index db13251672d..e80b68ffe6c 100644
--- a/openmp/runtime/tools/common.inc
+++ b/openmp/runtime/tools/common.inc
@@ -37,12 +37,20 @@ endif # !omp_os
 
 # Compiling for the Intel(R) Many Integrated Core architecture is non-trivial at the next layer
 # of script down, but we can make it consistent here.
-ifeq "$(arch)" "mic"
+ifneq "$(filter knf knc knl, $(arch))" ""
     # I really do mean this...
-    override arch:=32e
+    # have top-level arch=mic and then mic_arch = flavor of mic
+    override mic_arch:=$(arch)
+    override arch:=mic
     override mic:=yes
 else
-    override mic:=no
+    ifeq "$(arch)" "mic"
+        # default flavor of mic is knc
+        mic_arch?=knc
+        override mic:=yes
+    else
+        override mic:=no
+    endif
 endif
 
 ifeq (,$(wildcard $(omp_root)/tools/$(omp_os).inc))
@@ -74,15 +82,15 @@ ifneq "$(mic)" "no"
 	$(error Compiling the runtime with gcc is not supported on Intel\(R\) Many Integrated Core Architecture)
     endif
 
-    # Magic flags for the build script!
-    build_args += --os=lrb --mic-arch=knc --mic-os=lin --mic-comp=offload
+    # Add Intel(R) Many Integrated Core Architecture kind (knf, knc, knl, etc.)
+    build_args += --mic-arch=$(mic_arch)
 
     # Check that the binutils for Intel(R) Many Integrated Core Architecture are available
     # First we see whether the objdump on the user's path supports the k1om architecture.
-    hask1om = $(shell if (objdump --help | grep -s k1om); then echo OK; else echo KO; fi)
+    hask1om = $(shell if (x86_64-k1om-linux-objdump --help | grep -s k1om); then echo OK; else echo KO; fi)
     ifneq "$(hask1om)" "OK"
         # Appropriate binutils are not already set up, so try to add them from the default place.
-        micBinPath = /usr/linux-k1om-4.7/x86_64-k1om-linux/bin
+        micBinPath = /usr/linux-k1om-4.7/bin
         micBinPresent = $(shell if test -d $(micBinPath); then echo OK; else echo KO; fi)
         ifneq "$(micBinPresent)" "OK"
             # We can't find them in the normal place, so complain.