D41457.id126003.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41457.id126003.diff
View Options

	diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
	--- a/lib/libc/stdlib/Makefile.inc
	+++ b/lib/libc/stdlib/Makefile.inc
	@@ -29,7 +29,7 @@

	SYM_MAPS+= ${LIBC_SRCTOP}/stdlib/Symbol.map

	-.include "${.PARSEDIR}/jemalloc/Makefile.inc"
	+.include "${.PARSEDIR}/malloc/Makefile.inc"

	# machine-dependent stdlib sources
	.sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib/Makefile.inc"
	diff --git a/lib/libc/stdlib/malloc/Makefile.inc b/lib/libc/stdlib/malloc/Makefile.inc
	new file mode 100644
	--- /dev/null
	+++ b/lib/libc/stdlib/malloc/Makefile.inc
	@@ -0,0 +1,4 @@
	+MALLOC_SYM_MAP:=${.PARSEDIR}/Symbol.map
	+SYM_MAPS+=${MALLOC_SYM_MAP}
	+
	+.include "${.PARSEDIR}/jemalloc/Makefile.inc"
	diff --git a/lib/libc/stdlib/jemalloc/Symbol.map b/lib/libc/stdlib/malloc/Symbol.map
	rename from lib/libc/stdlib/jemalloc/Symbol.map
	rename to lib/libc/stdlib/malloc/Symbol.map
	diff --git a/lib/libc/stdlib/jemalloc/Makefile.inc b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc
	rename from lib/libc/stdlib/jemalloc/Makefile.inc
	rename to lib/libc/stdlib/malloc/jemalloc/Makefile.inc
	--- a/lib/libc/stdlib/jemalloc/Makefile.inc
	+++ b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc
	@@ -8,8 +8,6 @@
	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

	-SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map
	-
	CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include

	.for src in ${JEMALLOCSRCS}