From nobody Mon Feb 19 16:45:00 2024 X-Original-To: dev-commits-src-all@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 4TdpL507hbz5C9F6; Mon, 19 Feb 2024 16:45:01 +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 4TdpL46WqJz4b41; Mon, 19 Feb 2024 16:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361100; 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=Xr7qUvAxM7QKJXUKfYQp/j9T6s8FyKtDLsPGH6nAAm8=; b=IazDMQEJJKr0kuP3ENfqPk32/UtpD0a89tcjA85K6bb3ba4whbIsDeH+lX/Vha8FTyNzdp Ksw8Jm3j3YG5YQEbotct2ooey+zz+YDMt3PVpMoeTM9MURIGW8q4lxVT7ARFCWl4brRBFs a5SUUhf6g27GAEsBUEIdYXLRc6D3LB7SFd95EBGO0YosFE5APJ4dFKyvr5Ru9Vjlae3tkP f/0Tj2BRATov7QflT1OFlff+M2wT3j4yShN6uoge33UQrUiur3k4oOQC/RRcnzoMZPXaz/ qzuh8KtdGE+Jm44jJJX+8WPU2Uq3pF94GcpGHCy+TxphN4RS1t93Wb6nMLukBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361100; 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=Xr7qUvAxM7QKJXUKfYQp/j9T6s8FyKtDLsPGH6nAAm8=; b=EQmh5pfdNzsJdClO6sB/YA3YFdn6OvK3lj11tJBfb/yPia/NDFmrt+9VNxyZ08Ysbz3Jav 97XidgIv10I8RcZOLZfPc88AIFpmsR+ZaaQ1zKbNuruOUEQlDOdECYMwbwa7Z2mlMc+d5c oE7ddtVSqCQ+GSHTnUZZ4+rqxC4J4kZe8WHpESOJ4cW5Ul/P4GiZDjspJo9GhHXymmuL+m 36GVafSX4Zwj0/tjtZtMgcunjgHS9/oWkYTuEQ9xdTLo+uuuMa3pks4LvBksPexa15fFIw eeFbX5/X+Jtp9Ua0VXXU0bGjqruGdsy4RzWrDVUQl5wLp9uqQ8w1472wpX90Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361100; a=rsa-sha256; cv=none; b=nCyasNEjHmDe+5wsm0/A541mRactxKStgvpvcK/AFyMVe2ssX8lIwzldOCdIxXVQXafjSd L5gbtocJUjIRKYAKEuL8peCEZWC6vxF860fbeLe3dpOXl19OEFHiiuhE3e1MydpsjjhoFb Kq/jvYhr2VQyWPNgq61DpWPP1cqU+pvfolTuaPAqiUSiWOjzu07foaIX8BBks/fFTKj+bq x9bYsGG2IGOfQUwpBLB5GhyVcgiNzzLSPvJjyCF2FZ68yfiI2KZcaY2MthS21bJDZ2Yy75 6ShKYbLQdL08V/sLzCcAqDhWh6i5pPXrrUJM25qLLauFmX79I3biP/j/Uk3R4w== 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 4TdpL45c2YzjSP; Mon, 19 Feb 2024 16:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JGj019094832; Mon, 19 Feb 2024 16:45:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGj0Pg094829; Mon, 19 Feb 2024 16:45:00 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:45:00 GMT Message-Id: <202402191645.41JGj0Pg094829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: a2061845faf0 - stable/13 - imgact_elf: Move GNU_ABI_VENDOR to a common header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2061845faf0711fd2437b7123acaa27d338cb3e Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a2061845faf0711fd2437b7123acaa27d338cb3e commit a2061845faf0711fd2437b7123acaa27d338cb3e Author: Andrew Turner AuthorDate: 2023-11-01 15:05:58 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 12:43:42 +0000 imgact_elf: Move GNU_ABI_VENDOR to a common header Move the definition of GNU_ABI_VENDOR to a common location so it can be used in multiple files. Reviewed by: emaste, kib, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42442 (cherry picked from commit 9d2612fc2a7e54719058c68b62ea035b029c954f) --- sys/kern/imgact_elf.c | 1 - sys/sys/imgact_elf.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index cae1889bc4c5..b27129a555c4 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -240,7 +240,6 @@ __elfN(freebsd_trans_osrel)(const Elf_Note *note, int32_t *osrel) return (true); } -static const char GNU_ABI_VENDOR[] = "GNU"; static int GNU_KFREEBSD_ABI_DESC = 3; Elf_Brandnote __elfN(kfreebsd_brandnote) = { diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index 349161a66c48..b0cb6f9fcce7 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -101,6 +101,7 @@ __ElfType(Brandinfo); #define MAX_BRANDS 8 #define FREEBSD_ABI_VENDOR "FreeBSD" +#define GNU_ABI_VENDOR "GNU" typedef void (*outfunc_t)(void *, struct sbuf *, size_t *);