From nobody Wed Feb 14 04:05:36 2024 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 4TZPk86KLjz59rHR; Wed, 14 Feb 2024 04:05:36 +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 4TZPk85dmKz4B8G; Wed, 14 Feb 2024 04:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883536; 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=wzk23J9wYzLX1Xug0H+qgG8RDpLbG6A04JrfFw9kfbU=; b=AQBvaV4P1cGOx/nqObTGiHGrkmqU5RldNDv5HAPi6tJDPW1ZA3c9F3cVtltmOD7Ve4TYAZ GdCPRLycvn9tjtV/dxiGOA93WS1a78Q8qUjnp1EqSTUIB9xpDNpDXYursKI8UTiqx3y8S0 02SBDrNY3yOgq3SpvWOFyyrXoRNoChpgHWHFrCBo+vpp3kFd1MWa5cieXCiyR88X/qsCL9 TKdPIIOabENiEs1fpVpWQ7YZjIZKwGjkIih31R9j4s2HYFVTKwW3JL/kbc5iejwqGqvODg NHlde2FW53rzjp4Z4e5fvlK/6QlvfaDSbxPY22big3s9hGZKEoNcVf9Up+1Bxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707883536; a=rsa-sha256; cv=none; b=tdTSWX/Urej4mApWW6icdiKJdtgMZyc0GCvQG3/hp4lx0uo0p1FY96BSXErPTQL9hpmh6N j0T2grbQaNYebA51mXAPNe0vXdA0KYfzrsEDIsLi3y4cbF/d7fk+/JhguQ4Ak9Q9VsbytG D+fp6xmdyVlUFMK+sPuSOD+kNPsGB13Cyu/A0c7iolL7SMb4EUWm4XebcvuB3rIXqqe2Go BjulVLR2PC6WjrJVCRaSnDB41KIOxVPul4mayogPw10Ep5FbusMPigXdghn3clv4BXyWbU CQDvj/WuVeoYFB4ZU3Z+AMlQJha+6y1iXm/hF4Vm9uPlHJMl4deJSsjdtYQCQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883536; 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=wzk23J9wYzLX1Xug0H+qgG8RDpLbG6A04JrfFw9kfbU=; b=bEcY22f9BRx9CsZNFYL/KxL+htoyFbkbUN/9jd5rthdiEKqHHk9NasfPAyyBM5FUVaVbRd cTBkSRGy+hbK6419urOO4AwRXAvBB+oBiITFyIEf05cn87QOwGvKxtPonqieY8Q1EcO9p+ 69+XfDo0GC9/7DsjxKTOD/MEB0ol0cuJ0UsZs5lxgkJi4DPDd7sxZCeeV35bDUPZ5W0SJX sp3IYGrl7Y0MInGElHVgIZEZEekALw2ns55FWRX9ktwa/OyE9/5rsJu3/4tP1JZBiqKlmK jx57QspUzJCOMfuRdwgnTgk8PeHyRoojAIvg5LYcYeWCHp3LJEcYLYiLC/LzCg== 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 4TZPk84j4yzk2m; Wed, 14 Feb 2024 04:05:36 +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 41E45ahQ082464; Wed, 14 Feb 2024 04:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E45aoF082461; Wed, 14 Feb 2024 04:05:36 GMT (envelope-from git) Date: Wed, 14 Feb 2024 04:05:36 GMT Message-Id: <202402140405.41E45aoF082461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a6ee29582219 - stable/13 - amd64/linux*: mark brandlists as static 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6ee29582219bc8f5c7ecde009f832a027443307 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ee29582219bc8f5c7ecde009f832a027443307 commit a6ee29582219bc8f5c7ecde009f832a027443307 Author: Konstantin Belousov AuthorDate: 2024-02-10 01:01:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:54:00 +0000 amd64/linux*: mark brandlists as static (cherry picked from commit be707ee09556a3fa345bc30c04aeeaa2a5d2efa2) --- sys/amd64/linux/linux_sysvec.c | 2 +- sys/amd64/linux32/linux32_sysvec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index c8dc40ea0a29..92993c4548e7 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -908,7 +908,7 @@ static Elf64_Brandinfo linux_muslbrand = { LINUX_BI_FUTEX_REQUEUE }; -Elf64_Brandinfo *linux_brandlist[] = { +static Elf64_Brandinfo *linux_brandlist[] = { &linux_glibc2brand, &linux_glibc2brandshort, &linux_muslbrand, diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index fb817ea2b1ab..b4fb9fd1b1e9 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -1003,7 +1003,7 @@ static Elf32_Brandinfo linux_muslbrand = { LINUX_BI_FUTEX_REQUEUE }; -Elf32_Brandinfo *linux_brandlist[] = { +static Elf32_Brandinfo *linux_brandlist[] = { &linux_brand, &linux_glibc2brand, &linux_muslbrand,