From nobody Wed Mar 22 16:32:51 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 4PhYtC4f38z412hV; Wed, 22 Mar 2023 16:32:51 +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 4PhYtC41Jvz3QPS; Wed, 22 Mar 2023 16:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502771; 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=Ga4QJHr6dIs+i+iJ/XYEgoxLcDhAVC3Vdlanfps2VwE=; b=nLCXEnqP5CyRZj77l33D0AFPgX6oT7dIDDuCHTiWQ6E+CvheJGMtTqyKElf+fB2FFAj0o7 bHs/YKpfuyiKJk15PYOAVEqxb0oPNxGTIB5VnVewWDVCRnWlLvqQJ1c1QPBb4QGzlRTpHi p1oxMvwbxZ3P0hu7mcCNXk2JyRbbjNiz0VnCdzDONyMFSCG/tsblgzYfDxYgXXv/sXL+1I 4aZ1LvwU03wcFYvy2id2AVUR9zfXCPXyGsLp5rzVPCxB+SSXn3dOqCS4/Kd25UM18eHnvf UkAH54fGEN5HkJADgbj3/N7n9mrp51k5iIP4wznQZG4i2WJzcWNrg/+RiIr+0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502771; 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=Ga4QJHr6dIs+i+iJ/XYEgoxLcDhAVC3Vdlanfps2VwE=; b=o9C7KTmHq1L1YL5kVrGM3sSY7PyP/9dRsPl9vH7YcqJJYhm4jxjJvix8VFYKl8tiEn2qyo wzT0jsoOgWmFfk90bXFhoJenfc0SU9INCQEtrOAQ8X2SKDcZBF9lSuUeel0ppdSs/CsUWU bXgX2eRHRxPKOqyNuVn/e8pP58zP9vtdDnkTinki5rSAKKL2Ab3NEtxxDN5zgvOtz09VvX KCp3GUPH59x3S2a4RWEajgMmXAcvKDTGADDKQ1rXqiJ1AfLOYhk9JR0D8byofL8ZDdLYi9 uv4SabR+KJhJlZeqVUBSjXlgAAgMf5k5M/4n576QfpuwtRN00k8s+gzk7qdYlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502771; a=rsa-sha256; cv=none; b=ww/QNqbYcxsr1rUHyAjnBcduTJ1rmHyor+ObVL17T6PAR0BxXmdJvZd+PG6Hed8IsEynVw 19OirdbHOn0AyqCe4/HsslD8MwQQwduhiFUHQmeGu6jsI5o+6h6R1bxiao6+qwPQy6wce4 JR4ZFBecIr8yrOZadsfIe6b6DmbXEhHUFsyyphniwOwdTAwN2N5xI6dtjroVtTywCp34j3 Vwo5ezIwrs5o6sY3mWFSkjKCaZxpZXf43BUNBclebe6/yiGjVUC7Rsv+9WYNXxbYD0Y3bS cRFFSJi67wyzMVgQoPthrAlbHfpyhz+oAmY1GfaoUJCAcqm5MkOTUxbA0R+P9w== 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 4PhYtC329Sz11X1; Wed, 22 Mar 2023 16:32:51 +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 32MGWpsT024005; Wed, 22 Mar 2023 16:32:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWpuo024004; Wed, 22 Mar 2023 16:32:51 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:51 GMT Message-Id: <202303221632.32MGWpuo024004@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: 6611fe011f79 - stable/13 - libicp: Link with -z noexecstack for ld.bfd. 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/13 X-Git-Reftype: branch X-Git-Commit: 6611fe011f79602cc13000e46acd7c4c76c7a08f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6611fe011f79602cc13000e46acd7c4c76c7a08f commit 6611fe011f79602cc13000e46acd7c4c76c7a08f Author: John Baldwin AuthorDate: 2022-11-22 16:37:12 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:06 +0000 libicp: Link with -z noexecstack for ld.bfd. The assembly source files do not contain GNU-stack annotations, so ld.bfd defaults to using an executable stack. (cherry picked from commit 7e3e70ce214d042e202828b0665904840928a002) --- cddl/lib/libicp/Makefile | 2 ++ cddl/lib/libicp_rescue/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 6c0d73561818..f65d01593b12 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -94,4 +94,6 @@ CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256_impl.S+= -DLOCORE CFLAGS.sha512_impl.S+= -DLOCORE +LDFLAGS.bfd+= -Wl,-znoexecstack + .include diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index 342afd2556cc..c5faae6aba58 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -92,4 +92,6 @@ CFLAGS.sha256_impl.S+= -DLOCORE CFLAGS.sha512_impl.S+= -DLOCORE CFLAGS.gcm.c+= -UCAN_USE_GCM_ASM +LDFLAGS.bfd+= -Wl,-znoexecstack + .include