From nobody Wed Nov 24 23:56:23 2021 X-Original-To: dev-commits-src-main@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 76F7518ADBB0; Wed, 24 Nov 2021 23:56:24 +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 4HzyZv3Kr4z4RFb; Wed, 24 Nov 2021 23:56:23 +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 2DE30135AB; Wed, 24 Nov 2021 23:56:23 +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 1AONuNBU022631; Wed, 24 Nov 2021 23:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AONuNDF022630; Wed, 24 Nov 2021 23:56:23 GMT (envelope-from git) Date: Wed, 24 Nov 2021 23:56:23 GMT Message-Id: <202111242356.1AONuNDF022630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: af9115870670 - main - ldconfig: use libexec/rtld-elf/rtld_paths.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: af9115870670f508c11b3d173bcff5116d8ef320 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637798183; 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=ax0GTQY/phd6ASKs+fcB5kIkhflHtNeFNiAqUJmmYtQ=; b=m82mIJo+aiALyWJMAPjgdugzhmYv0f99+PA+h9wu+YqXePo/lXz8cD4TxZmCt8YBd38TT/ 4kZcHlqGItWhJkDP/RCFsFuuxLHeCv5WF+2Akk5vDoHwi0ELv9eJiLKbJ2gZUDnnMv8G2Z /G3P3nMvlzoEoQfoedj7VW+/nCIk1wC4V35I7uJclPVVY0iIXz0SHMMyfJROdM4kqlqCiy 9s/tHtYHrAUn/X3u279zeN5cWlqFKp8U3Nm3o6f4SmWlg4oCo/Kqs/HTHTZiJnJXtyzPZH HRadzZ1srZWgud0vWgB0RVved4I5wtttYkcmKsUO6KL8/uDi58fTFoLN2gyERw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637798183; a=rsa-sha256; cv=none; b=kPiJ0jOsxUXBzgcgMAYu+D4r8tfcd7vy7JQW8USczm3kqJfMJbYShpM0yw6/o+gn3UNw2E b9PzLmNXggbPP51eIcoOQSyOCx5RnE9GriOt9mss6exD4w5Rvywvy98cnISZbdYAF1hUI7 ouhoVB3fh8ENyDwWFUYXSdJrg/a7lHbxa4XvBgBmlL1ts04mMh5Vvn3VKSJwtcKJhTjuia A33KEOv5boMyk8TKRl6F5SCbAlfYrA4VjQ4gRmyDm1HoBw1GmA64w3AJpLa6ug1n/K59qr mgyteomXklInNcKoq94v6eBdWQXadcBlwWe0OHrsp8ZXGOa9ysWttMj3IXQH5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=af9115870670f508c11b3d173bcff5116d8ef320 commit af9115870670f508c11b3d173bcff5116d8ef320 Author: Konstantin Belousov AuthorDate: 2021-11-19 03:45:31 +0000 Commit: Konstantin Belousov CommitDate: 2021-11-24 23:55:04 +0000 ldconfig: use libexec/rtld-elf/rtld_paths.h instead of duplicating definitions using slighly different macro names. Reviewed by: emaste Tested by: jbeich Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D33058 --- sbin/ldconfig/Makefile | 1 + sbin/ldconfig/ldconfig.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile index 2ead668578f6..070c2c3d6901 100644 --- a/sbin/ldconfig/Makefile +++ b/sbin/ldconfig/Makefile @@ -3,6 +3,7 @@ PACKAGE=runtime PROG= ldconfig SRCS= elfhints.c ldconfig.c +CFLAGS+= -I${SRCTOP}/libexec/rtld-elf MAN= ldconfig.8 .include diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 777895936834..288c22813121 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -48,6 +48,7 @@ #include #include "ldconfig.h" +#include "rtld_paths.h" #define _PATH_LD32_HINTS "/var/run/ld32.so.hints" #define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints" @@ -84,7 +85,7 @@ main(int argc, char **argv) } if (is_soft) - hints_file = _PATH_ELFSOFT_HINTS; + hints_file = _PATH_SOFT_ELF_HINTS; else if (is_32) hints_file = _PATH_ELF32_HINTS; else