From nobody Mon Apr 22 20:29:13 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 4VNcKj2cFBz5HqbC; Mon, 22 Apr 2024 20:29:13 +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 4VNcKj20r9z4wk5; Mon, 22 Apr 2024 20:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713817753; 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=vJCedCW2lUbj4kjaDaNivZjwa83uxnKIQwsq4eT/5kA=; b=C37aNi4Vv+gyrqkZ0zaRrZFayTWaxMRuEzkIm3KIMRNtBMlK/WN8KAo+X6vJns3D2fhVGh 9osKdo4JFytN7cXdlOeqofJq5gBsQ4a+91OQjWZitQsLaVyOob++d6QA40CGSyuOBlSVMO FfBVKwkXK7Iq0gd1FVEmKmqttrUiznJLd+ZCQrAxo+K5emJlP7lx+sNAsSh9HyXx4M8HeO mZZavAgWMzvkEczHr6oB0FlD/E8RUP0w7CzsNxLKbUeaOst6geWjf7WnE87IpFctTbgbeV uApnv6mFzO/VFiho8O6NWbZRAWQgzXyopUUW9smTHl4HaaSY/ezrV7NTr8zL4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713817753; a=rsa-sha256; cv=none; b=UHko3T+pC9vEpwtWHcclEHD92dH8UVCy1EXX/XYfQfM5g/djEFvYNiwKIlhQJutvXvalUb vD8bmzio5n8Im8fsjBEcR9kqsJ+oydPF37ox7j68UviAOkLn7JAKQpEx9PHgXDumDe+a24 LkPGrwquk9Kjr0iPRnXT3XnyeqOllQwR01P2H8TavNrqvHyikM/Ah+SCIGV1w9F8Cf2t4v 7LVKiI/P8fT+XdVYNbuICjQPLn0NeX/3cUcEbQBl7ltsjXPpdqdkPdlfkVMRJx0IxQF0mh iRt9IX+BW4AtSV0QI8Jxd76qaZCyNPthbQ2egZxZb5hxvLKegWQe1fgGobK4MA== 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=1713817753; 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=vJCedCW2lUbj4kjaDaNivZjwa83uxnKIQwsq4eT/5kA=; b=gKL3N5uKoayVEcCtMDA3d+m9/XEnGzxbm+aGj5dpLlqBGksyBJwSgvVr390os6kV3OH7SK kdgPYq/YYZLMWILb/UsFXeyyLvZxSvHmXazw0Kx8qHypBzYoNqF7DLonSuKdGP6WH2NDvx MLbXlmZsE7M4t6BYbcqNKBkpWVo23HLQ7+ZSDEwHN+BXnW3Ztqudt32qxXvjn8Lpy13sqq 7aHXp3G+HAPegvjGd3IyHzP40oI3gFvvQ6sX/doPD4G6FLyF/eNScFw7DLO7kccPF0y38I mQasepbG0eYJDWfRPODUUyDwxfB/ZmKAIsj9d8f/pBkgrmQMF8DQJ13NpT3NOA== 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 4VNcKj1b9Vz12qR; Mon, 22 Apr 2024 20:29:13 +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 43MKTDNS000974; Mon, 22 Apr 2024 20:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MKTDtA000971; Mon, 22 Apr 2024 20:29:13 GMT (envelope-from git) Date: Mon, 22 Apr 2024 20:29:13 GMT Message-Id: <202404222029.43MKTDtA000971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7448408656b0 - main - Make __libsys_interposing_slot libsys only 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7448408656b05b7aa6f81c72366296c567591df9 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7448408656b05b7aa6f81c72366296c567591df9 commit 7448408656b05b7aa6f81c72366296c567591df9 Author: Brooks Davis AuthorDate: 2024-04-22 18:24:36 +0000 Commit: Brooks Davis CommitDate: 2024-04-22 20:28:26 +0000 Make __libsys_interposing_slot libsys only Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44881 --- lib/libsys/Makefile | 3 ++- lib/libsys/Makefile.sys | 3 ++- lib/libsys/Symbol.map | 1 + lib/libsys/Symbol.sys.map | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile index 93b880cd67fe..b4c0e91e860c 100644 --- a/lib/libsys/Makefile +++ b/lib/libsys/Makefile @@ -60,7 +60,8 @@ MIASM= NOASM= SYM_MAPS+= ${LIBSYS_SRCTOP}/Symbol.map -SRCS+= auxv.c +SRCS+= auxv.c \ + interposing_table.c .include "${LIBSYS_SRCTOP}/Makefile.sys" diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 98a9688e58a1..205f6bc1a5eb 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -37,7 +37,6 @@ SRCS+= \ __getosreldate.c \ getpagesize.c \ getpagesizes.c \ - interposing_table.c \ libsys_sigwait.c .if ${LIB} == "c" @@ -46,6 +45,8 @@ SOBJS+= libc_stubs.pico # Link the full implementation of ELF auxargs for static libc. STATICOBJS+= auxv.o + +STATICOBJS+= interposing_table.o .endif NOASM= yield.o diff --git a/lib/libsys/Symbol.map b/lib/libsys/Symbol.map index 99cc171dd405..2cd524c19a3f 100644 --- a/lib/libsys/Symbol.map +++ b/lib/libsys/Symbol.map @@ -2,6 +2,7 @@ FBSDprivate_1.0 { __elf_aux_vector; __getosreldate; __realpathat; + __libsys_interposing_slot; _elf_aux_info; freebsd11_fstat; freebsd11_fstatat; diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 822c007d32f1..464086985cfc 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -384,7 +384,6 @@ FBSD_1.8 { FBSDprivate_1.0 { /* Add entries in sort(1) order */ - __libsys_interposing_slot; __set_error_selector; __sigwait; gssd_syscall;