From patchwork Tue Jan 31 22:39:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1735120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=TkJktr0B; dkim-atps=neutral Received: from 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P60PK3lFvz23gY for ; Wed, 1 Feb 2023 09:40:19 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D9B103858CDB for ; Tue, 31 Jan 2023 22:40:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D9B103858CDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675204817; bh=0LJQgDqBI71IUXc1Iy6H3lrYv9xyRAWRJ46NhmuLnfk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=TkJktr0BnZN4KcpemlW0fAVHAVNlJNsvs1f/c7V01fY0ypyc9gI8XkM1T8/tVNEOQ ofRLbMVuCvQXQux35MO18VR+y1h22rGTJB8s/GSrkbXgiKthEzRL99AShj2AdL121K IaF75QGOgg7nAdsEYNjSs6vH60FrX29eQ2id4z2Y= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by sourceware.org (Postfix) with ESMTPS id 1705B3858D38 for ; Tue, 31 Jan 2023 22:39:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1705B3858D38 Received: by mail-pj1-x1036.google.com with SMTP id o13so15593136pjg.2 for ; Tue, 31 Jan 2023 14:39:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0LJQgDqBI71IUXc1Iy6H3lrYv9xyRAWRJ46NhmuLnfk=; b=loOsGrBwm4E7mihETGaiRzKC9gFW4e36ZknZ/wpZ4HXOcv7u4Rxdxv+hFg5tRusjTd q9P9+lef2O8cSDd3V4dwBj7QbABMUwIqABRGOa9IKp18KKD1jbfh4LxyqrgG6UDOFzGX neT9vPIu24GaR846bVnhirAyzKHBlpioJzDUzZSWeFoyMfF577q6kGr9zssOcJChZeTh pOCMRW0Pr3oOIv+XqKqAzzDfRoMcvAoVwFTH8RQOD3tZxQ1mbLeKK9/oe5/uNPu9JSY6 umNGoF8JMuzEhtj4kaOur8ZixhWO0hQzOjAQlC3ThjkIwd27QrxBuOLtuS69TtOFXTNZ pbIQ== X-Gm-Message-State: AO0yUKUjNENxOiJGkNrn0KPf8heIJYqYUyfMnG0GE0BAaeWcQRce7evx c+xWsL96H5TLwj1VLOi6RyHOO1SWZOM= X-Google-Smtp-Source: AK7set9wvfQGDl3LJQkhjx83zYWuuk1GJB0Btb/gkijurbKNn3nyJbDWhfPHQU/j9xITZuiuASGoZA== X-Received: by 2002:a17:90b:4f43:b0:22c:9591:ce7e with SMTP id pj3-20020a17090b4f4300b0022c9591ce7emr10480347pjb.31.1675204796795; Tue, 31 Jan 2023 14:39:56 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.30.20]) by smtp.gmail.com with ESMTPSA id u13-20020a17090a6a8d00b00228f45d589fsm9052687pjj.29.2023.01.31.14.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 14:39:56 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id EFF6374005A; Tue, 31 Jan 2023 14:39:54 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Jakub Jelinek Subject: [PATCH] libsanitizer: cherry-pick commit 742bcbf685bc from upstream Date: Tue, 31 Jan 2023 14:39:54 -0800 Message-Id: <20230131223954.219780-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3023.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, 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.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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" cherry-pick: 742bcbf685bc compiler-rt/lib: Add .Linterceptor_sigsetjmp PR sanitizer/108106 * hwasan/hwasan_setjmp_x86_64.S (__interceptor_setjmp): Jump to .Linterceptor_sigsetjmp instead of __interceptor_sigsetjmp. (__interceptor_sigsetjmp): Add a local alias, .Linterceptor_sigsetjmp. --- libsanitizer/hwasan/hwasan_setjmp_x86_64.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libsanitizer/hwasan/hwasan_setjmp_x86_64.S b/libsanitizer/hwasan/hwasan_setjmp_x86_64.S index 7566c1ea0a5..a5a3858d94d 100644 --- a/libsanitizer/hwasan/hwasan_setjmp_x86_64.S +++ b/libsanitizer/hwasan/hwasan_setjmp_x86_64.S @@ -37,13 +37,14 @@ __interceptor_setjmp: CFI_STARTPROC _CET_ENDBR xorl %esi, %esi - jmp __interceptor_sigsetjmp + jmp .Linterceptor_sigsetjmp CFI_ENDPROC ASM_SIZE(__interceptor_setjmp) .global __interceptor_sigsetjmp ASM_TYPE_FUNCTION(__interceptor_sigsetjmp) __interceptor_sigsetjmp: +.Linterceptor_sigsetjmp: CFI_STARTPROC _CET_ENDBR