From nobody Wed Aug 02 00:37:16 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 4RFtNJ2mtSz4q3Cj; Wed, 2 Aug 2023 00:37:16 +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 4RFtND403Vz3pp4; Wed, 2 Aug 2023 00:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936636; 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=/RTHpGkjkDu+IqFURzdjzKqZ8uXn7t33SK0mKelRPJU=; b=juUuTd0q1l3G+DtF7csqP5wxsGDO/PDaOHU+PJ2/yZnDIstBEHL1TbNkKKMOCyCsnVPmR8 Gmm7tzKAFzJhnC7g6wXTM2ZhOETjAcUDDoT/+1T7ChkZWvjlRLpLBjGjamVWzfJhVskj55 ZurkkB5duoWEABfrfgrmHvYVfFv5wx23mknEkYwQtazFaAWzf7KyzOkoMTFpppi+gJquNu lyAzuLIk+9WlnIXCm1gX9bmWGbPBOjBMI/tU8bhOuUxoz1T3sSnC+l9GiJQkfAjwaFEy1V Mdb3RQifX5hfZXzhdeU9rxv3hRJ1Ny8Mym8S30p39w/2NhLawM6tX7OObhjfSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690936636; a=rsa-sha256; cv=none; b=dLSGjz80nTZtryPDGICbW5nOWWirrjWAjXS1Oaacpdiy1jZO4mN6ozMSOzdCN36+Wd/FrV 5Pqwf2L34DNwPFq5dMMrP0NYGd165xrseoJx9bzW1+naXpCMwWuQlD7hboo4zudeUkS4K3 hO/80rRR9fFN3+Tpf5b3tOTTNbVkQoKcXtyA2g89kj287mJ47ujHWiBgg294ENk/otaoNR l23HjUP8927zOsEbZJB+1nzhabHefAV1k3XzN2by9Gn6JtVYmy4YuoOZPSOaGy0lmWT4Wl LgbyhTVBqVlMninZlcb57bloY8ya9iGZVdyaRf2iwyeluBVOmCsyr7G0mQBglA== 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=1690936636; 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=/RTHpGkjkDu+IqFURzdjzKqZ8uXn7t33SK0mKelRPJU=; b=VH/cfiMkdT2bx1rF1JdFku/aDqn/gRZUSi7MeCP199kogoKvsmTxcH1YPosfw7ON2XEPCj AeNx43/7uoL0fob9bo2dRYpA3JQ3oBfq9MoS2/kSPK7giOPk6omP/cWMpt2aDeNRMHJ/hK JXUcs6Ax3TWR3JGbmVz62DpVr/RRMtV8STZIBAUOTcv0zfEr8sh/qkBoKiGe35bp4KII+7 cyEro3of+MNqjkwV0a/GFB1g23fzkoIOGs6o9WXH5BBEznXwSJdra4hfxmgJDe/BCfMlbE UnzAXgCGgP+WR0RHqoM1sdm29A4wj0mIpVjQtjLuv/rwyfZQi0gmLky9yAJuyw== 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 4RFtND2kLczydn; Wed, 2 Aug 2023 00:37:16 +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 3720bGTh060600; Wed, 2 Aug 2023 00:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3720bGBx060599; Wed, 2 Aug 2023 00:37:16 GMT (envelope-from git) Date: Wed, 2 Aug 2023 00:37:16 GMT Message-Id: <202308020037.3720bGBx060599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 04085d4b69dc - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 04085d4b69dc556c42ada27b0ec448ddc896f09a Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=04085d4b69dc556c42ada27b0ec448ddc896f09a commit 04085d4b69dc556c42ada27b0ec448ddc896f09a Author: Konstantin Belousov AuthorDate: 2023-07-22 04:39:20 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-02 00:36:39 +0000 rtld_malloc: only include internal rtld headers when building for rtld (cherry picked from commit bc7e86106d428c7da328ad7fc9d4cb5f7f303e0e) --- 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" /*