Date: Wed, 16 Aug 2023 18:20:11 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 4c757938e4f2 - main - libc: include malloc via stdlib/Makefile.inc Message-ID: <202308161820.37GIKBJq099643@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4c757938e4f28adfd57cc1e7271c2dd174d0ce9e commit 4c757938e4f28adfd57cc1e7271c2dd174d0ce9e Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2023-08-16 18:16:26 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308161820.37GIKBJq099643>