From patchwork Mon May 27 08:26:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 1939769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=UXAOASsB; 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 4Vnpfv0ggfz20PT for ; Mon, 27 May 2024 18:27:33 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E02E43858C32 for ; Mon, 27 May 2024 08:27:31 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 4DD7D3858D34 for ; Mon, 27 May 2024 08:26:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4DD7D3858D34 Authentication-Results: sourceware.org; dmarc=pass (p=none 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 4DD7D3858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716798399; cv=none; b=Ra9gd4+ZpsGzPkUZYB+KReA4CHkXR61l3enSpBdqitLD/je73pi9xptt1NrWtZBDhwFgTIxa5DxaaidxhiMTSdp0r5+vWxLaY3oy72cy+/TvS9jO+h0aQBxgf9nGCIQxqQslXskS6KniQoiipbJflzY/yz4QyK37F//fo1ABt8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716798399; c=relaxed/simple; bh=nT2ZqA/9gmSoShGwtmA5uAa/4nIyfRffQcpcRooD4JM=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=FmAlXoRzoNuLEotx85VnVtaWTpWKS6osB4pALjXhv9EElqwTFQtDuF/hyPaw6HQol6ja+bEo2Vki0UbXHuxwDZBlyDnKCCBz/LE74xzeXUEst/wdvmlNr4EV7V9kCqNY11lHI/JGax110zmyJ6e3PzQaL58gN3QJhYgpppeYnG4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716798398; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type; bh=VZQVCQd96aWj5ST8eh9jwxi908xIZlGVsd8OJhz5vMU=; b=UXAOASsBA6LolAroEnOZQJK8fbu/4GN5eFt1/1RpxEJ9fTD+diIFMOeIIDleblVHaIG9lR BK2yIRvoA2W2em28dQBaH6C1xiMHJr/sDSOnLdMxmVY+3/W42kiX5tOlsmybtSLVoLGsJ6 hyFu+Bos1aIUJUiTmiuaugwiB2TSe8Y= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517-RVeE-7sRPJaFupahcFZA0w-1; Mon, 27 May 2024 04:26:34 -0400 X-MC-Unique: RVeE-7sRPJaFupahcFZA0w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id C68F48058D4; Mon, 27 May 2024 08:26:33 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.45.224.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8B9E640004D; Mon, 27 May 2024 08:26:33 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 44R8QWTc2641078 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 27 May 2024 10:26:32 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 44R8QVkQ2641077; Mon, 27 May 2024 10:26:31 +0200 Date: Mon, 27 May 2024 10:26:31 +0200 From: Jakub Jelinek To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Fix up 19_diagnostics/stacktrace/hash.cc on 13 branch Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: Jakub Jelinek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Hi! The r13-8207-g17acf9fbeb10d7adad commit changed some tests to use -lstdc++exp instead of -lstdc++_libbacktrace, but it didn't change the 19_diagnostics/stacktrace/hash.cc test, presumably because when it was added on the trunk, it already had -lstdc++exp and it was changed to -lstdc++_libbacktrace only in the r13-8067-g16635b89f36c07b9e0 cherry-pick. The test fails with /usr/bin/ld: cannot find -lstdc++_libbacktrace collect2: error: ld returned 1 exit status compiler exited with status 1 FAIL: 19_diagnostics/stacktrace/hash.cc (test for excess errors) without this (while the library is still built, it isn't added in -L options). Ok for 13 branch? I think the r13-8067 cherry-pick hasn't been applied to 12 branch, so we don't need it there. 2024-05-27 Jakub Jelinek * testsuite/19_diagnostics/stacktrace/hash.cc: Adjust dg-options to use -lstdc++exp. Jakub --- libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc.jj 2023-11-22 11:03:28.812657550 +0100 +++ libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc 2024-05-27 10:18:44.900058884 +0200 @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++23 -lstdc++_libbacktrace" } +// { dg-options "-std=gnu++23 -lstdc++exp" } // { dg-do run { target c++23 } } // { dg-require-effective-target stacktrace }