]> granicus.if.org Git - gc/commitdiff
Remove Android-specific code inside Solaris-specific code in dyn_load
authorIvan Maidanski <ivmai@mail.ru>
Wed, 25 Jan 2012 15:18:39 +0000 (19:18 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Wed, 25 Jan 2012 15:18:39 +0000 (19:18 +0400)
* dyn_load.c (GC_register_dynamic_libraries): Remove PLATFORM_ANDROID
macro check from Solaris-specific code.

dyn_load.c

index 80dfbc82664fc02dd9dd474b69e0c77f52e8fc4f..31ec0537865e19f11ee763c7ef471f53d0942780 100644 (file)
@@ -174,6 +174,7 @@ GC_FirstDLOpenedLinkMap(void)
 # endif
 
 # if defined(SOLARISDL)
+
 /* Add dynamic library data sections to the root set.           */
 # if !defined(PCR) && !defined(GC_SOLARIS_THREADS) && defined(THREADS)
         --> fix mutual exclusion with dlopen
@@ -192,10 +193,6 @@ GC_INNER void GC_register_dynamic_libraries(void)
         int i;
 
         e = (ElfW(Ehdr) *) lm->l_addr;
-#       ifdef PLATFORM_ANDROID
-          if (e == NULL)
-            continue;
-#       endif
         p = ((ElfW(Phdr) *)(((char *)(e)) + e->e_phoff));
         offset = ((unsigned long)(lm->l_addr));
         for( i = 0; i < (int)e->e_phnum; i++, p++ ) {