Commit 1ba92cd6 authored by Juergen Reuter's avatar Juergen Reuter
Browse files

3a06cee Merge branch 'config_nvidia' into 'master'

parent 44fcc6d6
......@@ -27,6 +27,7 @@ wo_fc_grep_PGF95=`$GREP 'pgf95' conftest.log | head -1`
wo_fc_grep_PGFORTRAN=`$GREP 'pgfortran' conftest.log | head -1`
wo_fc_grep_PGHPF=`$GREP 'pghpf' conftest.log | head -1`
wo_fc_grep_FLANG=`$GREP 'clang version' conftest.log | head -1`
wo_fc_grep_NVIDIA=`$GREP 'nvfortran' conftest.log | head -1`
wo_fc_grep_default=`cat conftest.log | head -1`
if test -n "$wo_fc_grep_GFORTRAN"; then
......@@ -51,6 +52,8 @@ elif test -n "$wo_fc_grep_PGHPF"; then
wo_cv_fc_id_string=$wo_fc_grep_PGHPF
elif test -n "$wo_fc_grep_FLANG"; then
wo_cv_fc_id_string=$wo_fc_grep_FLANG
elif test -n "$wo_fc_grep_NVIDIA"; then
wo_cv_fc_id_string=$wo_fc_grep_NVIDIA
else
wo_cv_fc_id_string=$wo_fc_grep_default
fi
......@@ -85,6 +88,8 @@ elif test -n "$wo_fc_grep_PGHPF"; then
wo_cv_fc_vendor="PGI"
elif test -n "$wo_fc_grep_FLANG"; then
wo_cv_fc_vendor="flang"
elif test -n "$wo_fc_grep_NVIDIA"; then
wo_cv_fc_vendor="NVIDIA"
else
wo_cv_fc_vendor="unknown"
fi
......@@ -125,6 +130,9 @@ PGI)
flang)
wo_cv_fc_version=[`echo $FC_ID_STRING | $SED -e 's/.*clang version \([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
;;
NVIDIA)
wo_cv_fc_version=[`echo $FC_ID_STRING | $SED -e 's/[a-zA-Z\(\)]//g;s/^[0-9]\{2\}//g;s/32.*\|64.*//g'`]
;;
*)
wo_cv_fc_version="unknown"
;;
......@@ -726,6 +734,11 @@ PGI)
wo_cv_fcflags_openmp="-mp"
wo_cv_fc_openmp_header=""
;;
NVIDIA)
wo_cv_fc_openmp="yes"
wo_cv_fcflags_openmp="-mp"
wo_cv_fc_openmp_header=""
;;
*)
wo_cv_fc_openmp="no"
;;
......
......@@ -4386,6 +4386,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
nvcc* | nvc++*)
# NVIDIA Group C++ compiler
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
cxx*)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
......@@ -4737,6 +4743,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
nvcc* | nvc | nvc++ | nvfortran*)
# NVIDIA Group compilers
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
ccc*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment