git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Harden and adjust 'gcc/configure' parsing of '--enable-offload-targets' 

Fix-up for commit d228ee80f8 "re PR
bootstrap/92314 (missing omp-device-properties', needed by
's-omp-device-properties-h')".

	gcc/
	* configure.ac <$enable_offload_targets>: Do parsing as done
	elsewhere.
	* configure: Regenerate.
This commit is contained in:
Thomas Schwinge 2020-04-23 21:59:07 +02:00
parent b6a0ae1d22
commit d20219b5ab
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ChangeLog
View File

@ -1,5 +1,9 @@
2020-04-29 Thomas Schwinge <thomas@codesourcery.com> 2020-04-29 Thomas Schwinge <thomas@codesourcery.com>
* configure.ac <$enable_offload_targets>: Do parsing as done
elsewhere.
* configure: Regenerate.
* configure.ac <$enable_offload_targets>: 'amdgcn' is 'gcn'. * configure.ac <$enable_offload_targets>: 'amdgcn' is 'gcn'.
* configure: Regenerate. * configure: Regenerate.

13
gcc/configure vendored
View File

@ -7920,18 +7920,21 @@ for tgt in `echo $enable_offload_targets | sed 's/,/ /g'`; do
else else
enable_offloading=1 enable_offloading=1
case "$tgt" in case "$tgt" in
*-intelmicemul-*) *-intelmic-* | *-intelmicemul-*)
omp_device_property=omp-device-properties-i386 omp_device_property=omp-device-properties-i386
omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/i386/t-omp-device" omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/i386/t-omp-device"
;; ;;
amdgcn*-*) amdgcn*)
omp_device_property=omp-device-properties-gcn omp_device_property=omp-device-properties-gcn
omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/gcn/t-omp-device" omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/gcn/t-omp-device"
;; ;;
nvptx*-*) nvptx*)
omp_device_property=omp-device-properties-nvptx omp_device_property=omp-device-properties-nvptx
omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/nvptx/t-omp-device" omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/nvptx/t-omp-device"
;; ;;
*)
as_fn_error $? "unknown offload target specified" "$LINENO" 5
;;
esac esac
omp_device_properties="${omp_device_properties} ${tgt}=${omp_device_property}" omp_device_properties="${omp_device_properties} ${tgt}=${omp_device_property}"
omp_device_property_deps="${omp_device_property_deps} ${omp_device_property}" omp_device_property_deps="${omp_device_property_deps} ${omp_device_property}"
@ -18985,7 +18988,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 18988 "configure" #line 18991 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -19091,7 +19094,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 19094 "configure" #line 19097 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H

9
gcc/configure.ac
View File

@ -1045,18 +1045,21 @@ for tgt in `echo $enable_offload_targets | sed 's/,/ /g'`; do
else else
enable_offloading=1 enable_offloading=1
case "$tgt" in case "$tgt" in
*-intelmicemul-*) *-intelmic-* | *-intelmicemul-*)
omp_device_property=omp-device-properties-i386 omp_device_property=omp-device-properties-i386
omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/i386/t-omp-device" omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/i386/t-omp-device"
;; ;;
amdgcn*-*) amdgcn*)
omp_device_property=omp-device-properties-gcn omp_device_property=omp-device-properties-gcn
omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/gcn/t-omp-device" omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/gcn/t-omp-device"
;; ;;
nvptx*-*) nvptx*)
omp_device_property=omp-device-properties-nvptx omp_device_property=omp-device-properties-nvptx
omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/nvptx/t-omp-device" omp_device_property_tmake_file="${omp_device_property_tmake_file} \$(srcdir)/config/nvptx/t-omp-device"
;; ;;
*)
AC_MSG_ERROR([unknown offload target specified])
;;
esac esac
omp_device_properties="${omp_device_properties} ${tgt}=${omp_device_property}" omp_device_properties="${omp_device_properties} ${tgt}=${omp_device_property}"
omp_device_property_deps="${omp_device_property_deps} ${omp_device_property}" omp_device_property_deps="${omp_device_property_deps} ${omp_device_property}"