diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2022-06-11 12:28:36 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2022-09-26 16:19:26 +0200 |
| commit | 74ddd1ec9d8d7b91790962faed0a5e23b5d1bbcb (patch) | |
| tree | 72e4c6c5c0b5890fbe193434fdc0b9e37bee2eab /gcc | |
| parent | 38a225f9d39f494f5dba718befef39631eb5768c (diff) | |
| download | gcc-74ddd1ec9d8d7b91790962faed0a5e23b5d1bbcb.zip gcc-74ddd1ec9d8d7b91790962faed0a5e23b5d1bbcb.tar.gz gcc-74ddd1ec9d8d7b91790962faed0a5e23b5d1bbcb.tar.bz2 | |
nvptx: Introduce dummy multilib option for default '-misa=sm_30'
... primarily in preparation for later changes.
gcc/
* config.gcc (TM_MULTILIB_CONFIG) [nvptx]: Set to '$with_arch'.
* config/nvptx/t-nvptx (MULTILIB_OPTIONS, MULTILIB_MATCHES)
(MULTILIB_EXCEPTIONS): Handle it.
(cherry picked from commit 4d94582e0dcbf5fed9d61213715bfff877bf5ecf)
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog.omp | 9 | ||||
| -rw-r--r-- | gcc/config.gcc | 1 | ||||
| -rw-r--r-- | gcc/config/nvptx/t-nvptx | 20 |
3 files changed, 29 insertions, 1 deletions
diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index 7f5f932..43fa051 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -3,6 +3,15 @@ Backported from master: 2022-09-26 Thomas Schwinge <thomas@codesourcery.com> + * config.gcc (TM_MULTILIB_CONFIG) [nvptx]: Set to '$with_arch'. + * config/nvptx/t-nvptx (MULTILIB_OPTIONS, MULTILIB_MATCHES) + (MULTILIB_EXCEPTIONS): Handle it. + +2022-09-26 Thomas Schwinge <thomas@codesourcery.com> + + Backported from master: + 2022-09-26 Thomas Schwinge <thomas@codesourcery.com> + * config.gcc (with_arch) [nvptx]: Set to 'sm_30'. * config/nvptx/nvptx.cc (nvptx_option_override): Assert that '-misa' appeared. diff --git a/gcc/config.gcc b/gcc/config.gcc index 3b1bde7..d492b77 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -5441,6 +5441,7 @@ case "${target}" in nvptx-*) supported_defaults=arch + TM_MULTILIB_CONFIG=$with_arch case $with_arch in sm_30 ) # OK; default. diff --git a/gcc/config/nvptx/t-nvptx b/gcc/config/nvptx/t-nvptx index 2b68149..c797d57 100644 --- a/gcc/config/nvptx/t-nvptx +++ b/gcc/config/nvptx/t-nvptx @@ -31,4 +31,22 @@ s-nvptx-gen-opt: $(srcdir)/config/nvptx/nvptx-sm.def \ tmp-nvptx-gen.opt $(srcdir)/config/nvptx/nvptx-gen.opt $(STAMP) s-nvptx-gen-opt -MULTILIB_OPTIONS = mgomp mptx=3.1 + +# Multilib setup. + +MULTILIB_OPTIONS = +MULTILIB_MATCHES = +MULTILIB_EXCEPTIONS = + +MULTILIB_OPTIONS += mgomp + +multilib_options_isa_list := $(TM_MULTILIB_CONFIG) +multilib_options_isa_default := $(word 1,$(multilib_options_isa_list)) +# Add the default '-misa' as a multilib option: +MULTILIB_OPTIONS += misa=$(multilib_options_isa_default) +# ..., but don't handle it specially (remap to default): +MULTILIB_MATCHES += .=misa?$(multilib_options_isa_default) +# ..., and don't actually build it: +MULTILIB_EXCEPTIONS += *misa=$(multilib_options_isa_default)* + +MULTILIB_OPTIONS += mptx=3.1 |