2009-12-08 Ivan Maidanski <ivmai@mail.ru> (with input from Marcos Dione)

	* doc/README.macros (IGNORE_DYNAMIC_LOADING, PLATFORM_ANDROID):
	Document.
	* dyn_load.c: Don't include <elf.h> if PLATFORM_ANDROID.
	* dyn_load.c: Include bionic <linker.h> (instead of <link.h>) if
	PLATFORM_ANDROID.
	* include/private/gcconfig.h (LINUX): Define also if
	PLATFORM_ANDROID (for the windows-based toolkit).
	* include/private/gcconfig.h (SEARCH_FOR_DATA_START): Explicitly
	define for Android/x86 platform.
	* include/private/gcconfig.h (IGNORE_DYNAMIC_LOADING): Recognize
	new macro (undefine DYNAMIC_LOADING in this case).
	* include/private/gcconfig.h (CANCEL_SAFE): Don't define if
	PLATFORM_ANDROID.
	* include/private/gcconfig.h (IF_CANCEL): Fix definition for the
	explicitly defined CANCEL_SAFE.

diff --git a/ChangeLog b/ChangeLog
index 4752da69ae09b34e1f9cbe30bd7294c474159ea2..6faecfea2642c432e07b94bca49fb42912fe1954 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-08  Ivan Maidanski <ivmai@mail.ru> (with input from Marcos Dione)
+
+       * doc/README.macros (IGNORE_DYNAMIC_LOADING, PLATFORM_ANDROID):
+       Document.
+       * dyn_load.c: Don't include <elf.h> if PLATFORM_ANDROID.
+       * dyn_load.c: Include bionic <linker.h> (instead of <link.h>) if
+       PLATFORM_ANDROID.
+       * include/private/gcconfig.h (LINUX): Define also if
+       PLATFORM_ANDROID (for the windows-based toolkit).
+       * include/private/gcconfig.h (SEARCH_FOR_DATA_START): Explicitly
+       define for Android/x86 platform.
+       * include/private/gcconfig.h (IGNORE_DYNAMIC_LOADING): Recognize
+       new macro (undefine DYNAMIC_LOADING in this case).
+       * include/private/gcconfig.h (CANCEL_SAFE): Don't define if
+       PLATFORM_ANDROID.
+       * include/private/gcconfig.h (IF_CANCEL): Fix definition for the
+       explicitly defined CANCEL_SAFE.
+
 2009-12-08  Ivan Maidanski <ivmai@mail.ru>
 
        * allchblk.c (GC_allochblk_nth): Don't call GC_remove_protection()

diff --git a/doc/README.macros b/doc/README.macros
index 1fda9fe37b02e6c95b015a8d72293df83fe57e99..825357c9c164fd557edb0706fd5c67e7bf56c9f5 100644 (file)
--- a/doc/README.macros
+++ b/doc/README.macros
@@ -447,6 +447,10 @@ USE_PROC_FOR_LIBRARIES  Causes the Linux collector to treat writable
   informing the collector.  But it typically performs poorly, especially
   since it will scan inactive but cached NPTL thread stacks completely.
 
+IGNORE_DYNAMIC_LOADING  Don't define DYNAMIC_LOADING even if supported by the
+  platform (that is, build the collector with disabled tracing of dynamic
+  library data roots).
+
 NO_PROC_STAT    Causes the collector to avoid relying on Linux
   "/proc/self/stat".
 
@@ -505,3 +509,5 @@ NO_CANCEL_SAFE (Posix platforms with threads only)      Don't bother trying
 
 UNICODE (Win32 only)    Use the Unicode variant ('W') of the Win32 API instead
   of ANSI/ASCII one ('A').  Useful for WinCE.
+
+PLATFORM_ANDROID        Compile for Android NDK platform.

diff --git a/dyn_load.c b/dyn_load.c
index 3d22d6436e03a9a73951b9f4c8d57dfb307f3e9e..d9799db1e6064cbac5a783f1d1d6113acdd95a27 100644 (file)
--- a/dyn_load.c
+++ b/dyn_load.c
@@ -85,11 +85,19 @@ STATIC GC_has_static_roots_func GC_has_static_roots = 0;
     || (defined(__ELF__) && (defined(LINUX) || defined(FREEBSD) \
                              || defined(NETBSD) || defined(OPENBSD)))
 # include <stddef.h>
-# if !defined(OPENBSD)
+# if !defined(OPENBSD) && !defined(PLATFORM_ANDROID)
     /* FIXME: Why we exclude it for OpenBSD? */
+    /* Exclude Android because linker.h below includes its own version. */
 #   include <elf.h>
 # endif
-# include <link.h>
+# ifdef PLATFORM_ANDROID
+    /* The header file is in bionics/linker. */
+    /* If you don't need the "dynamic loading" feature, you may build   */
+    /* the collector with -D IGNORE_DYNAMIC_LOADING.                    */
+#   include <linker.h>
+# else
+#   include <link.h>
+# endif
 #endif
 
 /* Newer versions of GNU/Linux define this macro.  We
@@ -571,10 +579,13 @@ GC_INNER GC_bool GC_register_main_static_data(void)
 #  ifndef PF_W
 #  define PF_W         2
 #  endif
-#else
+#elif !defined(PLATFORM_ANDROID)
 #  include <elf.h>
 #endif
-#include <link.h>
+
+#ifndef PLATFORM_ANDROID
+# include <link.h>
+#endif
 
 # endif
 

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index a1b5a15c8e0acc2c28d9862b10e8ad70ca3455ba..4bacda7bc9c3cc4afa43d43f36d60ad21630b8a8 100644 (file)
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -39,10 +39,9 @@
 /* Machine specific parts contributed by various people.  See README file. */
 
 /* First a unified test for Linux: */
-# if defined(linux) || defined(__linux__)
-#  ifndef LINUX
-#    define LINUX
-#  endif
+# if (defined(linux) || defined(__linux__) || defined(PLATFORM_ANDROID)) \
+     && !defined(LINUX)
+#   define LINUX
 # endif
 
 /* And one for NetBSD: */
@@ -1173,7 +1172,8 @@
 #              define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff))
 #            endif
 #            include <features.h>
-#            if defined(__GLIBC__) && __GLIBC__ >= 2
+#            if defined(__GLIBC__) && __GLIBC__ >= 2 \
+                || defined(PLATFORM_ANDROID)
 #                define SEARCH_FOR_DATA_START
 #            else
                  extern char **__environ;
@@ -2268,6 +2268,10 @@
 #   error --> undefined STACKBOTTOM
 # endif
 
+# ifdef IGNORE_DYNAMIC_LOADING
+#   undef DYNAMIC_LOADING
+# endif
+
 # if defined(SMALL_CONFIG) && !defined(GC_DISABLE_INCREMENTAL)
         /* Presumably not worth the space it takes. */
 #   define GC_DISABLE_INCREMENTAL
@@ -2390,7 +2394,8 @@
 #   define THREADS
 # endif
 
-# if defined(UNIX_LIKE) && defined(THREADS) && !defined(NO_CANCEL_SAFE)
+# if defined(UNIX_LIKE) && defined(THREADS) && !defined(NO_CANCEL_SAFE) \
+     && !defined(PLATFORM_ANDROID)
     /* Make the code cancellation-safe.  This basically means that we   */
     /* ensure that cancellation requests are ignored while we are in    */
     /* the collector.  This applies only to Posix deferred cancellation;*/
@@ -2404,6 +2409,9 @@
     /* Also note that little other code appears to be cancellation-safe.*/
     /* Hence it may make sense to turn this off for performance.        */
 #   define CANCEL_SAFE
+# endif
+
+# ifdef CANCEL_SAFE
 #   define IF_CANCEL(x) x
 # else
 #   define IF_CANCEL(x)