From nobody Wed Jul 26 14:30:14 2023 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 4R9xBZ2rcZz4ny1c; Wed, 26 Jul 2023 14: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 4R9xBZ1tKMz3MJs; Wed, 26 Jul 2023 14: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=1690381814; 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=Pv7KSmqHn0VkkEco8yvNfZdOmTtFyWiocu1silSBQbk=; b=P/x9vzoF+UHhM7qtaPAu6X96/Qe43YDIK13DPQ1X+ZDi1+ar8gqsXZKBXd9KNcMEHZ2c0I LZ3FsVRIdBi8hEG1Xpg7Jr6tvpgA092lc6wuSpY3xGseVqPNNJz8TWXKnkAfMO+qaw9lRb o7NZpVL/SqG9q2STOq/4/buRw7sewRMHZegmrh7rOTQjvxxlo1gIq23clzTKG88OKU6iSr QgmpxEAY2QcG2QWUPyamfsttNI/52GiBdRbErumhzy7myfaPh4RhfKQsbsxzqhgixl6tK6 nQpf6Kekc3rgfKLT294+KR2RI2b5Vt6jM09FpKro9Jy28+x/mdjJf8GRwLI7OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690381814; 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=Pv7KSmqHn0VkkEco8yvNfZdOmTtFyWiocu1silSBQbk=; b=FZRzsjTnyf2EFV+bjNIPkT1Gbf2AmdLyKZ4ip0o5rqbBZvVWNmwVJ+4MjZcyOCZWmmg5DN USoBkYwm/kzHcpJ6BbBLEMhuQ/nHC6VrfbemuyVJu/X3xNGKs07cGIh5hPNFzSTxxVZIz0 K+RYFEoU04Hl4Dpy7tKw9I0aWZSXBfO3oqC/VBsGJP8ykoOFQfM/TzBD2TDmItGtFoGDTH p2GY0F9w/DooKUFAEGR74ra+obHoJVPZT3SMa2ZIVhWH46nC4zuvRh+JTWPq+141EX1L0r lQnJi0Lv+JmbUeWckhGEnpskyRhq8gzPbb22qOtdoaRzo8nLDmx92bVSZYJcVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690381814; a=rsa-sha256; cv=none; b=TC18kvy1ejC7NCpHDQlTkP4xJ4y33raZItPE+vi49qbMcbwGIQLuN2d3fSkt0e4peA98id 0/DYTrNKZEanwFXds0ng/90+08Oep2oc14h0Kek83StToI3j1e6poXTTWyYE9LmfA94raz mshFHRi/aUH94avqhF+n0x7mbGJXy7MlBpNFbUvHsxycAioij5W7yTcn4eq9Tp698IqIBY CrEQwQg4jaIPhtxM5qSWnH/DlnoJ3P0Je4KAcYgeFwdEkRlqG7FwPjDqbDn/Q9i72dfk2+ olO0hP/EG8iA1g/i8zvYR/WDFEo0MRr89QZ/OfjjPXVUd3a+tiTEkuSiv3Lygw== 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 4R9xBZ0tg2zmLf; Wed, 26 Jul 2023 14: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 36QEUExM027770; Wed, 26 Jul 2023 14: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 36QEUEdZ027767; Wed, 26 Jul 2023 14:30:14 GMT (envelope-from git) Date: Wed, 26 Jul 2023 14:30:14 GMT Message-Id: <202307261430.36QEUEdZ027767@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: bc7e86106d42 - main - rtld_malloc: only include internal rtld headers when building for rtld 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc7e86106d428c7da328ad7fc9d4cb5f7f303e0e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bc7e86106d428c7da328ad7fc9d4cb5f7f303e0e commit bc7e86106d428c7da328ad7fc9d4cb5f7f303e0e Author: Konstantin Belousov AuthorDate: 2023-07-22 04:39:20 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-26 14:24:17 +0000 rtld_malloc: only include internal rtld headers when building for rtld Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld_malloc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 6660610b11ce..45d3f743e348 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -53,9 +53,11 @@ static char *rcsid = "$FreeBSD$"; #include #include #include +#ifdef IN_RTLD #include "rtld.h" #include "rtld_printf.h" #include "rtld_paths.h" +#endif #include "rtld_malloc.h" /*