[gcc r12-7581] [nvptx] Restore default to sm_30

[gcc r12-7581] [nvptx] Restore default to sm_30

[Tom de Vries]

https://gcc.gnu.org/g:831ecddf5bb99e15743f71b6c8257f3ceaa80ddc

commit r12-7581-g831ecddf5bb99e15743f71b6c8257f3ceaa80ddc
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Mar 3 20:20:41 2022 +0100

    [nvptx] Restore default to sm_30
    
    With commit 07667c911b1 ("[nvptx] Build libraries with misa=sm_30") the
    intention was that the sm_xx for all libraries was switched back to sm_30
    using MULTILIB_EXTRA_OPTS, without changing the default sm_35.
    
    Testing on an sm_30 board revealed that still some libs were build with sm_35,
    so fix this by switching back to default sm_30.
    
    Tested on nvptx.
    
    gcc/ChangeLog:
    
    2022-03-07  Tom de Vries  <tdevries@suse.de>
    
            PR target/104758
            * config/nvptx/nvptx.opt (misa): Set default to sm_30.
            * config/nvptx/t-nvptx (MULTILIB_EXTRA_OPTS): Remove misa=sm_30.

Diff:
---
 gcc/config/nvptx/nvptx.opt | 2 +-
 gcc/config/nvptx/t-nvptx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/config/nvptx/nvptx.opt b/gcc/config/nvptx/nvptx.opt
index c83ceb3568b..fea99c5d406 100644
--- a/gcc/config/nvptx/nvptx.opt
+++ b/gcc/config/nvptx/nvptx.opt
@@ -53,7 +53,7 @@ Generate code for OpenMP offloading: enables -msoft-stack and -muniform-simt.
 
 ; 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)
+Target RejectNegative ToLower Joined Enum(ptx_isa) Var(ptx_isa_option) Init(PTX_ISA_SM30)
 Specify the version of the ptx ISA to use.
 
 Enum
diff --git a/gcc/config/nvptx/t-nvptx b/gcc/config/nvptx/t-nvptx
index 8f67264d132..a4a5341bb24 100644
--- a/gcc/config/nvptx/t-nvptx
+++ b/gcc/config/nvptx/t-nvptx
@@ -32,4 +32,4 @@ s-nvptx-gen-opt: $(srcdir)/config/nvptx/nvptx-sm.def
 
 MULTILIB_OPTIONS = mgomp
 
-MULTILIB_EXTRA_OPTS = misa=sm_30 mptx=3.1
+MULTILIB_EXTRA_OPTS = mptx=3.1