From: ivmai <ivmai>
Date: Sun, 24 Apr 2011 13:09:21 +0000 (+0000)
Subject: 2011-04-24  Ivan Maidanski  <ivmai@mail.ru>
X-Git-Tag: gc7_2alpha6~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b733bad5f8e5c496333ab85774a532ca5b73349;p=gc

2011-04-24  Ivan Maidanski  <ivmai@mail.ru>

	* pthread_support.c (GC_get_nprocs): Don't define for Android.
	* pthread_support.c (GC_dummy_thread_local): Don't test
	GC_LINUX_THREADS.
	* include/gc_config_macros.h (GC_ADD_CALLER, GC_RETURN_ADDR):
	Define for Android.
---

diff --git a/ChangeLog b/ChangeLog
index d2acb1c4..bfbf9de7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-24  Ivan Maidanski  <ivmai@mail.ru>
+
+	* pthread_support.c (GC_get_nprocs): Don't define for Android.
+	* pthread_support.c (GC_dummy_thread_local): Don't test
+	GC_LINUX_THREADS.
+	* include/gc_config_macros.h (GC_ADD_CALLER, GC_RETURN_ADDR):
+	Define for Android.
+
 2011-04-24  Ivan Maidanski  <ivmai@mail.ru>
 
 	* mach_dep.c (NO_GETCONTEXT): Move to gcconfig.h.
diff --git a/include/gc_config_macros.h b/include/gc_config_macros.h
index 030218e4..a27f8dd7 100644
--- a/include/gc_config_macros.h
+++ b/include/gc_config_macros.h
@@ -273,8 +273,8 @@
 /* This may also be desirable if it is possible but expensive to        */
 /* retrieve the call chain.                                             */
 #if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \
-     || defined(__FreeBSD__) || defined(__DragonFly__)) \
-    && !defined(GC_CAN_SAVE_CALL_STACKS)
+     || defined(__FreeBSD__) || defined(__DragonFly__) \
+     || defined(PLATFORM_ANDROID)) && !defined(GC_CAN_SAVE_CALL_STACKS)
 # define GC_ADD_CALLER
 # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
     /* gcc knows how to retrieve return address, but we don't know      */
diff --git a/pthread_support.c b/pthread_support.c
index d9c3792c..2feeac3e 100644
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -707,7 +707,7 @@ STATIC void GC_remove_all_threads_but_me(void)
   }
 #endif /* IA64 */
 
-#if defined(GC_LINUX_THREADS) && !defined(NACL)
+#if defined(GC_LINUX_THREADS) && !defined(PLATFORM_ANDROID) && !defined(NACL)
   /* Return the number of processors. */
   STATIC int GC_get_nprocs(void)
   {
@@ -883,7 +883,7 @@ STATIC void GC_fork_child_proc(void)
   }
 #endif  /* GC_DARWIN_THREADS || ... */
 
-#if defined(GC_LINUX_THREADS) && defined(INCLUDE_LINUX_THREAD_DESCR)
+#ifdef INCLUDE_LINUX_THREAD_DESCR
   __thread int GC_dummy_thread_local;
 #endif