summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorivmai <ivmai>2011-06-30 17:43:44 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:07:00 +0200
commitcea7d64af0f72989c690b0b0b8655a5f2d7ab2ad (patch)
tree0503f942088470083b0a292980ce05f8a35d860f /include
parent45a388771686fd791fc753fa877fc794b04d3c32 (diff)
2011-06-30 Ivan Maidanski <ivmai@mail.ru>
* dyn_load.c (GC_register_map_entries): Remove "count" local variable as unused. * gc_dlopen.c (disable_gc_for_dlopen): Define only if not USE_PROC_FOR_LIBRARIES. * malloc.c (calloc): Add parentheses around '&&' operator. * mark.c (GC_noop_sink): New global variable (instead of a static local variable inside GC_noop1). * mark.c (GC_noop1): Use GC_noop_sink variable (to prevent "variable set but not used" compiler warning). * include/private/gcconfig.h (USE_PROC_FOR_LIBRARIES): Define only if undefined yet. * tests/smash_test.c (main): Don't dereference "p" local variable if it is NULL. * tests/staticrootslib.c (main): Ditto.
Diffstat (limited to 'include')
-rw-r--r--include/private/gcconfig.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 81c77d6..d1695d9 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -2253,7 +2253,8 @@
# define USE_MMAP_ANON
#endif
-#if defined(GC_LINUX_THREADS) && defined(REDIRECT_MALLOC)
+#if defined(GC_LINUX_THREADS) && defined(REDIRECT_MALLOC) \
+ && !defined(USE_PROC_FOR_LIBRARIES)
/* Nptl allocates thread stacks with mmap, which is fine. But it */
/* keeps a cache of thread stacks. Thread stacks contain the */
/* thread control blocks. These in turn contain a pointer to */