From nobody Wed Aug 2 00:37:15 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 4RFtNJ2Btzz4q2mq; Wed, 2 Aug 2023 00:37:15 +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 4RFtNC4sk6z3pvF; Wed, 2 Aug 2023 00:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690936635; 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=92FHI1KgO9EWMHvygldrtZmMg5vl8nRWaLA9NdmRd5M=; b=jUorMAYC/UCRtASv3op5w4AtRVBbjcrPhUVOd27LEpUFUs+uFT4GB2HN2XZpoQO4XnkqA6 FxbTbdGDsB7OdRze1NTBn3j6xc5P8xDOzauAj2oxZPRf7921UmZeYZVjKQMM8YKowlB+we ljw9yrYC42hLPdSVNblAvfmUarhBd49LsLEbqQn4r9JQClofp2mpaY/88ZSsFEozypr4+1 qzx5/V7/gxA43A64/1sj57pdSCRcwuedxvj2fDD5bfO5U1ke8S+qOv5qKdSJ9kf4eXmeuo DT1utE5x505u5qZWnX6e6kPQj5WuWUw8mB0CoJF/624Dr9IUQAdkVG0b+0Pv1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690936635; a=rsa-sha256; cv=none; b=ooRfmp11xZUt7B4dNChqPivwT/CSq33xt4xrlWbqo541GKPUgIcnIeGZBBYqMZVmLOr64l LaXxIM5BR610kGojwigs/Em4tHHIc38a2Cp8GVTzS03VRuU7bgisklmBlrN/i1+gZKMaKO 46TRcGBX9cGRG/hqwXk4XZQ6QZ4UNojcB4UAJ5L0Mw/VmLv3868TYO4mSaHrT+mCgb2YMN Pcm35qkw5JioQKnfX09VH7XDvICe3FDz6dJg/rrmbqzvcTtmqF01kX1UhT9BTdl+6uQlu7 5L6hdE0erWlrYWnuxvnItGt1eoLHhIuX1l+NvduVt2bXzbyaKd83rgmz0TgAmg== 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=1690936635; 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=92FHI1KgO9EWMHvygldrtZmMg5vl8nRWaLA9NdmRd5M=; b=Vc6v4GdP5T7LJc6FbtDKYd/dTLH6H8XFrfAKexdjtE7Sl1dLILZ1MrFU1smbjhnQteQVJn v5FHLHkTWdnzdvUYlDXkialDUHtG/iBtpY0/RlybxsACcOhJQPTRr7I9ijgWY1OgnOIuI4 CwWA1a2L8SapVpPciuzFpXG588eCJQ21HMYNkVh3Kgj6C6xdrQdbqSFvpJcu0/xMWt+HRq PhIhnK5N4+7iQa5PagOKuqAmKsalMesFSRF/FQCiARggoFkPhrr4uHGcSWq9t0PhbNy7MU QD+ARo2Xe4ax8BTBJtEhyTNH682D0wv8ZrYMpp8xa3+30SKNihFHU/kZU21nVg== 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 4RFtNC1c21zybK; Wed, 2 Aug 2023 00:37:15 +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 3720bFvv060581; Wed, 2 Aug 2023 00:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3720bFaD060580; Wed, 2 Aug 2023 00:37:15 GMT (envelope-from git) Date: Wed, 2 Aug 2023 00:37:15 GMT Message-Id: <202308020037.3720bFaD060580@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: b619a7f161df - stable/13 - rtld: remove dup __crt_malloc prototypes 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: b619a7f161dfdaf9775fd52b6e3c9569f9155c54 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b619a7f161dfdaf9775fd52b6e3c9569f9155c54 commit b619a7f161dfdaf9775fd52b6e3c9569f9155c54 Author: Konstantin Belousov AuthorDate: 2023-07-22 04:37:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-02 00:36:39 +0000 rtld: remove dup __crt_malloc prototypes (cherry picked from commit cf6dbdd135072fc2b74e0a10c22474b0282ca122) --- libexec/rtld-elf/rtld.h | 5 ----- libexec/rtld-elf/rtld_malloc.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index ca43b289566f..adf5202b444b 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -425,9 +425,4 @@ void ifunc_init(Elf_Auxinfo[__min_size(AT_COUNT)]); void init_pltgot(Obj_Entry *); void allocate_initial_tls(Obj_Entry *); -void *__crt_calloc(size_t num, size_t size); -void __crt_free(void *cp); -void *__crt_malloc(size_t nbytes); -void *__crt_realloc(void *cp, size_t nbytes); - #endif /* } */ diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 0eec68f35402..6660610b11ce 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -56,6 +56,7 @@ static char *rcsid = "$FreeBSD$"; #include "rtld.h" #include "rtld_printf.h" #include "rtld_paths.h" +#include "rtld_malloc.h" /* * Pre-allocate mmap'ed pages