From patchwork Tue Dec 13 09:34:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 32725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp13143wrn; Tue, 13 Dec 2022 01:35:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf4qnL7aZr93UgFXVntky2timsuhx1n25xubga9pgzr5P+8um16J+MauFxgFnmjYd/P72L5O X-Received: by 2002:a17:907:a053:b0:7c1:539b:d028 with SMTP id gz19-20020a170907a05300b007c1539bd028mr10155996ejc.48.1670924148476; Tue, 13 Dec 2022 01:35:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670924148; cv=none; d=google.com; s=arc-20160816; b=o55EN5LafqJ4Su5W8n0Wfe+CqcEPUiQBm1DB/Zyaccr8zpUdITYPHsq9GLGfo+FCyi ZzxSvi6l6SGay1bBdKCfj0j7xSLdzUkwWX3pEbNaZFMTkV6ED722aoPaHqUUOv8/54gQ BnGLqmh7JflM/ojvlloXhi3n1IPoPRcztMZXKJWPewdWRTtcZjHJGBbDDDhhvjRt7Uxa o55P5Ngkk/NiHxKQcTtBjcU85WrJ5naZniAiTl+GPuZwApZs7/8DY1SdKu16utPqw6L0 v2nKCk/J0DFHH9fAbilE/BHiRcjNF5V0ANh3Xsqmkm/uRsIsqrCnBB2UE5RefMF8cMDZ w3jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=V0NE0tu67nkKGVQw6wB2Uq2r73CEcRWj3TPULSng9oQ=; b=Wg0r9BwEKFWbQ8tUBdRBiyEfbDONHFvqXhuFPcR58D9405L2xwLGe1QcAfb/4mxTH+ n47tJUpaUdY61PTd7zkWkAwwafK2A0P4h8O4AEMesQ/yBTTuGuTCr4EviHrVMYWp79Jb sfASu2bW1Qa57pw/kOUzZweEt3eWGHflnMROE9eDvo5+P6IkD0+G+odN1nNTSl0i7ncr bTcKhtEBdH2e+OdyUPkXsYsNKwULA6vGDyqzB04TLgvZ0E3YsRoJhUreVmUEyRThsJTp FjZq6Y/gh3EMH7jIED9D0IRSHZOiFZm9odKbdoZTX2bdTrjBfaKY85H7L/iI+pTssyvQ OZcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WMr2fKKw; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id c27-20020a170906155b00b007ad9adaf33dsi1821666ejd.372.2022.12.13.01.35.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 01:35:48 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WMr2fKKw; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 79177384F703 for ; Tue, 13 Dec 2022 09:35:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 79177384F703 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670924147; bh=V0NE0tu67nkKGVQw6wB2Uq2r73CEcRWj3TPULSng9oQ=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=WMr2fKKwhKmc77SKXzwWYTWbcG7Vx3Bd2s9H4lRdDfdtUdWZ6Kyzq530M4UudgPLN ZtrVyawwidVDZSGMUM/2OPTXl4VShdp0JBYbb/pdhq9cxzR24tK9m8oLZcS/cHW5+G qxedOxQEBmaWgyUUToL9isjnxk3EXtenQ8vmlnhg= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 6803D384F703 for ; Tue, 13 Dec 2022 09:35:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6803D384F703 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-440-ToiIP_mdNJKDTA1cc18rNg-1; Tue, 13 Dec 2022 04:35:02 -0500 X-MC-Unique: ToiIP_mdNJKDTA1cc18rNg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A4AE8038E6 for ; Tue, 13 Dec 2022 09:35:02 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0D3F61121314 for ; Tue, 13 Dec 2022 09:35:01 +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 2BD9YvaM1939285 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Tue, 13 Dec 2022 10:34:57 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 2BD9Yua71939284 for gcc-patches@gcc.gnu.org; Tue, 13 Dec 2022 10:34:56 +0100 Date: Tue, 13 Dec 2022 10:34:56 +0100 To: gcc-patches@gcc.gnu.org Subject: [committed] libsanitizer: Fix up libbacktrace build after r13-4547 [PR108072] Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.5 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_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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752090959811248466?= X-GMAIL-MSGID: =?utf-8?q?1752090959811248466?= Hi! The r13-4547 commit added new non-static function to libbacktrace: backtrace_uncompress_zstd but for the libsanitizer use we need to rename it, so that it is in __asan_* namespace and doesn't clash with other copies of libbacktrace. Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk as obvious. 2022-12-13 Jakub Jelinek PR sanitizer/108072 * libbacktrace/backtrace-rename.h (backtrace_uncompress_zstd): Define. Jakub --- libsanitizer/libbacktrace/backtrace-rename.h.jj 2020-09-22 09:49:22.532137619 +0200 +++ libsanitizer/libbacktrace/backtrace-rename.h 2022-12-12 14:09:01.681819952 +0100 @@ -13,6 +13,7 @@ #define backtrace_syminfo __asan_backtrace_syminfo #define backtrace_uncompress_lzma __asan_backtrace_uncompress_lzma #define backtrace_uncompress_zdebug __asan_backtrace_uncompress_zdebug +#define backtrace_uncompress_zstd __asan_backtrace_uncompress_zstd #define backtrace_vector_finish __asan_backtrace_vector_finish #define backtrace_vector_grow __asan_backtrace_vector_grow #define backtrace_vector_release __asan_backtrace_vector_release