From patchwork Mon Oct 23 13:18:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 156867 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1292117vqx; Mon, 23 Oct 2023 06:19:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFElBab88UWDCTESjEbyNZF+3P/U04ogdgjybjkltBe/tJdURA8mWAMH3O07WXo5U+tzCYt X-Received: by 2002:a05:6214:2462:b0:66d:20f7:8d8d with SMTP id im2-20020a056214246200b0066d20f78d8dmr12291338qvb.28.1698067148528; Mon, 23 Oct 2023 06:19:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698067148; cv=pass; d=google.com; s=arc-20160816; b=phqOw09HVHMR43lCrlJZqidpR4N7WGIu7oAVi+GQR9CrVKPU7SLPJbSZG105sbr6F3 ndq/fFl+DaBPccCSKHIfjkQnSWli/R6cAANge3Iq/bdUQ4PTjamW3xJLn0eQ80XFPC98 X+hPNASsjH6DQoRAqvNSfJrm5iKzHD6JWReLWsXluZLXLjBC4/LxeNZL6CkPkvf91JCg qdQnQoqxL5qmZt7h1KhIB06sSEL221L58JDKuGVpLj+aKqBnQgbr/kWitLbfNvCU0d85 vHzG2xQaMM5rEQcKWXBrCKiIsZ29uFMtU4v23j2AsVYOJ0qT7qxHCx2yJG4VYyjMFYlA EItw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=W+ZSA2YxT2AYFPzfwDaLgZsm0xx3b6dfDpCnYc+Zx9A=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=kcoe16Mp5uTeOSwW5frYL62mQMgmOHnP32sWcJUxRC2Qmlvyc4Wq6aqO7RD0NHjzQO j/g+bDDJqu1UqsafB62OT0j5E/Ts6EKCizFDIU9Bvi4YSCLU7goMj1uA/EqKhYbzCH2k Ly2vUoDA1Y5N50QNf/WpLj/NBxofLcEibOCux6rzxJuidkrvLT+UpkHm0/mrEdapwCba VS4IQGUTSKANazjJH4aax/QNvjxMuf1ZzwunYfTT9bRCl5mvbdRaUEUU2X1hwlf1OOcJ Nz0DQSfVhIw2lzj0eSPvtzZu+rGHIqEg3t3AR54Ks8BqJNfA2cswNElHJ+kk1qKq3KV3 sqKA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bR6PydY3; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id j15-20020a05620a410f00b00773c43e5e5dsi5551883qko.651.2023.10.23.06.19.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 06:19:08 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bR6PydY3; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3C086385840E for ; Mon, 23 Oct 2023 13:19:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id 4BCFE3858C60 for ; Mon, 23 Oct 2023 13:18:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4BCFE3858C60 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 4BCFE3858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698067125; cv=none; b=P1Gr5kxlpwh53K/6ymaAKb5A1NibBQ2j2snjvl1i6aOkn7ggcDhp4XHCvyODhWNyFodse6U0WUNqstAuX7tzE1mdpYHzb3k/r7N/mu0KTFGcYG8YqMb96d3dh/jNiZtUmW532GTqknMn7HnPDWCt6HYwGmdsylJuaZeb5MKM+5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698067125; c=relaxed/simple; bh=SDi3lq3FuvZBTkZ0Cc/6i9MuLZCPoUjDgJ4jkH7A/sc=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=PwWYbQMrKp5QU/FrZ8soQDgz8Ko4JTuw8gD7sugXvSDnwqVYS+86zc4D1YhbXZSkoquYVsDKRzdaA2QeGjfTOdT0Er+t0XSdTNZA3rcNscI7MbB7XYzHPLNdSrFfbiKrqZpKm2++XYyO1li2YYAmkT5aLuH8CvGEf5RjiTvsGNE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-32da4ffd7e5so1869438f8f.0 for ; Mon, 23 Oct 2023 06:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698067122; x=1698671922; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=W+ZSA2YxT2AYFPzfwDaLgZsm0xx3b6dfDpCnYc+Zx9A=; b=bR6PydY35uwe8LQB3jrjEArF3nOd//R7ftWgCXDrmhnt/CrC7niC6wrSIYMduxNpmK /oprU9VCZJ4MDlZnMV+A4g2hWJgSaJ+hmnd7zXKrL6dNCmtNA1dwsciK3mhHDfGRaxWi A7P3unZ8aLXp2kXq6Gw9MjQvsOSghef604tMFRItP8Xj73WqmjBi/p7HOrL/yZdMxbhr JT4hIyW7/z7zEyngXZY04wrDG6LymP7a/jetg0X8SUSOvq4aLrtaf9ElGl4dE7ZX4cQw vKBMlDos0Q991e32bZfe4TSM4XgwejDp+8MaogcRN0uOKA/JxSKn1cwhvTlHaySyyepu FCWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698067122; x=1698671922; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=W+ZSA2YxT2AYFPzfwDaLgZsm0xx3b6dfDpCnYc+Zx9A=; b=iBHAmkK57Zyk+UE2ZThc7wYPDkdXCSw+M/+qJgs9q2H6XgMCf5OLWoLfKtIyNVYxVp pRCUvqs13BzjRBi/49TRw3piY4LirrETfLDZBZ4JeUdhTDqsoWaN7FcZjVOdHkx9Dy26 ZxsBFcJ2MBg0rbFVQ3u3zN7XbHPb6G3IgP6OdZbV/YiC9En5LWg3jQ7sXZ7YARRmJ+rl 5DYw5RAxqff+nIJSwpOn+RuJaIRaM58ZY+Pgeyh28pntgc3Q1mcq4f/t0hmt+GEDB0t4 XCl9btzms+n8krwUU5y0qIRVj5lXCbcbNUNzkUN4GACGfVwDIiJyvnglAbjcbv4Onq4K 7hww== X-Gm-Message-State: AOJu0Yz1MQRnzeWy5Px7sQ9Gb5/QpcXqjALJMJeyWWf4iBg49p7A7pTA y30GAWzz3pdfwiQ5kxd/EutHTUbpFQ0= X-Received: by 2002:adf:c041:0:b0:31f:fc9a:a03 with SMTP id c1-20020adfc041000000b0031ffc9a0a03mr10701315wrf.20.1698067121584; Mon, 23 Oct 2023 06:18:41 -0700 (PDT) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id u3-20020a05600c138300b003fc0505be19sm9564224wmf.37.2023.10.23.06.18.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Oct 2023 06:18:41 -0700 (PDT) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [pushed] configure, libquadmath: Remove unintended AC_CHECK_LIBM [PR111928] Date: Mon, 23 Oct 2023 14:18:39 +0100 Message-Id: <20231023131839.6244-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Spam-Status: No, score=-8.4 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: , Reply-To: iain@sandoe.co.uk Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780552458500617438 X-GMAIL-MSGID: 1780552458500617438 This is a partial reversion of r14-4825-g6a6d3817afa02b to remove an unintended change. Tested with x86_64-linux X arm-none-eabi (and x86_64-darwin X arm-non-eabi and native x86_64-darwin bootstrap. Also reported by the OP to fix the issue, pushed to trunk, apologies for the breakage, Iain --- 8< --- This was a rebase error, that managed to pass testing on Darwin and Linux (but fails on bare metal). PR libquadmath/111928 libquadmath/ChangeLog: * Makefile.in: Regenerate. * configure: Regenerate. * configure.ac: Remove AC_CHECK_LIBM. Signed-off-by: Iain Sandoe --- libquadmath/Makefile.in | 1 - libquadmath/configure | 147 +-------------------------------------- libquadmath/configure.ac | 2 - 3 files changed, 2 insertions(+), 148 deletions(-) diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in index 068af559457..dbcafb57e5b 100644 --- a/libquadmath/Makefile.in +++ b/libquadmath/Makefile.in @@ -355,7 +355,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/libquadmath/configure b/libquadmath/configure index 5bd9a070fdc..fd527458285 100755 --- a/libquadmath/configure +++ b/libquadmath/configure @@ -644,7 +644,6 @@ LIBQUAD_USE_SYMVER_GNU_FALSE LIBQUAD_USE_SYMVER_GNU_TRUE LIBQUAD_USE_SYMVER_FALSE LIBQUAD_USE_SYMVER_TRUE -LIBM toolexeclibdir toolexecdir MAINT @@ -10922,7 +10921,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10925 "configure" +#line 10924 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11028,7 +11027,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11031 "configure" +#line 11030 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12261,148 +12260,6 @@ esac -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5 -$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; } -if ${ac_cv_lib_mw__mwvalidcheckl+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmw $LIBS" -if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _mwvalidcheckl (); -int -main () -{ -return _mwvalidcheckl (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mw__mwvalidcheckl=yes -else - ac_cv_lib_mw__mwvalidcheckl=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 -$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } -if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then : - LIBM="-lmw" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 -$as_echo_n "checking for cos in -lm... " >&6; } -if ${ac_cv_lib_m_cos+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cos (); -int -main () -{ -return cos (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_cos=yes -else - ac_cv_lib_m_cos=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 -$as_echo "$ac_cv_lib_m_cos" >&6; } -if test "x$ac_cv_lib_m_cos" = xyes; then : - LIBM="$LIBM -lm" -fi - - ;; -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 -$as_echo_n "checking for cos in -lm... " >&6; } -if ${ac_cv_lib_m_cos+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cos (); -int -main () -{ -return cos (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_cos=yes -else - ac_cv_lib_m_cos=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 -$as_echo "$ac_cv_lib_m_cos" >&6; } -if test "x$ac_cv_lib_m_cos" = xyes; then : - LIBM="-lm" -fi - - ;; -esac - - - for ac_header in fenv.h langinfo.h locale.h wchar.h wctype.h limits.h ctype.h printf.h errno.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac index 94a3f2179e9..23ac3bae6e5 100644 --- a/libquadmath/configure.ac +++ b/libquadmath/configure.ac @@ -122,8 +122,6 @@ esac AC_SUBST(toolexecdir) AC_SUBST(toolexeclibdir) -AC_CHECK_LIBM - AC_CHECK_HEADERS(fenv.h langinfo.h locale.h wchar.h wctype.h limits.h ctype.h printf.h errno.h) LIBQUAD_CHECK_MATH_H_SIGNGAM