From nobody Wed Mar 22 22:28:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmd39Ryz41P6S; Wed, 22 Mar 2023 22:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjmd14fSz3hmK; Wed, 22 Mar 2023 22:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=paihnChQxKhzwNgWNYcxnD327qbN7hDTMGq5J59LPZQ=; b=xc/8phx5mL0YQ0ccXlhZwtEG0JNr2iY6AF8tyaFrA6ErlOIa2C+kJOS27cqCqsMSHeQQF+ ryGqJ9kg+VAhv5ML1XFt9PKDheLVHGnX5K8/LzXdsHHn2Ldsq3TgbGevkJIslHsBqBnBhE sPLlp1CsBE1EAwmPiMRR7IgHP8XVmzhpX9tgwLKmuHh7S70AXtQJUIyxJLt16izzhuQiG8 CJ1nsGy/bA951xV1Zzs7X5X1gQ953E8K/Sv9+7IDiLeqjl2CzZ40LkeziCEIUlgqQNiNQF dJ9tqpDnH07M+S2maC2NTOM9i4oItTTtJd1njA/UHG32ayrLDkqbNbW7LrwNMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=paihnChQxKhzwNgWNYcxnD327qbN7hDTMGq5J59LPZQ=; b=Jj3bOuaQI1+F4hhTqPU1YvWAxKhdUxzg+x+LBzKPEx5k8ZpD+BhR3c8w8xXYTUKnrDjTUx TFnY4KiHLrCktyHilTGMXU5vy0RKxTBlKovH15OML1fv4ThrOeUvb82G0ceRTp5/cWbBT+ /JB0O9o5t9snVurHMMHen/tfi276oATQa1RVTQZr1zbbEqVqibq1nyZA0zBaWoG8wLhTt7 9ricjmjHiT7f9eRG2Mkn+xAqGLjR+rpjh4BjXFgrwRUYco69v3BTIuYDCyIIV8fyzJMfHm /u/DlROywvcL859HxIwa2ax63TPKVsf9l5WNTYHZUhJbVNXYY0n/b3P5uUcJEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524113; a=rsa-sha256; cv=none; b=tU4XFm1SEnYI//usl//Zd6fOKtt5ARp+YnRFycL1WQOuRrNDAOiVr0Jz465mltepIEkEUt M5QSEEWUMChmrnQXYdx8BnOYrITP5hsR4gz5W+bD/PCwJPAKAYK33NhLHPjleWa0RxFafy XTSZ9UViKs+lESDKyzgZOMfkM89+Nseh5tMGnsz+fqp5WFHWs7UcCuZ9CDW/c09RfVRaYj KeqboIApV7k19OB2qwhVR/cDzit5TkpsPaxtztrUBRWY1qjfNA4Rkr19l2b5eCzpcwtwsL 1iEBiyMuq2I2ng/V914zTVvjCxs/UaIxc4yzwbx5o4XDdcZdbMA8BgAlk/Zk4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmd09P1z19v6; Wed, 22 Mar 2023 22:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSW1r001720; Wed, 22 Mar 2023 22:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSWSQ001719; Wed, 22 Mar 2023 22:28:32 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:32 GMT Message-Id: <202303222228.32MMSWSQ001719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: fbe7e06a3ce2 - stable/12 - libsa: Add missing GNU-stack annotations to _setjmp.S. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: fbe7e06a3ce279e0d0afd37118a46981b5d25f05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fbe7e06a3ce279e0d0afd37118a46981b5d25f05 commit fbe7e06a3ce279e0d0afd37118a46981b5d25f05 Author: John Baldwin AuthorDate: 2022-11-22 16:36:40 +0000 Commit: John Baldwin CommitDate: 2023-03-22 18:16:20 +0000 libsa: Add missing GNU-stack annotations to _setjmp.S. ld.bfd marks the stack as executable for the crt objects due to the missing annotations which raises a fatal warning starting with version 2.39. (cherry picked from commit 69f6399c3733d717bc3dcefda7fcc031f06cef0d) --- stand/libsa/amd64/_setjmp.S | 2 ++ stand/libsa/i386/_setjmp.S | 2 ++ stand/libsa/mips/_setjmp.S | 2 ++ stand/libsa/powerpc/_setjmp.S | 2 ++ stand/libsa/sparc64/_setjmp.S | 2 ++ 5 files changed, 10 insertions(+) diff --git a/stand/libsa/amd64/_setjmp.S b/stand/libsa/amd64/_setjmp.S index 53ea6e9b5d52..38f27dc1968d 100644 --- a/stand/libsa/amd64/_setjmp.S +++ b/stand/libsa/amd64/_setjmp.S @@ -90,3 +90,5 @@ ENTRY(_longjmp) 1: movq %rcx,0(%rsp) ret END(_longjmp) + + .section .note.GNU-stack,"",%progbits diff --git a/stand/libsa/i386/_setjmp.S b/stand/libsa/i386/_setjmp.S index 95b0ea8037f5..5766b25816ae 100644 --- a/stand/libsa/i386/_setjmp.S +++ b/stand/libsa/i386/_setjmp.S @@ -75,3 +75,5 @@ ENTRY(_longjmp) 1: movl %ecx,0(%esp) ret END(_longjmp) + + .section .note.GNU-stack,"",%progbits diff --git a/stand/libsa/mips/_setjmp.S b/stand/libsa/mips/_setjmp.S index 972fb2cc1ec8..68a5d8cbf5be 100644 --- a/stand/libsa/mips/_setjmp.S +++ b/stand/libsa/mips/_setjmp.S @@ -105,3 +105,5 @@ botch: jal _C_LABEL(abort) nop END(_longjmp) + + .section .note.GNU-stack,"",%progbits diff --git a/stand/libsa/powerpc/_setjmp.S b/stand/libsa/powerpc/_setjmp.S index 7c7c24b1237c..e5b589cf7269 100644 --- a/stand/libsa/powerpc/_setjmp.S +++ b/stand/libsa/powerpc/_setjmp.S @@ -113,3 +113,5 @@ ASENTRY_NOPROF(_longjmp) /* f14-f31, fpscr */ mr 3, 4 blr + + .section .note.GNU-stack,"",%progbits diff --git a/stand/libsa/sparc64/_setjmp.S b/stand/libsa/sparc64/_setjmp.S index 8df29e6ba750..9927b8364850 100644 --- a/stand/libsa/sparc64/_setjmp.S +++ b/stand/libsa/sparc64/_setjmp.S @@ -92,3 +92,5 @@ ENTRY(_longjmp) retl mov %g1, %o0 END(_longjmp) + + .section .note.GNU-stack,"",%progbits