From nobody Fri Mar 22 16:30:14 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 4V1SVG4Kd4z5FHQg; Fri, 22 Mar 2024 16:30:14 +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 4V1SVG3c3rz4Z7X; Fri, 22 Mar 2024 16:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711125014; 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=ZKddgwzJQ4rm52+MBTF0qZ5qQIzh9VY9ejgfSk9I95o=; b=WpOczyNBHwByvkRuCvboUGURpuaqBqh1NCqyGuFnkSpj/f7lWTjYyakHT59KICH06JPOdt Un3WuT23DRCIH5A++tZy4LCjPfrLt7Ev+yqTvGCIdVZun+f7keRdeLd2uuXqq3CaRFDY5C QSYxPoiBQVDBsZukvfquLIUmpnlC+/BH3irMo0XqR7klL/ehNRqyO/DRD0cpZ4hebY1IK/ PgV/m825SJuT4YgHxQ3vzfstRSAKkVQ8KbkFMPIePORxm+tNd9drkVfj42feEwthkO7T2q jrxo40LdCSc6K3hcFK1cMYp7KzlvVDuYhVy80B3OuIyChsDB5QruLz0cV+FEhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711125014; a=rsa-sha256; cv=none; b=td7se25ZkRbW+SsQiS/ZvEUyTqPp7ncONbH5jpgHO9jWQqE0oAIIYF73TjOCRkK9py/c6z KLswM4ZrOZnOU/BiFfsEcYREeaNZpmN8pm5tJZ9pKD1FV1Ma84WBZTf9Z/93WwHJO8P89x 0n6UgUhUY4nVd+z0I2vBxi7HQIvDG8ZMtcm4gMWUHKRPjavH4dpvdM7UPalKpWmY4JZJYb yPVQLGvIkFPFBPy1oYku2XMQR1DtJt0ijuu6ZMPEEXujBFAdKYQQLVWfgobh2XUTmQtqPG YNlZ2vxVFY42aT82N0RxF79RO0RjKssubAmDW005BoH394Ja/yjqmXP6ynS+eg== 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=1711125014; 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=ZKddgwzJQ4rm52+MBTF0qZ5qQIzh9VY9ejgfSk9I95o=; b=q7XEwOY3cbg2jdfEvm0Er4l9UYWDShjC2KYHEw9IwHRgp7XErueJhv4YTu1YyzFqRaOEDB TaWP4R9UE/PlyBJnd+vU2Hq1U7UBMgADWbyNRYhfu7lT3F8qOUdkab2AMFr5Q5A5+DVgHn bmTIdZcDgHhPyUEDqS5c02rspY8b4a5p6em1OIe469Q2mhqJzZTgBjsSGThs77tZngSJ37 cDfn82QQcZxsvYpmYwKSBQdtpFU6nAaIyOlRoVu/nuBKRqdBddrRrCzQevN9dFuCjl/ymr TRr7DMTJKQOy89GPtfoLrSDH/q8aEwSssxMqQwhZqlmoyMWK9sA4heihH6ysMg== 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 4V1SVG3C6Jz1Q66; Fri, 22 Mar 2024 16:30:14 +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 42MGUEEj099465; Fri, 22 Mar 2024 16:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MGUEPq099456; Fri, 22 Mar 2024 16:30:14 GMT (envelope-from git) Date: Fri, 22 Mar 2024 16:30:14 GMT Message-Id: <202403221630.42MGUEPq099456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: dc7ae2bc6fad - main - kern_ctf.c: fix linking with nooptions DDB 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc7ae2bc6fadd67cef0e1c65d79aa82818ac9793 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dc7ae2bc6fadd67cef0e1c65d79aa82818ac9793 commit dc7ae2bc6fadd67cef0e1c65d79aa82818ac9793 Author: Mitchell Horne AuthorDate: 2024-03-22 16:26:00 +0000 Commit: Mitchell Horne CommitDate: 2024-03-22 16:26:00 +0000 kern_ctf.c: fix linking with nooptions DDB !DDB builds don't include the db_ctf_lookup_typename() symbol, so this is a stop-gap to fix linking of the MINIMAL kernel config. Reported by: bapt Fixes: c21bc6f3c242 ("ddb: Add CTF-based pretty printing") --- sys/kern/kern_ctf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c index 8a2106a15308..b525c274f9e0 100644 --- a/sys/kern/kern_ctf.c +++ b/sys/kern/kern_ctf.c @@ -326,5 +326,9 @@ link_elf_ctf_lookup_typename(linker_file_t lf, linker_ctf_t *lc, if (link_elf_ctf_get_ddb(lf, lc)) return (ENOENT); +#ifdef DDB return (db_ctf_lookup_typename(lc, typename) ? 0 : ENOENT); +#else + return (ENOENT); +#endif }