From patchwork Wed Oct 6 20:07:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 45943 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 B04B93858012 for ; Wed, 6 Oct 2021 20:08:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B04B93858012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1633550884; bh=vorDKYENGS+ZHn7eBYgySgXQ55tHIgh754AfEOrAVCQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=xmbAeHLBEDl1bZq5IsjLbgyEoIdKxrdsA/TtxLfO0fBBCGZZ6IyPjOHrYCC5CZYd1 +CQbF8iNRGLVNlC50MsJ0NUVnCc0KpL5h1eAcSPmfekoGjTnf2oieI7jSxqr8A0ipu a4nf7eOa+XhojRkCFYQvWpJDB/T4EPNO+ShnjwY4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id F28273858C39 for ; Wed, 6 Oct 2021 20:07:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F28273858C39 Received: by mail-pl1-x62e.google.com with SMTP id w11so2356221plz.13 for ; Wed, 06 Oct 2021 13:07:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vorDKYENGS+ZHn7eBYgySgXQ55tHIgh754AfEOrAVCQ=; b=09jYdf/RVRwrk+CMCIHqtA5YacfMVU9HSiKexEmz68pohmh9UJoEMBYuprSgqR7ZKe GioinICi1Rq4yAtAtQ9LRf1511zG4Bk3Bvon+j1/qbY8laG3OG4cNSxRAoa5Df/fYpOC Ku2C0CcmdpSB4v+3lVDRu2nJl8jO+qqEyCUZ9nfwZlt/9jEt4TPe0buJP4fvwgYvoCj5 R4KfYTZZdJVfdpjre5aUfacvCD9VBtexUzL6PFkrzb0cg208psyF6vMz9ad0RW59uhru ul4vdTDtIhNMDvqN+kgrKNektBZxLYdULzfNuByZDSiZxcnsAyhBQZAPXIOGj26KIe/b D1Pw== X-Gm-Message-State: AOAM532AQ1mzjSGJYOYCXE+7Y6Fj9z0/unmVi4e8aot3lFnrqcKjhX8I Npv2ZrOS8WjnSiGGADXYFhIQlmwyt+U= X-Google-Smtp-Source: ABdhPJzeBHAb/t4NsUzczFbpvGeQr9eYTEg5QkpEYNd8StTGtW7PwHO5ZQqAfXE3YKgD/B2Nl3jeow== X-Received: by 2002:a17:902:ea05:b0:13f:4b5:cda2 with SMTP id s5-20020a170902ea0500b0013f04b5cda2mr191896plg.86.1633550853766; Wed, 06 Oct 2021 13:07:33 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.58.39.6]) by smtp.gmail.com with ESMTPSA id o189sm8171859pfd.203.2021.10.06.13.07.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 13:07:33 -0700 (PDT) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 55EDBC0067 for ; Wed, 6 Oct 2021 13:07:32 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 0/2] libsanitizer: Merge with upstream commit fdf4c035225d Date: Wed, 6 Oct 2021 13:07:30 -0700 Message-Id: <20211006200732.1857173-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3026.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" I am checking in these patches to merge with upstream commit: commit fdf4c035225de52f596899931b1f6100e5e3e928 Author: H.J. Lu Date: Fri Sep 10 06:24:36 2021 -0700 [sanitizer] Support Intel CET 1. Include in sanitizer_common/sanitizer_asm.h to mark Intel CET support when Intel CET is enabled. 2. Add _CET_ENDBR to function entries in assembly codes so that ENDBR instruction will be generated when Intel CET is enabled. Reviewed By: dvyukov Differential Revision: https://reviews.llvm.org/D111185 H.J. Lu (2): libsanitizer: Merge with upstream libsanitizer: Apply local patches libsanitizer/MERGE | 2 +- libsanitizer/asan/asan_allocator.cpp | 15 ----- libsanitizer/asan/asan_allocator.h | 2 - libsanitizer/asan/asan_debugging.cpp | 5 +- libsanitizer/asan/asan_stats.cpp | 4 +- libsanitizer/hwasan/hwasan.cpp | 4 +- libsanitizer/hwasan/hwasan_setjmp_x86_64.S | 2 + libsanitizer/lsan/lsan_common.cpp | 56 ++++++++--------- libsanitizer/lsan/lsan_common.h | 3 + libsanitizer/sanitizer_common/sanitizer_asm.h | 4 ++ .../sanitizer_chained_origin_depot.cpp | 11 ++-- .../sanitizer_chained_origin_depot.h | 9 +-- ...tizer_common_interceptors_vfork_i386.inc.S | 1 + ...zer_common_interceptors_vfork_x86_64.inc.S | 1 + .../sanitizer_common_libcdep.cpp | 20 +++--- .../sanitizer_common/sanitizer_hash.h | 24 +++++++ .../sanitizer_platform_interceptors.h | 4 +- .../sanitizer_platform_limits_freebsd.cpp | 21 +++++++ .../sanitizer_platform_limits_freebsd.h | 16 +++++ .../sanitizer_common/sanitizer_stackdepot.cpp | 49 ++++++++------- .../sanitizer_common/sanitizer_stackdepot.h | 10 +-- .../sanitizer_stackdepotbase.h | 9 +-- libsanitizer/tsan/tsan_interceptors.h | 6 +- libsanitizer/tsan/tsan_interceptors_posix.cpp | 13 ++-- libsanitizer/tsan/tsan_interface.cpp | 5 +- libsanitizer/tsan/tsan_platform_linux.cpp | 18 +++--- libsanitizer/tsan/tsan_platform_mac.cpp | 62 ++++++++++--------- libsanitizer/tsan/tsan_rtl.cpp | 8 +-- libsanitizer/tsan/tsan_rtl.h | 9 +-- libsanitizer/tsan/tsan_rtl_amd64.S | 6 ++ 30 files changed, 227 insertions(+), 172 deletions(-)