From patchwork Fri Mar 21 18:18:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 108885 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B7EA6385842C for ; Fri, 21 Mar 2025 18:19:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B7EA6385842C Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Kv0FnXg5 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 6658E3858C60 for ; Fri, 21 Mar 2025 18:18:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6658E3858C60 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6658E3858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742581108; cv=none; b=fsvILZlLxyG6fsikL/JMQ8GyP8QZ5Lyi6W14qGzMxtPICllD8BTlyr6rggyI1NTZMG+p4plgdsY4ohpVuptjnxQaQprlbGyPkq0toELH2J6xgCiUNgwrwpOgF+GxD5X8yo7zZXEqfHLE5Av/reF+9E2jwc2szkDoEziRqm8QIdU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742581108; c=relaxed/simple; bh=7NGJ/2wjwHyLLDkUUTyZYqbQUnWndsxcBhweKwyoD9g=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=k9NtnuHF/8x97Yma24jogjz/ruNma52fieZSVuIkHmz6jA1ZklqDDt7CUBcl6m4qJYWCraqXMB2SF/OPvESdd0S92D7sZ41nExa1Lvp8VfnZyQI0cDMm9KAMn/TOrTN7HcHyymv5CYes1w9chwS/Vu9+DX0FarjO3mZD6+tFZ8s= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6658E3858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742581108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=+I8KYx3Gt0YIRPx2JjyHQWEqMx2W3LsewTrN88glQrg=; b=Kv0FnXg5hRl1+X6QoPr2IW+fQK4VzyTBxHC8gccSH1FQFX6Um996U8JzhhuSwWBG3MmI8E XVqpFrEbJQfvqQ44H3nWlQQ4eOjfOIm9LayrXyzGVs3JGJ3sXL2IEluMEtFrDoWEkQnWuC lhrXgSeZ5QpgyEkFm544TfXNBnaMFXE= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-460-cwxpMDa6NGK77SJSQ-_kzg-1; Fri, 21 Mar 2025 14:18:26 -0400 X-MC-Unique: cwxpMDa6NGK77SJSQ-_kzg-1 X-Mimecast-MFC-AGG-ID: cwxpMDa6NGK77SJSQ-_kzg_1742581106 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DFC4D19560BC for ; Fri, 21 Mar 2025 18:18:25 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.28]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 40BD31955BFE for ; Fri, 21 Mar 2025 18:18:24 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] support: Link links-dso-program-c with libgcc_s only if available Date: Fri, 21 Mar 2025 19:18:21 +0100 Message-ID: <877c4iqmc2.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: O_tN091QOnLbtNJFnYIf_NRM0OrdncNxMi2Bnc9fvL0_1742581106 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Add a configure check to detect bootstrapping builds that do not have libgcc_s. Fixes commit 3e2be87832781a29ed67f38f87c1ce3dd4c1b866 ("support: Link links-dso-program-c against libgcc_s"). Reviewed-by: Sam James --- configure | 40 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 ++++++++++++ support/Makefile | 5 ++++- 3 files changed, 56 insertions(+), 1 deletion(-) base-commit: 333b9ae8684d0d4c008e78d2820e3afc2e09f674 diff --git a/configure b/configure index 674d1d7e4a..d11dcf97c5 100755 --- a/configure +++ b/configure @@ -9135,6 +9135,46 @@ fi config_vars="$config_vars enable-static-pie = $libc_cv_static_pie" +# Check if we can link support functionality against libgcc_s. +# Must not be used for linking installed binaries, to produce the +# same binaries for bootstrapped and bootstrapping builds (the latter +# with a GCC that does not build libgcc_s). +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC can link against -lgcc_s" >&5 +printf %s "checking whether $CC can link against -lgcc_s... " >&6; } +if test ${libc_cv_have_libgcc_s+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) old_LIBS="$LIBS" + LIBS="$LIBS -lgcc_s" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + libc_cv_have_libgcc_s=yes +else case e in #( + e) libc_cv_have_libgcc_s=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$old_LIBS" ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_libgcc_s" >&5 +printf "%s\n" "$libc_cv_have_libgcc_s" >&6; } +config_vars="$config_vars +have-libgcc_s = $libc_cv_have_libgcc_s" + # Support configure.ac under sysdeps. diff --git a/configure.ac b/configure.ac index 57cd24c87d..d068bb5082 100644 --- a/configure.ac +++ b/configure.ac @@ -2061,6 +2061,18 @@ if test "$libc_cv_static_pie" = "yes"; then fi LIBC_CONFIG_VAR([enable-static-pie], [$libc_cv_static_pie]) +# Check if we can link support functionality against libgcc_s. +# Must not be used for linking installed binaries, to produce the +# same binaries for bootstrapped and bootstrapping builds (the latter +# with a GCC that does not build libgcc_s). +AC_CACHE_CHECK([whether $CC can link against -lgcc_s], libc_cv_have_libgcc_s, [dnl + old_LIBS="$LIBS" + LIBS="$LIBS -lgcc_s" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], + [libc_cv_have_libgcc_s=yes], [libc_cv_have_libgcc_s=no]) + LIBS="$old_LIBS"]) +LIBC_CONFIG_VAR([have-libgcc_s], [$libc_cv_have_libgcc_s]) + # Support configure.ac under sysdeps. AC_SUBST(libc_cv_test_cc_mprefer_vector_width) AC_SUBST(test_enable_cet) diff --git a/support/Makefile b/support/Makefile index 0c670555ae..ea7b4cd4a0 100644 --- a/support/Makefile +++ b/support/Makefile @@ -282,7 +282,10 @@ CFLAGS-temp_file.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 ifeq (,$(CXX)) LINKS_DSO_PROGRAM = links-dso-program-c CFLAGS-links-dso-program-c.c += -fexceptions -LDLIBS-links-dso-program-c = -lgcc -lgcc_s $(libunwind) +LDLIBS-links-dso-program-c = -lgcc +ifeq ($(have-libgcc_s),yes) +LDLIBS-links-dso-program-c += -lgcc_s $(libunwind) +endif else LINKS_DSO_PROGRAM = links-dso-program LDLIBS-links-dso-program = -lstdc++ -lgcc -lgcc_s $(libunwind)