On 3/23/21 9:04 AM, Thomas Schwinge wrote:
> From eac0d3458f38cd5bb4c930b2887a547b64b046ef Mon Sep 17 00:00:00 2001
> From: Thomas Schwinge <tho...@codesourcery.com>
> Date: Wed, 13 Jan 2021 09:04:47 +0100
> Subject: [PATCH] [nvptx] Let nvptx-as figure out the target architecture
> [PR97348]
>
> ... now that it has been enhanced to do so.
>
> This is a follow-up to PR97348 commit 383400a6078d75bbfa1216c9af2c37f7e88740c9
> "[nvptx] Set -misa=sm_35 by default".
>
> gcc/
> PR target/97348
> * config/nvptx/nvptx.h (ASM_SPEC): Don't set.
> * config/nvptx/nvptx.opt (misa): Adjust comment.
> ---
> gcc/config/nvptx/nvptx.h | 5 -----
> gcc/config/nvptx/nvptx.opt | 1 -
> 2 files changed, 6 deletions(-)
>
> diff --git a/gcc/config/nvptx/nvptx.h b/gcc/config/nvptx/nvptx.h
> index 2451703e77f..1a61e6207f6 100644
> --- a/gcc/config/nvptx/nvptx.h
> +++ b/gcc/config/nvptx/nvptx.h
> @@ -29,11 +29,6 @@
>
> #define STARTFILE_SPEC "%{mmainkernel:crt0.o}"
>
> -/* Default needs to be in sync with default for misa in nvptx.opt.
> - We add a default here to work around a hard-coded sm_30 default in
> - nvptx-as. */
> -#define ASM_SPEC "%{misa=*:-m %*; :-m sm_35}"
> -
> #define TARGET_CPU_CPP_BUILTINS() \
> do \
> { \
> diff --git a/gcc/config/nvptx/nvptx.opt b/gcc/config/nvptx/nvptx.opt
> index 51363e4e276..cf7f9022663 100644
> --- a/gcc/config/nvptx/nvptx.opt
> +++ b/gcc/config/nvptx/nvptx.opt
> @@ -61,7 +61,6 @@ Enum(ptx_isa) String(sm_30) Value(PTX_ISA_SM30)
> EnumValue
> Enum(ptx_isa) String(sm_35) Value(PTX_ISA_SM35)
>
> -; Default needs to be in sync with default in ASM_SPEC in nvptx.h.
> misa=
> Target RejectNegative ToLower Joined Enum(ptx_isa) Var(ptx_isa_option)
> Init(PTX_ISA_SM35)
> Specify the version of the ptx ISA to use.
> -- 2.17.1
Hi Thomas,
Sorry for the delay. LGTM, please apply.
Thanks,
- Tom
