From nobody Mon Feb 19 16:45:18 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 4TdpLQ4SK5z5C9WS; Mon, 19 Feb 2024 16:45:18 +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 4TdpLQ297Kz4bh0; Mon, 19 Feb 2024 16:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361118; 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=Gp3YYrn0UC6WZ0DofC1v8SsHExOQSyzHWpoCGdxE0gk=; b=NQ/3LmnH/q3HZw7p98BDvgMjzfIkqrkhkb2y9ptuuoxIy4J1G9bhlt6H6U0F7SakiGlLEH 41UjBVCes9hO5BqPOi00U7f8JjBIc6leZUGvkRTru4aaAva8gzuGzIG/W/RVwKcVw2pc5u tiLcwBJOAtTlPU8O99RgPRu7PGbP5T2Q44T5mDL8o8XnOUDTgOWfDsnzc1E3JwRE/k/nHz mn4MJ8jjGDJ24mOsVP939jjXCHkpCWVITio6HX9B62SWRbS5mFL7OB1hm1GV98/UCXicZb 2ICpPHLTnSXijbnx38MPlUweQlNk/De8Z1Apb49MHcCNT2MeRfBMfdha90yzYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361118; 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=Gp3YYrn0UC6WZ0DofC1v8SsHExOQSyzHWpoCGdxE0gk=; b=cHOGKzOygp/c+6kmv6SuSToEets5fUXaaCV7aFzPizIJl7Z0k8blRC+lKMn1AuQynrr1Oo fqF/minJ7mfV8eI+BcQIrmBKzM/xF3VcSTja3b77Y2JMBfjZN1gVTNLujrrSY+N3ybWOIn PVKI2CpglD1G8whXk6ex32OIaKpxw3y+sMzQPS00I85jEid9sBa2cJUZ1/+Cp8Wg1bViyU HVkkMAvQiLJrNbqw2AlQhrpLaFDyScKiJJ+fgYoWoB52pjJhhOg+nGpuUheaqhW0Ya5N9Q BJHWB5r+APvubSjyYfwDmeTDWnjayslTB6ws97uUBZobx7cB3zucax4jqMtUng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361118; a=rsa-sha256; cv=none; b=RgibGeGwonHtvWa2HSB8EraYWVmlAhxZimA26mlxBnY4ATogVkLY8MSSwNVRpB1OC1usAZ W++NBSiXkK8fWRhNsYp6FOv//n03oFzfozdhhAF8m/q/dKmn4yE9vCDqQ7ijfS05eUK+DL 1UPMTT92sjiulLLABAVnH/l6HEpqAOrx6d61xNLJQh5187ARNgDFktyXdFyl83hSix34up M+VxEkhf23k4qr8Zt6NuNzwY0Z0n4pyEeui8iP4bPISYFNGjW58lY2SvUVZ5cW4/vDkXo5 NGEPdGXY5B67araTIIwyaGktBny8JwuK6yBSykcIM5by4NRKaM62m5tmut6ALQ== 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 4TdpLQ1H6yzjVc; Mon, 19 Feb 2024 16:45:18 +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 41JGjIff096016; Mon, 19 Feb 2024 16:45:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGjI8c096013; Mon, 19 Feb 2024 16:45:18 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:45:18 GMT Message-Id: <202402191645.41JGjI8c096013@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: c424b194192e - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: c424b194192ee818662ac83e8420a9c35f046f0a Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c424b194192ee818662ac83e8420a9c35f046f0a commit c424b194192ee818662ac83e8420a9c35f046f0a Author: Andrew Turner AuthorDate: 2023-11-01 15:05:58 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 13:12:40 +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 85f0602fe584..0b22e113b3d7 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -246,7 +246,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 f3d9be027079..7210fc2187a9 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -100,6 +100,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 *);