2011-05-10 Ivan Maidanski <ivmai@mail.ru>

	* thread_local_alloc.c (GC_malloc, GC_malloc_atomic): Join
	adjacent "#ifdef".
	* thread_local_alloc.c (GC_malloc_atomic): Call
	GC_core_malloc_atomic (instead of GC_core_malloc).

diff --git a/ChangeLog b/ChangeLog
index be0b4b451e1ce5cb043d1e6d827b225ba6f7c6d2..457a1d761c6101f7e781646fce6b9404c202a2b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-10  Ivan Maidanski  <ivmai@mail.ru>
+
+       * thread_local_alloc.c (GC_malloc, GC_malloc_atomic): Join
+       adjacent "#ifdef".
+       * thread_local_alloc.c (GC_malloc_atomic): Call
+       GC_core_malloc_atomic (instead of GC_core_malloc).
+
 2011-05-10  Ivan Maidanski  <ivmai@mail.ru>
 
        * pthread_start.c (GC_start_rtn_prepare_thread): Change return
@@ -1236,7 +1243,7 @@
        type).
        * os_dep.c (GC_dirty_init): Print a message about SIG_IGN detected
        (for SIGSEGV/BUS) only if GC_print_stats.
-       * os_dep.c (catch_exception_raise): Join 2 adjucent GC_err_printf
+       * os_dep.c (catch_exception_raise): Join 2 adjacent GC_err_printf
        calls.
 
 2010-11-25  Ivan Maidanski  <ivmai@mail.ru>

diff --git a/thread_local_alloc.c b/thread_local_alloc.c
index 2e27331dc8a1139c29cc7913685e9222eb5274df..1540f9ffe0c0616d5404174c5e59ee5f5999e6f8 100644 (file)
--- a/thread_local_alloc.c
+++ b/thread_local_alloc.c
@@ -147,8 +147,6 @@ GC_API void * GC_CALL GC_malloc(size_t bytes)
       tsd = GC_getspecific(k);
 #   else
       tsd = GC_getspecific(GC_thread_key);
-#   endif
-#   if defined(USE_PTHREAD_SPECIFIC) || defined(USE_WIN32_SPECIFIC)
       if (EXPECT(0 == tsd, FALSE)) {
         return GC_core_malloc(bytes);
       }
@@ -179,15 +177,13 @@ GC_API void * GC_CALL GC_malloc_atomic(size_t bytes)
       if (EXPECT(0 == k, FALSE)) {
         /* We haven't yet run GC_init_parallel.  That means     */
         /* we also aren't locking, so this is fairly cheap.     */
-        return GC_core_malloc(bytes);
+        return GC_core_malloc_atomic(bytes);
       }
       tsd = GC_getspecific(k);
 #   else
       tsd = GC_getspecific(GC_thread_key);
-#   endif
-#   if defined(USE_PTHREAD_SPECIFIC) || defined(USE_WIN32_SPECIFIC)
       if (EXPECT(0 == tsd, FALSE)) {
-        return GC_core_malloc(bytes);
+        return GC_core_malloc_atomic(bytes);
       }
 #   endif
     GC_ASSERT(GC_is_initialized);