From nobody Wed Jul 26 14:30:12 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 4R9xBY1v2Nz4nyJs; Wed, 26 Jul 2023 14:30: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 4R9xBY1FY4z3MLn; Wed, 26 Jul 2023 14:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690381813; 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=Mk+KRV2Xg9mq/Yj4YZMAgKUR45dsYnOd5ipwV0GjRwc=; b=J3xofP+3/DAEue0w78k1BEyED2eaDMEkvOsX1jhsmYGQtXXOOoWmsqmQubindzRsvC5Qva pQsHNIAtbboTXpTMw3e2SN/Zk1FpzKFurdmLiJckWuhfW+U6asnIkmWaG2ejKeajszF75F yXFWkAAenJmWXzZnWV4AYlmhJ6sBkjU5YVldSg41XH9skQDxpwXXOeCBO13HwK8BGyvFe4 3eWYXYVw7rNhfvo/XtfYpJ4vmPym7GhQ7ZpIJm1/WdORLTanUkkWc7XTVRF2KNXKAxQe5K n5rfblToH9UN3C9NBZXawCJ/k5SVByd0bwO6W4C5GRS7vprPPGfjpwg+Prz9Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690381813; 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=Mk+KRV2Xg9mq/Yj4YZMAgKUR45dsYnOd5ipwV0GjRwc=; b=w/O+c8cNZ12rxCVgjaDH64fQUVnnt2gAKcXm1Hh3yDCxJjHo3mzRJPvR8aBQUsSEL2e3vP htnfJuKK1S4Ut/c+YSf9W0+VGCwuxGqXXZEJ4oCs4GNn+Rn1PhXheJ12X8fyRp0863jDx6 fz6jxfLWDZ1/cHIU8frlf2Mjv4AMWd4Qm45f3n4R9JbmJAlcQyqOOjRvnuMq/HNvAPGl2Q Bm/FmymhrGLZoWBOY1ylmcMQW/CLd9IdweEm01rhgw/Ozg7q4dKeT2B4LVE6tIaxUVcjtx egRxADfZFh52uHc3YQP1ot1FGMVJIk8st0pvklaAjSeiF2XtC/mL0P/7bnA2nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690381813; a=rsa-sha256; cv=none; b=gInlyqpbUmRlY8NxCD0LdXKI6IdYwVn2ZAt+e6JRl49T8Ei09jBgubBBylj4WHc74S6xGl owh12+Ve+urdDR4xyo6+4LXhq4zmQlfTIE35UjRP6Krw0PnRMrjMGF+fvWp23SNnKOBLR+ s1tFgYb2HIinFYA2UdWfiui3hsN7I6xQMYHT6S4g3o0rD+qrz22LsmV2chTbWXuPUYZ5i/ VZE0bVtGEtYZB4E6WZQhxw2w3V099vUEkHxHy0gM+4BTGJujjjDKVsNCw3ksIXVgmcdJnG RaoPOZt6AQXovKBQ7scLLz4KHCekSIpcCXTBdTz6LnNp6VxoAudaOGPDhyb3rg== 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 4R9xBY09xDzmBv; Wed, 26 Jul 2023 14:30: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 36QEUCQD027120; Wed, 26 Jul 2023 14:30:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QEUCep027114; Wed, 26 Jul 2023 14:30:12 GMT (envelope-from git) Date: Wed, 26 Jul 2023 14:30:12 GMT Message-Id: <202307261430.36QEUCep027114@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: cf6dbdd13507 - main - rtld: remove dup __crt_malloc prototypes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf6dbdd135072fc2b74e0a10c22474b0282ca122 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cf6dbdd135072fc2b74e0a10c22474b0282ca122 commit cf6dbdd135072fc2b74e0a10c22474b0282ca122 Author: Konstantin Belousov AuthorDate: 2023-07-22 04:37:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-26 14:24:17 +0000 rtld: remove dup __crt_malloc prototypes Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- 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 b8b0d67bd05d..1cebc0f95451 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -419,9 +419,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