diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2018-01-23 05:38:02 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2018-01-24 17:05:17 +0300 |
| commit | e9f26e6de5a1a4b4ded6d55f1a09838da5056c07 (patch) | |
| tree | 20abe59a860d669e01d3057c5cc9e38a01e2fb23 /dyn_load.c | |
| parent | 65fe9858bf528ce053c729758bfb489a44b5ec75 (diff) | |
| download | bdwgc-e9f26e6de5a1a4b4ded6d55f1a09838da5056c07.tar.gz | |
Use HOST_ANDROID define instead of PLATFORM_ANDROID
(a cherry-pick of commit 5d819c8 from 'mono_libgc')
* doc/README.macros (PLATFORM_ANDROID): Rename to HOST_ANDROID.
* dyn_load.c: Rename PLATFORM_ANDROID to HOST_ANDROID.
* include/gc.h: Likewise.
* include/gc_config_macros.h: Likewise.
* include/private/gcconfig.h: Likewise.
* include/private/thread_local_alloc.h: Likewise.
* os_dep.c: Likewise.
* pthread_support.c: Likewise.
* tests/initsecondarythread.c: Likewise.
* tests/test.c: Likewise.
* tools/threadlibs.c: Likewise.
Diffstat (limited to 'dyn_load.c')
| -rw-r--r-- | dyn_load.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -91,12 +91,12 @@ STATIC GC_has_static_roots_func GC_has_static_roots = 0; || defined(NACL) || defined(NETBSD) \ || defined(OPENBSD))) # include <stddef.h> -# if !defined(OPENBSD) && !defined(PLATFORM_ANDROID) +# if !defined(OPENBSD) && !defined(HOST_ANDROID) /* OpenBSD does not have elf.h file; link.h below is sufficient. */ /* Exclude Android because linker.h below includes its own version. */ # include <elf.h> # endif -# ifdef PLATFORM_ANDROID +# ifdef HOST_ANDROID /* If you don't need the "dynamic loading" feature, you may build */ /* the collector with -D IGNORE_DYNAMIC_LOADING. */ # ifdef BIONIC_ELFDATA_REDEF_BUG @@ -411,16 +411,16 @@ GC_INNER GC_bool GC_register_main_static_data(void) #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)) \ - || defined(PLATFORM_ANDROID) /* Are others OK here, too? */ + || defined(HOST_ANDROID) /* Are others OK here, too? */ # ifndef HAVE_DL_ITERATE_PHDR # define HAVE_DL_ITERATE_PHDR # endif -# ifdef PLATFORM_ANDROID +# ifdef HOST_ANDROID /* Android headers might have no such definition for some targets. */ int dl_iterate_phdr(int (*cb)(struct dl_phdr_info *, size_t, void *), void *data); # endif -#endif /* __GLIBC__ >= 2 || PLATFORM_ANDROID */ +#endif /* __GLIBC__ >= 2 || HOST_ANDROID */ #if (defined(FREEBSD) && __FreeBSD__ >= 7) || defined(__DragonFly__) /* On the FreeBSD system, any target system at major version 7 shall */ @@ -670,11 +670,11 @@ STATIC GC_bool GC_register_dynamic_libraries_dl_iterate_phdr(void) # ifndef PF_W # define PF_W 2 # endif -# elif !defined(PLATFORM_ANDROID) +# elif !defined(HOST_ANDROID) # include <elf.h> # endif -# ifndef PLATFORM_ANDROID +# ifndef HOST_ANDROID # include <link.h> # endif @@ -750,7 +750,7 @@ GC_INNER void GC_register_dynamic_libraries(void) int i; e = (ElfW(Ehdr) *) lm->l_addr; -# ifdef PLATFORM_ANDROID +# ifdef HOST_ANDROID if (e == NULL) continue; # endif |