Module Name:    src
Committed By:   joerg
Date:           Sat Jun  6 22:06:42 UTC 2020

Modified Files:
        src/share/mk: bsd.own.mk

Log Message:
sun2 and vax have no native TLS support, so avoid using modern jemalloc
as it has a couple of nasty race conditions when using TSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1198 -r1.1199 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1198 src/share/mk/bsd.own.mk:1.1199
--- src/share/mk/bsd.own.mk:1.1198	Tue Jun  2 14:26:01 2020
+++ src/share/mk/bsd.own.mk	Sat Jun  6 22:06:42 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1198 2020/06/02 14:26:01 jmcneill Exp $
+#	$NetBSD: bsd.own.mk,v 1.1199 2020/06/06 22:06:42 joerg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -181,7 +181,11 @@ EXTERNAL_BINUTILS_SUBDIR=	/does/not/exis
 # What version of jemalloc we use (100 is the one
 # built-in to libc from 2005 (pre version 3).
 #
+.if ${MACHINE_ARCH} == "vax" || ${MACHINE} == "sun2"
+HAVE_JEMALLOC?=		100
+.else
 HAVE_JEMALLOC?=		510
+.endif
 
 .if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)

Reply via email to