From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7844) id BC23F3858D20; Sat, 6 Jan 2024 02:01:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC23F3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1704506467; bh=HGweVOZJLJlD/3/sAK3O0I9sdOvG9za+G1ZYenuSoXs=; h=From:To:Subject:Date:From; b=Rhvc0/a54JYF5wY3jQqhrM7g7kkwAVHmCnhNqN3De2Pr/tWhB2xYvhChHIFS/tfD6 xo2sC0LTa6v04Vuv0x9d+NfQZNaJCSZ2PtN+SQVF136mthr1pvJAYj09JZPg6ac7Pg ztz5ulBK1dCjh4fQ60ElX0xKAKdbWxp4YWZn8uQI= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Noah Goldstein To: glibc-cvs@sourceware.org Subject: [glibc] x86: Fixup some nits in longjmp asm implementation X-Act-Checkin: glibc X-Git-Author: Noah Goldstein X-Git-Refname: refs/heads/master X-Git-Oldrev: 48ef5aeb1b75991e1f92c9756e73ddbbe96b1bee X-Git-Newrev: b96a2eba2fcca37deea221a18c998ee0084a5d21 Message-Id: <20240106020107.BC23F3858D20@sourceware.org> Date: Sat, 6 Jan 2024 02:01:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b96a2eba2fcca37deea221a18c998ee0084a5d21 commit b96a2eba2fcca37deea221a18c998ee0084a5d21 Author: Noah Goldstein Date: Fri Jan 5 14:00:30 2024 -0800 x86: Fixup some nits in longjmp asm implementation Replace a stray `nop` with a `.p2align` directive. Diff: --- 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); \