From nobody Wed Aug 16 18:20:11 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 4RQxJC5VRnz4qwdg; Wed, 16 Aug 2023 18:20:11 +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 4RQxJC4Z8vz4KhS; Wed, 16 Aug 2023 18:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210011; 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=I2ewuOiAJxK8lawCBDJqMMtl1WK6GlTZsxtsBDwuDxI=; b=ujqNJn6h0Ww7UDbkSXVInvZHN0uauXVyW1SHQCp58Ri3jc7RY14DeXNm6TqoMciVVKK1a5 JA2ha+Dv96IJrG8O+ZAi+gkxefksbgyFeS1sVA5bvUTEV9kOrl2z7S0rIlKITRUIET0onl cWiWM/p1Rxp79PmAFdZP8gB+AQ0gYjgqJir0U5jfoltyKqUQfvgEqGYRsraEJpIPtjDGhs nBpmpjxueZE4plh6gWurH88sSEYsCq+oyiqv+M7U1fZ7X/ORZ1TTUbJG/rXOJmynH8bmYR MD/gLy+6DpD9HTkNolJtite/mJ5iaeoeX4eVsWCvhuZBw9LhdrZst236rvllUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210011; 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=I2ewuOiAJxK8lawCBDJqMMtl1WK6GlTZsxtsBDwuDxI=; b=s4ZQXW66U0vRUVhfsPGhk+MZXRC6kNPQlO53U7oX+PkCC6kFKlG15Yf1lBXN7tKLGmr0Ea TxIu2cuhsgad9y7NL31tCZpJIx7lsa4ih/iRSU7CG6N+R2LV5gG+AGLN1Z8l0hs942LIN3 4tZZPAqm5NqEbqzbMBSH1Br7pJf7b1GcQhwj0/YV1pZqsZtLuzdw0iL7xtRQhbj2VRiG4V zjmMoxEvBLTVgIPeWT2zBNJyXNlgmqjTpJTjnpShCHy+gdb+PxmXO5Ep/EdFQUJxYFdqaE tqtqSzhjkixiWf1tfxdqEAhsDCmYLJdwBQRsHJeXz8zhX0CDfAekcoafHgJZEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692210011; a=rsa-sha256; cv=none; b=w5BIwStsx80ojLznhT7t40UVIRYKRzqS81JzoZJD86ONWAyTLHXfsk7h/qkw0zdYKFk7cO LHnLGCHsJan3hyLpbzTcf5/Z4+7VvNUPHZ/2860zxXmMvWmvC4vr+saPqrB2UVXQ4/yPWc 6wdXcWsZx8QMAfWxPSvNOeSJTNMjYNpRajHWhHhECXATfWviEi9HL1F3qNwniToShpE9CT DH+ta/e7TNo929etWZU3xTOYdJ8T09v6G2Pqe7twzoUNGQqlwBrj5txjH1fVEGGWYgiRNd eE0VBbiBI7GbL11Sh9MJc8OFomEUwAG0wJyIdj+70LSnP9a4DLohi7Ip74QQeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQxJC3fbtz11Wq; Wed, 16 Aug 2023 18:20:11 +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 37GIKBxe099655; Wed, 16 Aug 2023 18:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GIKBJq099643; Wed, 16 Aug 2023 18:20:11 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:20:11 GMT Message-Id: <202308161820.37GIKBJq099643@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: 4c757938e4f2 - main - libc: include malloc via stdlib/Makefile.inc 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c757938e4f28adfd57cc1e7271c2dd174d0ce9e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4c757938e4f28adfd57cc1e7271c2dd174d0ce9e commit 4c757938e4f28adfd57cc1e7271c2dd174d0ce9e Author: Brooks Davis AuthorDate: 2023-08-16 18:16:26 +0000 Commit: Brooks Davis CommitDate: 2023-08-16 18:16:26 +0000 libc: include malloc via stdlib/Makefile.inc There's a hierarchy here and we should use it. Improves: cbeacb7c46f3a3650e5dbefa9a1a18bc9943a8cc Reviewed by: jrtc27, jhb, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41456 --- lib/libc/Makefile | 1 - lib/libc/stdlib/Makefile.inc | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index d121d7be605a..a26215324332 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -113,7 +113,6 @@ NOASM= .include "${LIBC_SRCTOP}/resolv/Makefile.inc" .include "${LIBC_SRCTOP}/stdio/Makefile.inc" .include "${LIBC_SRCTOP}/stdlib/Makefile.inc" -.include "${LIBC_SRCTOP}/stdlib/jemalloc/Makefile.inc" .include "${LIBC_SRCTOP}/stdtime/Makefile.inc" .include "${LIBC_SRCTOP}/string/Makefile.inc" .include "${LIBC_SRCTOP}/sys/Makefile.inc" diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index e13ba020bad5..caa95bf53951 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -28,6 +28,8 @@ C99_Exit.c: ${LIBC_SRCTOP}/stdlib/_Exit.c .NOMETA SYM_MAPS+= ${LIBC_SRCTOP}/stdlib/Symbol.map +.include "${LIBC_SRCTOP}/stdlib/jemalloc/Makefile.inc" + # machine-dependent stdlib sources .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib/Makefile.inc"