git: 7fdf597e96a0 - main - jemalloc: Move generated files into lib/libc tree
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 13 Dec 2024 23:04:27 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7fdf597e96a02165cfe22ff357b857d5fa15ed8a commit 7fdf597e96a02165cfe22ff357b857d5fa15ed8a Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-12-13 19:15:58 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-12-13 23:04:39 +0000 jemalloc: Move generated files into lib/libc tree Make it easire to update jemalloc by moving the FreeBSD specific files and the generated files into lib/libc. This allows us to regenerate them more easily, and emphasizes a bit that we may have to regenerate stuff from upstream. This is necessary to also unthin the import from the vendor branch as well (which will be needed to simplify the imports in the future since we are trying to use contrib/jemalloc for two different things). No functional change. Sponsored by: Netflix --- lib/libc/stdlib/malloc/jemalloc/Makefile.inc | 2 +- .../malloc}/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h | 0 .../jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/jemalloc_preamble.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/private_namespace.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/public_namespace.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc_FreeBSD.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc_typedefs.h | 0 9 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc index 31c7a283f518..c10d79dbce6c 100644 --- a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc +++ b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc @@ -6,7 +6,7 @@ JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bin.c bitmap.c \ prng.c prof.c rtree.c safety_check.c sc.c stats.c sz.c tcache.c \ test_hooks.c ticker.c tsd.c witness.c -CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include +CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include -I${LIBC_SRCTOP}/stdlib/malloc/jemalloc/include .if ${MK_JEMALLOC_LG_VADDR_WIDE} != no CFLAGS+=-D_USE_LG_VADDR_WIDE .endif diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_preamble.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_preamble.h diff --git a/contrib/jemalloc/include/jemalloc/internal/private_namespace.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/private_namespace.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/private_namespace.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/private_namespace.h diff --git a/contrib/jemalloc/include/jemalloc/internal/public_namespace.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/public_namespace.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/public_namespace.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/public_namespace.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_FreeBSD.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_FreeBSD.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_typedefs.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_typedefs.h