From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 213F238582A2; Mon, 26 Sep 2022 14:12:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 213F238582A2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664201569; bh=fj/8tzdjzIPzsWbfhBXcxj8yBfDjp+c6YU/xmUbC3ao=; h=From:To:Subject:Date:From; b=AhHBA7xgh255HX+CvSSOcPw1j7LIh/p02hFo5t6Fsiay8OLgxM6+5XVFBU/xBlfgc UdvNOFS8fLBaPCoVMe1cQmgbbRp/6qahgrqinHdwffr5cbw5U4WZH7PAoG0vlfOK7Y 3CIPOOPC/rWTn9gCmD8Qh99FwVjapj2qcno8nOdA= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2874] nvptx: Introduce dummy multilib option for default '-misa=sm_30' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/master X-Git-Oldrev: 108b99b6c45ed8fbad6776539a639244b63191f5 X-Git-Newrev: 4d94582e0dcbf5fed9d61213715bfff877bf5ecf Message-Id: <20220926141249.213F238582A2@sourceware.org> Date: Mon, 26 Sep 2022 14:12:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:4d94582e0dcbf5fed9d61213715bfff877bf5ecf commit r13-2874-g4d94582e0dcbf5fed9d61213715bfff877bf5ecf Author: Thomas Schwinge Date: Sat Jun 11 12:28:36 2022 +0200 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. Diff: --- gcc/config.gcc | 1 + gcc/config/nvptx/t-nvptx | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index 6a47661e647..d130f49699d 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -5298,6 +5298,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 2b68149ed7e..c797d57690f 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