diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-11-02 00:34:21 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-11-02 00:34:21 +0100 |
| commit | d228ee80f8578be474595a517a228111fac26c5e (patch) | |
| tree | eed22a0e69a45d980b41b3ae4495b8ee3eed01fa /gcc/configure | |
| parent | 917dd789e55c88123d804a8a411e4a61ee7b6e43 (diff) | |
re PR bootstrap/92314 (missing omp-device-properties', needed by 's-omp-device-properties-h')
PR bootstrap/92314
* configure.ac: Don't look for omp-device-properties files from
installed offloading compilers. Instead add tmake_file snippets
for configured offloading targets and use files they generate.
* Makefile.in (install): Don't depend on
install-omp-device-properties.
(install-omp-device-properties): Remove goal.
* config/i386/t-omp-device: New file.
* config/i386/t-intelmic (omp-device-properties): Remove goal.
* config/nvptx/t-omp-device: New file.
* config/nvptx/t-nvptx (omp-device-properties): Remove goal.
* configure: Regenerated.
From-SVN: r277735
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gcc/configure b/gcc/configure index 13935222228..5794582bdd5 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7881,18 +7881,22 @@ fi for tgt in `echo $enable_offload_targets | sed 's/,/ /g'`; do - tgt_dir=`echo $tgt | sed -n 's/.*=//p'` tgt=`echo $tgt | sed 's/=.*//'` if echo "$tgt" | grep "^hsa" > /dev/null ; then enable_hsa=1 else enable_offloading=1 - if test -n "$tgt_dir"; then - omp_device_property="${tgt_dir}/lib/gcc/\$(real_target_noncanonical)/\$(version)/accel/${tgt}/omp-device-properties" - else - omp_device_property="\$(libsubdir)/accel/${tgt}/omp-device-properties" - fi + case "$tgt" in + *-intelmicemul-*) + omp_device_property=omp-device-properties-i386 + omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/i386/t-omp-device" + ;; + nvptx*-*) + omp_device_property=omp-device-properties-nvptx + omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/nvptx/t-omp-device" + ;; + esac omp_device_properties="${omp_device_properties} ${tgt}=${omp_device_property}" omp_device_property_deps="${omp_device_property_deps} ${omp_device_property}" fi @@ -12536,7 +12540,7 @@ do tmake_file_="${tmake_file_} \$(srcdir)/config/$f" fi done -tmake_file="${tmake_file_}" +tmake_file="${tmake_file_}${omp_device_property_tmake_file}" out_object_file=`basename $out_file .c`.o common_out_object_file=`basename $common_out_file .c`.o @@ -18864,7 +18868,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18867 "configure" +#line 18871 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18970,7 +18974,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18973 "configure" +#line 18977 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |