From owner-dev-commits-src-branches@freebsd.org Thu Mar 18 01:25:08 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4097C5A80BA; Thu, 18 Mar 2021 01:25:08 +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 4F18Tb3T7Nz3vWf; Thu, 18 Mar 2021 01:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5C35118F5A; Thu, 18 Mar 2021 01:25:07 +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 12I1P7D6083603; Thu, 18 Mar 2021 01:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12I1P7xG083602; Thu, 18 Mar 2021 01:25:07 GMT (envelope-from git) Date: Thu, 18 Mar 2021 01:25:07 GMT Message-Id: <202103180125.12I1P7xG083602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 838ceecf2ab5 - stable/13 - link_elf_obj: Add a case missing from 5e6989ba4f26 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 838ceecf2ab5742af3ff5a9ad978268942cb1654 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 01:25:08 -0000 The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=838ceecf2ab5742af3ff5a9ad978268942cb1654 commit 838ceecf2ab5742af3ff5a9ad978268942cb1654 Author: Mark Johnston AuthorDate: 2021-03-16 19:01:41 +0000 Commit: Mark Johnston CommitDate: 2021-03-18 01:24:55 +0000 link_elf_obj: Add a case missing from 5e6989ba4f26 Fixes: 5e6989ba4f26 Sponsored by: The FreeBSD Foundation (cherry picked from commit 4aa157dd5b4e72b85dd07ce3c106b742ca371bca) --- sys/kern/link_elf_obj.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 337588bd5c00..65b997b513e3 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -472,6 +472,7 @@ link_elf_link_preload(linker_class_t cls, const char *filename, #ifdef __amd64__ case SHT_X86_64_UNWIND: #endif + case SHT_INIT_ARRAY: case SHT_FINI_ARRAY: if (shdr[i].sh_addr == 0) break;