Fri Mar 29 15:13:44 2019 UTC ()
Move all jemalloc symbols to the private namespace. We can't use visibility
because sun2 links statically.


(christos)
diff -r1.7 -r1.8 src/external/bsd/jemalloc/lib/Makefile.inc
cvs diff -r1.7 -r1.8 src/external/bsd/jemalloc/lib/Makefile.inc (expand / switch to unified diff)

--- src/external/bsd/jemalloc/lib/Makefile.inc 2019/03/27 15:30:19 1.7
+++ src/external/bsd/jemalloc/lib/Makefile.inc 2019/03/29 15:13:44 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.7 2019/03/27 15:30:19 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.8 2019/03/29 15:13:44 christos Exp $
2 2
3JEMALLOC:=${.PARSEDIR}/.. 3JEMALLOC:=${.PARSEDIR}/..
4 4
5JEMALLOC_SRCS+= \ 5JEMALLOC_SRCS+= \
6jemalloc.c \ 6jemalloc.c \
7arena.c \ 7arena.c \
8background_thread.c \ 8background_thread.c \
9base.c \ 9base.c \
10bin.c \ 10bin.c \
11bitmap.c \ 11bitmap.c \
12ckh.c \ 12ckh.c \
13ctl.c \ 13ctl.c \
14divide.c \ 14divide.c \
@@ -28,28 +28,27 @@ prng.c \ @@ -28,28 +28,27 @@ prng.c \
28prof.c \ 28prof.c \
29rtree.c \ 29rtree.c \
30stats.c \ 30stats.c \
31sz.c \ 31sz.c \
32tcache.c \ 32tcache.c \
33ticker.c \ 33ticker.c \
34tsd.c \ 34tsd.c \
35witness.c 35witness.c
36 36
37.PATH: ${JEMALLOC}/dist/src ${JEMALLOC}/lib 37.PATH: ${JEMALLOC}/dist/src ${JEMALLOC}/lib
38.SUFFIXES: .3 38.SUFFIXES: .3
39.PATH.3: ${JEMALLOC}/dist/doc 39.PATH.3: ${JEMALLOC}/dist/doc
40.for i in ${JEMALLOC_SRCS} 40.for i in ${JEMALLOC_SRCS}
41CPPFLAGS.${i}+=-I${JEMALLOC}/include -DJEMALLOC_NO_PRIVATE_NAMESPACE \ 41CPPFLAGS.${i}+=-I${JEMALLOC}/include -DJEMALLOC_PROTECT_NOSTD -DJEMALLOC_DEBUG
42 -DJEMALLOC_PROTECT_NOSTD -DJEMALLOC_DEBUG 
43COPTS.${i}+= -fvisibility=hidden -funroll-loops  42COPTS.${i}+= -fvisibility=hidden -funroll-loops
44.endfor 43.endfor
45 44
46COPTS.background_thread.c+=-Wno-error=stack-protector 45COPTS.background_thread.c+=-Wno-error=stack-protector
47COPTS.ctl.c+=-Wno-error=stack-protector 46COPTS.ctl.c+=-Wno-error=stack-protector
48COPTS.stats.c+=-Wno-error=stack-protector 47COPTS.stats.c+=-Wno-error=stack-protector
49COPTS.tcache.c+=-Wno-error=stack-protector 48COPTS.tcache.c+=-Wno-error=stack-protector
50 49
51.if ${MACHINE_ARCH} == "vax" 50.if ${MACHINE_ARCH} == "vax"
52# in merge_overlapping_regs, at regrename.c 51# in merge_overlapping_regs, at regrename.c
53COPTS.arena.c+=-O0 52COPTS.arena.c+=-O0
54COPTS.extent.c+=-O0 53COPTS.extent.c+=-O0
55.endif 54.endif