From patchwork Thu Jul 18 10:09:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Blinov X-Patchwork-Id: 1962062 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ACk16U73; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WPpTW2nD2z20B2 for ; Thu, 18 Jul 2024 20:10:23 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E642385F024 for ; Thu, 18 Jul 2024 10:10:21 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 0B658385F012 for ; Thu, 18 Jul 2024 10:09:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B658385F012 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0B658385F012 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::332 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721297397; cv=none; b=nqlm60+/8WjS2Dwxkt31YB03vfYyUhtdOshDWA2uaTXY9lgJMaBgdPgDACg/7YinBhFoGYVX2xoeisw4Uo3EJuhorHPT6jaR3N7QfmdvZb6Cf/iwetbHYpSG77/Xw8/K20W4KGp028nHm7Il1kpmlpNNTqnhVMwEAMDEXJ4B7kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721297397; c=relaxed/simple; bh=VOHKLL1moAPMoN30rbG4M329WKr3v0Et9h3oJgZ3aps=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=NDjKYICzW92umfW33iW9cEIPN+KqkZKOa33sP00OkuO4sqJk7ZqP8hwPD25NOw/kt16/Ubs1/MCh0KI67P9izY6Nb1LTCG25xaQhYqlv+BKxEMYqKVXWrChywvGws8+SHVlTNZqt4R7NQIfXM6AIGjDAhTEvZrCoRZDud5mgPyA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ot1-x332.google.com with SMTP id 46e09a7af769-70364e06dc6so355212a34.0 for ; Thu, 18 Jul 2024 03:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721297393; x=1721902193; darn=gcc.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=O+mPgE6u6ewqWvCT+oTi2IGzyw5vLXOMOytyU34Dt3s=; b=ACk16U73WqCh/PUGUK01JumjnBNTZiT+YaHy8o2pSKPp+MYm6P/hbeYox2w2rQQKtT qjVv5N3GYBX/RNywU97YYJ4oGRoKRA1jy93X7fQmTJ6RsgCVEt5tPnNhCZxRyXmcB7Zt e2XBaHOBhwecgC+3jeFFEWOJJwXQB81Lvr7zKNVLJO6XEuFLgD3l71fRsBJVPHxHo5Ii FKU3LNAwJABQLmI69KO5xpL9XlHEBkxNDQ1xjw4MOvpYSGQO/L6quBfssSdnMms6BppF Kc3Zi7c7KCYifWLG+Tb08VDDjhPknG4SFNlBxbdZY/CUrYzm5ur9zTziWd3WD6dFnHmG IbSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721297393; x=1721902193; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=O+mPgE6u6ewqWvCT+oTi2IGzyw5vLXOMOytyU34Dt3s=; b=TlaAHmVmkavDGJuZcKeq+lPAmGJuNQZnu0vXkrpWcuFLogP0vAHi1Smnzh+Dst++6/ HDTgYy0/lKyRuyW82H9rlZAp0p7Dne7fKAYW+Po+xuthBSaSWKMzadrE2cD3bdT0KHtE GMa45Lqfdig/i4mjwwjLYX8a8HcyopJIYbpSYPF87/1C1zLa2E2dxCP5TxdQxzvKHIbC n51Bk5MMgPSPXVECugzvlP9kW0cNk6/+DW+OO3aWH7diw3S7+BsuD5QnHAkf/A1acKqn 4jg6J6ee+/qIQaJYXW/QD3+lvaMErmeelZe9if4OocxZbCK28WlsCVlQzSHQTAw8rspc N9eQ== X-Gm-Message-State: AOJu0YyNuP6/pzIvrcZII3FexP2Ch8lXeGnPo77eGyPq0TUMjmNT3Vgu o7BjhH1ZNIBSW8Eoz2XNP3ilBV733/X0l+bidFuetj3oOcfVgPUMmCT2l0/nDTxgf1CEjYGEaTW Y7TU/7KiAjqTL8JNBxChHABv2N1Dj8k4V X-Google-Smtp-Source: AGHT+IEYLQVOZU610nmpT16acFFzWcb53EzELRloFR74pOQjji8CkgW2t9FCoiolW+TYmzr/wd1VIKqyesXgC2nOyuY= X-Received: by 2002:a05:6830:4703:b0:700:d506:cfe9 with SMTP id 46e09a7af769-708e37e0992mr6151666a34.19.1721297393063; Thu, 18 Jul 2024 03:09:53 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Maxim Blinov Date: Thu, 18 Jul 2024 11:09:43 +0100 Message-ID: Subject: Fwd: [PATCH] Don't force-enable ifuncs on RISC-V To: gcc-patches@gcc.gnu.org Cc: maxim.a.blinov@gmail.com X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Let the user turn off ifunc support at configure time if they want to. Currently, the logic in gcc/autoconf.ac will override the default logic in gcc/config.gcc. gcc/ChangeLog: * config.gcc: Default-enable ifunc support for RISC-V on Linux. * autoconf.ac: Honor the default_gnu_indirect_function variable. * autoconf: Regenerate. --- gcc/config.gcc | 2 +- gcc/configure | 72 +++++++++++++++++++++++++----------------------- gcc/configure.ac | 72 +++++++++++++++++++++++++----------------------- 3 files changed, 77 insertions(+), 69 deletions(-) AC_DEFINE_UNQUOTED(HAVE_GNU_INDIRECT_FUNCTION, $gif, -- 2.34.1 diff --git a/gcc/config.gcc b/gcc/config.gcc index bc45615741b..012022399f4 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -3687,7 +3687,7 @@ case ${target} in ;; *-*-linux* | *-*-gnu*) case ${target} in - aarch64*-* | arm*-* | i[34567]86-* | powerpc*-* | s390*-* | sparc*-* | x86_64-* | loongarch*-*) + aarch64*-* | arm*-* | i[34567]86-* | powerpc*-* | riscv*-* | s390*-* | sparc*-* | x86_64-* | loongarch*-*) default_gnu_indirect_function=yes ;; esac diff --git a/gcc/configure b/gcc/configure index 4faae0fa5fb..874412dc96b 100755 --- a/gcc/configure +++ b/gcc/configure @@ -25907,42 +25907,46 @@ else fi -case "${target}" in - riscv*-*-linux*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker ifunc IRELATIVE support" >&5 +if test $default_gnu_indirect_function = yes; then + case "${target}" in + riscv*-*-linux*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker ifunc IRELATIVE support" >&5 $as_echo_n "checking linker ifunc IRELATIVE support... " >&6; } - cat > conftest.s < /dev/null 2>&1 \ - && $gcc_cv_ld -o conftest conftest.o > /dev/null 2>&1 \ - && $gcc_cv_readelf --relocs --wide conftest \ - | grep R_RISCV_IRELATIVE > /dev/null 2>&1; then - enable_gnu_indirect_function=yes - fi - rm -f conftest conftest.o conftest.s - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gnu_indirect_function" >&5 + cat > conftest.s < /dev/null 2>&1 \ + && $gcc_cv_ld -o conftest conftest.o > /dev/null 2>&1 \ + && $gcc_cv_readelf --relocs --wide conftest \ + | grep R_RISCV_IRELATIVE > /dev/null 2>&1; then + enable_gnu_indirect_function=yes + else + enable_gnu_indirect_function=no + fi + rm -f conftest conftest.o conftest.s + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gnu_indirect_function" >&5 $as_echo "$enable_gnu_indirect_function" >&6; } - ;; -esac + ;; + esac +fi gif=`if test x$enable_gnu_indirect_function = xyes; then echo 1; else echo 0; fi` diff --git a/gcc/configure.ac b/gcc/configure.ac index 3da1eaa7064..4f90a974c6b 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -3072,40 +3072,44 @@ Valid choices are 'yes' and 'no'.]) ;; esac], [enable_gnu_indirect_function="$default_gnu_indirect_function"]) -case "${target}" in - riscv*-*-linux*) - AC_MSG_CHECKING(linker ifunc IRELATIVE support) - cat > conftest.s < /dev/null 2>&1 \ - && $gcc_cv_ld -o conftest conftest.o > /dev/null 2>&1 \ - && $gcc_cv_readelf --relocs --wide conftest \ - | grep R_RISCV_IRELATIVE > /dev/null 2>&1; then - enable_gnu_indirect_function=yes - fi - rm -f conftest conftest.o conftest.s - AC_MSG_RESULT($enable_gnu_indirect_function) - ;; -esac +if test $default_gnu_indirect_function = yes; then + case "${target}" in + riscv*-*-linux*) + AC_MSG_CHECKING(linker ifunc IRELATIVE support) + cat > conftest.s < /dev/null 2>&1 \ + && $gcc_cv_ld -o conftest conftest.o > /dev/null 2>&1 \ + && $gcc_cv_readelf --relocs --wide conftest \ + | grep R_RISCV_IRELATIVE > /dev/null 2>&1; then + enable_gnu_indirect_function=yes + else + enable_gnu_indirect_function=no + fi + rm -f conftest conftest.o conftest.s + AC_MSG_RESULT($enable_gnu_indirect_function) + ;; + esac +fi gif=`if test x$enable_gnu_indirect_function = xyes; then echo 1; else echo 0; fi`