From nobody Thu Jul 27 04:11:56 2023 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 4RBHQj0qhkz4pQ6x; Thu, 27 Jul 2023 04:11:57 +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 4RBHQh5LrPz3nFT; Thu, 27 Jul 2023 04:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431116; 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=t16EKuzngWDUXB7E9fxTnt/CBn+TK/Eq/WY6OP/DNKw=; b=JJCis+J3ZCpZq05DPAuj2tCdrcPypTonJcY8yv5tQRAwCS8J5an1m626GpBZ7/g7piWWaE /937nt63eZK8/O0HJIZiW9OSsVPvRrmbVca4fcx0vMr3fM9/KS3Nu66YF1YLVyVLcbIf4m 47Dj+gMWQhPiAtpBeTIOcq2hg4GWqsR0Ve+d4rFAysbjcJWw5eQtJom/kSGLJpT5QBYXBv 4Qd3E7hGoX2V5Yq5SBsohw3d6K9omuzG6yJfLn6+yDpT7Oa4XFlzs161dfIggEQBiAqsto DpXVmCbSCmXd3eiQ2lyk5sFq2R9q08D6HKa+MEC/uMH9bM4/Dh9Eb0SO3vJiKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431116; 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=t16EKuzngWDUXB7E9fxTnt/CBn+TK/Eq/WY6OP/DNKw=; b=CFbpnxv1Ns5kIl14QGydeEj9yKYsjECXSWodkVFGF1FMq+F5O3H2djSx2UK7BJZK8ggLZ7 W74TE7TvtRlb5y08DfU+JmGcgHDP+lkDr9X7ryw/H9C2UVqxQisvt3s8mDaLnfZWsokbDF I+ccqpC9KDkjI+qrEK1vT48wOUebeQi+fU4nz3NNbowXhbpbxdyCHqWsA3XbAPssK8yJeN IpVq5Db6LiUK+XdPVZWpxj2GS46YsPOlCFD0E/jI7k+E9L//wnDjI9kazOofM+6qwHaOB7 lMIGEQ9Sj1QLQDsHqzj5bTUQDkk95O/KKXJcuMeOQmhch6D4vuyy4QIClsCMlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431116; a=rsa-sha256; cv=none; b=bTRSL+pV+32D1RmxUKjD/s8QlLkzbhjLzEO6S+2cepvG36Z9FtH7tUXi1+X+yiLuDcUOAL aFR9ydNAVonjsaPmETgMOCUDoYUmPrhwBmgeEn/PC+K74DILmAe5nZUoqz9vdRMgSlrh88 ftOYviqIfzcTJESgxuRoFl0B5lM4eS9CvDsdQVDKMzWus0HLmwNDugwFUwXEcufwYEnNKF UI8dK5w0mvg20vydef+UltlNaZUvWtndTqhnMWF/3cL20yVFBpO9JXzNRXfEi+ZD59a9OV l6Pzgre9x+Nuq4L2iFpExVvttiOArQR28Q3dtZGlxAMdWW+AzydhrItq3AyYHg== 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 4RBHQh4RMKz19DZ; Thu, 27 Jul 2023 04:11:56 +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 36R4BuBn097558; Thu, 27 Jul 2023 04:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4Buqw097557; Thu, 27 Jul 2023 04:11:56 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:11:56 GMT Message-Id: <202307270411.36R4Buqw097557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 195e50541eca - main - libexec: Automatically generate rtld-elf list and generalise TAGS 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 195e50541eca73b8d40bed4223b87ba48cfed27d Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=195e50541eca73b8d40bed4223b87ba48cfed27d commit 195e50541eca73b8d40bed4223b87ba48cfed27d Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:45 +0000 Commit: Jessica Clarke CommitDate: 2023-07-27 04:10:45 +0000 libexec: Automatically generate rtld-elf list and generalise TAGS Note that the pattern for matching is made slightly more specific, so as to permit libcompats where one is a prefix of another (e.g. CheriBSD has lib64 and lib64c). Reviewed by: brooks, jhb, emaste, imp, kib Differential Revision: https://reviews.freebsd.org/D41183 --- libexec/Makefile | 6 +++++- libexec/rtld-elf/Makefile | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libexec/Makefile b/libexec/Makefile index a890115fd15a..f1e99e580e97 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -3,6 +3,8 @@ .include +.include + SUBDIR= ${_atf} \ ${_atrun} \ ${_blacklistd-helper} \ @@ -84,7 +86,9 @@ _tftp-proxy= tftp-proxy .if !defined(NO_PIC) && !defined(NO_RTLD) _rtld-elf= rtld-elf -SUBDIR.${MK_LIB32}+= rtld-elf32 +.for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats} +SUBDIR.${MK_LIB${LIBCOMPAT}}+= rtld-elf${libcompat} +.endfor .endif .if ${MK_RBOOTD} != "no" diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index a132c756723f..5a31ca674a53 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -14,13 +14,17 @@ MK_ASAN= no MK_SSP= no MK_UBSAN= no +.include + .if !defined(NEED_COMPAT) CONFS= libmap.conf .endif PROG?= ld-elf.so.1 -.if (${PROG:M*ld-elf32*} != "") -TAGS+= lib32 +.for _libcompat in ${_ALL_libcompats} +.if ${PROG:M*ld-elf${_libcompat}[-.]*} != "" +TAGS+= lib${_libcompat} .endif +.endfor SRCS= \ crtbrand.S \ rtld_start.S \