From patchwork Fri Jan 5 22:00:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 1883126 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Wwfxl5zo; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 4T6HTJ0W6tz1yPL for ; Sat, 6 Jan 2024 09:00:52 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C987D385DC31 for ; Fri, 5 Jan 2024 22:00:49 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by sourceware.org (Postfix) with ESMTPS id CAC433858C60 for ; Fri, 5 Jan 2024 22:00:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CAC433858C60 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CAC433858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::72d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704492037; cv=none; b=dg3sxq3IgDx0NZC4AEmjP6NbnTHBVTorDTt16lc2MeyZqAMQq9Xf0zCKQySNdIQh8l67eIBlNTjUE2d6vyrywi9VkLy8IKYBAvkGCuL5uBW4MxDf9Ve3UxJaTDY0Vr2e69ZQnlPYjuXZeVjShanl9ZbddNt0QD2mNj7k0gWK6nA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704492037; c=relaxed/simple; bh=15TuVMGIxmjdrxiNR2I8Q8oNhdbBNvae0vu6ZX70IEM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=EEOadNhyBi/wM2fZblq1edCBtzevlvQbW9xR1zP/4Dgs8ZW9+dEm6DzDGU2FEIP8OTSfrXFhcXKy9SzZih/dWNtlSVkorZAQhBFv3rFQkK/ttQ88bOYQnPBAv8CCaYsveiMR0/pg+ZriAcjv9pOxiH3/3wS8uOiqYTktolpwju8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-781251ed685so1222685a.3 for ; Fri, 05 Jan 2024 14:00:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704492035; x=1705096835; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b/g4IHyW7onMZxnWiG53IHNdQzHe3k0Aqm1wX2BW6Ks=; b=Wwfxl5zomqBElrb8PPxxFftEs2Vq6kWho4ItA/ufVFZ384QU1xm6MdLTxKyaGfidff CMBd5e5e+wFaBMmBs10FbtVYerEHRpOjxQS86IEAGWDZp52/MUNwwOUm2cwm5dDQbIuv i5Id+MlPfwTdUX1ZHKoqETL5DZFuSmIiHxiR9CZWERP5mtrLtYtoincBi1udRE6xXgY8 v2w2xH0L14yrjIs4SNZB76MuBDEP3WeMcF+idhKM17cWf2WUEkZzKy6rp0+0xarF5xh2 zCe2OoI0W5duSCppftBJopkDsGBlhtCaEIho6KCkdLUTef3s+OgnIjb27pLJnoElZNkj 8RdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704492035; x=1705096835; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b/g4IHyW7onMZxnWiG53IHNdQzHe3k0Aqm1wX2BW6Ks=; b=Il677D1fijtQJRHjbEB52K2G41expt4NjeXSDPyh0Uukz+VgPaMNpRs0HOxmyVgQdR totKVO22mgAGm/KhvHOJtbddpgKdhf/yKleFGQJpYJ5/kfp1frO8eVBf1fUG+szzw64g FvfXIDxEwf1RiCPyscIaL3E7iattyA73DI9buR+nMGMWFyVKwEhAAD5sTr6NYZBfEGoJ N+JM5aO5JfEFAgDPEzxScmvWqLlH/HL5HApg6AZZfguSmD2YryxKm3PN6HtFFMifa3vD VxwcCgZevyKP1JtgjVbdupTx1wNHIzpXOtIIBikT9aHOlUuAIfKkTNGuuuJX7mK+rK+T 9lyQ== X-Gm-Message-State: AOJu0YwMvwMgvG93I9GgRirqMxR54eMRThh+DuFBA0J4bGdBKb4nFAjk 8lXsvY2c8cSgLigzvWuiiNbTci8lyS0= X-Google-Smtp-Source: AGHT+IE+AqzymKOydGzF/wrx9KqqYTzbC7Q1xe5NVVj//Qpptg3rkETu631Lq5t5vHpea6lPnPl3LQ== X-Received: by 2002:a05:620a:439a:b0:781:581f:f48 with SMTP id a26-20020a05620a439a00b00781581f0f48mr56169qkp.125.1704492034650; Fri, 05 Jan 2024 14:00:34 -0800 (PST) Received: from noahgold-desk.sc.intel.com ([192.55.55.56]) by smtp.gmail.com with ESMTPSA id f23-20020a05620a20d700b007830709340csm889874qka.2.2024.01.05.14.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 14:00:34 -0800 (PST) From: Noah Goldstein To: libc-alpha@sourceware.org Cc: goldstein.w.n@gmail.com, hjl.tools@gmail.com, carlos@systemhalted.org Subject: x86: Fixup some nits in longjmp asm implementation Date: Fri, 5 Jan 2024 14:00:30 -0800 Message-Id: <20240105220030.3668998-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104221634.3612621-1-goldstein.w.n@gmail.com> References: <20240104221634.3612621-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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+incoming=patchwork.ozlabs.org@sourceware.org Replace a stray `nop` with a `.p2align` directive. --- sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S index 9aa24620b9..9d9732afdc 100644 --- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -57,8 +57,8 @@ longjmp_msg: cfi_def_cfa_offset(16); \ LOAD_MSG; \ call HIDDEN_JUMPTARGET(__fortify_fail); \ - nop; \ cfi_restore_state; \ + .p2align 3, 5; \ .Lok2: \ movq %r10, %rdi; \ cfi_restore (%rdi); \