From patchwork Thu Jan 4 23:25:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 83338 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 CB0223858C50 for ; Thu, 4 Jan 2024 23:25:40 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) by sourceware.org (Postfix) with ESMTPS id 407EA3858CD1 for ; Thu, 4 Jan 2024 23:25:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 407EA3858CD1 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 407EA3858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::f35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704410718; cv=none; b=wnLpjI3FIpJsTmrYacznNv4b8/MKfJdS+WOScj6fHZDeZO92grH60aLTB1vayiWgHU2ck1F0DDcg3rtXeb6X9MmtLid2NCI9NzUtr67lJNqG0rZJO55AFFbbZRYeUVlE60CGaWjzQqLyJb1fzVJs3MMDvx5jkkMD5WvIt1G5L+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704410718; c=relaxed/simple; bh=6phkNS0cUBw5+7uA5VSzBNoYRsg+N2fgYTGctd1HYnI=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=chQqVtk59mjgdFkFJD1UmEVy2A6VdXCKQ4rtCKbZkoz1tUICuoKaBVtBhkKMXpXTfa24AHpC4Qp8i52NlHd37Z3V4OyzpRhb7C2V0r8VVZOgMqh/gjdC9BhULyxAXJJG5VVRgZebXILUCNfdhf3NmejJ1yJ6nT/L25KIqWAy/tk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-67ff241c2bcso4983786d6.1 for ; Thu, 04 Jan 2024 15:25:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704410716; x=1705015516; 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=ADTbmF4SCss5kj2N/60rGL0a9oGpDAzg+tOogTMby1M=; b=fCd+PLwyl/sImmxbEQhKdPGBL8BRK+E1ve3zMthZHc7rGYiiabWPAXJUbDDYUqQMVT +DhYJXNRN6II3p9+FvjxyjPrgkE1F+E3GJlL9sfkV6szcnIG8BCSczzbJ/lxag2nXrgp kp26NGCC5bZ1iMfaag/y5IzkA2MI/gKgbv24hfzjDhRbIy57BQwb3R4GfnOPQpf70yPd 0gEH2F45qmHn/PJHpEqm3DP0skMqWZQcKE9X7XCEepG+pVIz9M7xVa4ZYGwLUX29ksSi kqUkX/oxjcpnH1iM6Kd/SgCq/Imn90IOieiQXScOLfnoQ7M6d21ndkeBETwS6ibMW7bn yNFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704410716; x=1705015516; 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=ADTbmF4SCss5kj2N/60rGL0a9oGpDAzg+tOogTMby1M=; b=jAcIzL4FfmM0x2V8rQwMpoGKPPx1OZ8Obj62ISt4irvIQCum0o/IiCsMZGB9XwhOVz XMeCKFcljU+yMTWB1Yo8Qd17Jt/ssPGrUmaiiQYymyjvkqOmwIGkhjlEtYORjo+bV00I PGAuUpKbrR7F5jyRdjOgXectwQBCDmAlO9CeLhhYu227YFhIm3cdgBlHqgj6dPZXeyGz ZNaZ6qHBwvsX09LpX0q6bRVVjyD6DXsAjGb7gr5Xtpmek+UCy8Zz1mGhunYITTCMX2j1 k9m/SEFrvWw0vS3oC3vMdMroyzY2Jbs8fxr26rhu7LgtCswTWI7CCRxpEDhQw7GYI01j cwAw== X-Gm-Message-State: AOJu0YyWYz2IGx+r7TjS2479y+1pla5UfKiBOkiZDgL1VpWokefwrn1r lGLUdGyHV+tSJcZWmEreBh1LJH/aqSI= X-Google-Smtp-Source: AGHT+IGfRtKvccf8/XZwDPvhakNLeWvzg1Jw71xuPUqWdtZyy7XEL5Q0Jsi485gcTuSQW5KLJcLCSg== X-Received: by 2002:a05:6214:f04:b0:67f:ae93:a92e with SMTP id gw4-20020a0562140f0400b0067fae93a92emr1257253qvb.103.1704410716104; Thu, 04 Jan 2024 15:25:16 -0800 (PST) Received: from noahgold-desk.sc.intel.com ([192.55.54.50]) by smtp.gmail.com with ESMTPSA id i5-20020a0cfcc5000000b0067f032cf59bsm165776qvq.27.2024.01.04.15.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 15:25:15 -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: Thu, 4 Jan 2024 15:25:12 -0800 Message-Id: <20240104232512.3617987-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+patchwork=sourceware.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..083ffb33f2 100644 --- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -57,7 +57,7 @@ longjmp_msg: cfi_def_cfa_offset(16); \ LOAD_MSG; \ call HIDDEN_JUMPTARGET(__fortify_fail); \ - nop; \ + .p2align 3, 5; \ cfi_restore_state; \ .Lok2: \ movq %r10, %rdi; \