[src/trunk]: src/lib/libc/stdlib Fix previous for libhack, where _REENTRANT i...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/797f8e79b8cb
branches:  trunk
changeset: 971342:797f8e79b8cb
user:      rin <rin%NetBSD.org@localhost>
date:      Wed Apr 22 08:45:06 2020 +0000

description:
Fix previous for libhack, where _REENTRANT is not defined;
arenas_map_key is used only when NO_TLS && _REENTRANT.

diffstat:

 lib/libc/stdlib/jemalloc.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r a4b43e4d15d9 -r 797f8e79b8cb lib/libc/stdlib/jemalloc.c
--- a/lib/libc/stdlib/jemalloc.c        Wed Apr 22 07:17:01 2020 +0000
+++ b/lib/libc/stdlib/jemalloc.c        Wed Apr 22 08:45:06 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jemalloc.c,v 1.49 2020/04/21 22:22:55 joerg Exp $      */
+/*     $NetBSD: jemalloc.c,v 1.50 2020/04/22 08:45:06 rin Exp $        */
 
 /*-
  * Copyright (C) 2006,2007 Jason Evans <jasone%FreeBSD.org@localhost>.
@@ -117,7 +117,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */ 
-__RCSID("$NetBSD: jemalloc.c,v 1.49 2020/04/21 22:22:55 joerg Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.50 2020/04/22 08:45:06 rin Exp $");
 
 #ifdef __FreeBSD__
 #include "libc_private.h"
@@ -775,14 +775,14 @@
 __thread arena_t       **arenas_map;
 #else
 static arena_t **arenas_map;
-static thread_key_t arenas_map_key = -1;
 #endif
 
 #if !defined(NO_TLS) || !defined(_REENTRANT)
 # define       get_arenas_map()        (arenas_map)
 # define       set_arenas_map(x)       (arenas_map = x)
-#else
-
+#else /* NO_TLS && _REENTRANT */
+
+static thread_key_t arenas_map_key = -1;
 
 static inline arena_t **
 get_arenas_map(void)
@@ -823,7 +823,7 @@
        thr_setspecific(arenas_map_key, a);
 #endif
 }
-#endif
+#endif /* NO_TLS && _REENTRANT */
 
 #ifdef MALLOC_STATS
 /* Chunk statistics. */