diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2019-06-11 10:09:21 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2019-06-11 10:09:21 +0300 |
| commit | e1b507dfed564e56d961ece5389a4a9bbbb10811 (patch) | |
| tree | eda8d3f194e934db64293267a352e6e7bbbd7a19 /dyn_load.c | |
| parent | 7d02edebd5459d8631ef3d1af36684d002b5486f (diff) | |
| download | bdwgc-e1b507dfed564e56d961ece5389a4a9bbbb10811.tar.gz | |
Remove unnecessary checks of __ELF__ for NaCl
(code refactoring of commit 9738a14a0)
* dyn_load.c [NACL]: Assume __ELF__ is always defined.
Diffstat (limited to 'dyn_load.c')
| -rw-r--r-- | dyn_load.c | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -58,10 +58,10 @@ STATIC GC_has_static_roots_func GC_has_static_roots = 0; && !defined(CYGWIN32) && !defined(MSWIN32) && !defined(MSWINCE) \ && !(defined(ALPHA) && defined(OSF1)) \ && !(defined(FREEBSD) && defined(__ELF__)) \ - && !((defined(LINUX) || defined(NACL)) && defined(__ELF__)) \ + && !(defined(LINUX) && defined(__ELF__)) \ && !(defined(NETBSD) && defined(__ELF__)) \ - && !defined(HAIKU) && !defined(HURD) \ && !(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) \ + && !defined(HAIKU) && !defined(HURD) && !defined(NACL) \ && !defined(CPPCHECK) # error We only know how to find data segments of dynamic libraries for above. # error Additional SVR4 variants might not be too hard to add. @@ -88,10 +88,9 @@ STATIC GC_has_static_roots_func GC_has_static_roots = 0; # endif #endif /* OPENBSD */ -#if defined(SCO_ELF) || defined(DGUX) || defined(HURD) \ +#if defined(SCO_ELF) || defined(DGUX) || defined(HURD) || defined(NACL) \ || (defined(__ELF__) && (defined(LINUX) || defined(FREEBSD) \ - || defined(NACL) || defined(NETBSD) \ - || defined(OPENBSD))) + || defined(NETBSD) || defined(OPENBSD))) # include <stddef.h> # if !defined(OPENBSD) && !defined(HOST_ANDROID) /* OpenBSD does not have elf.h file; link.h below is sufficient. */ @@ -259,10 +258,9 @@ GC_INNER void GC_register_dynamic_libraries(void) # endif /* !USE_PROC ... */ # endif /* SOLARISDL */ -#if defined(SCO_ELF) || defined(DGUX) || defined(HURD) \ +#if defined(SCO_ELF) || defined(DGUX) || defined(HURD) || defined(NACL) \ || (defined(__ELF__) && (defined(LINUX) || defined(FREEBSD) \ - || defined(NACL) || defined(NETBSD) \ - || defined(OPENBSD))) + || defined(NETBSD) || defined(OPENBSD))) #ifdef USE_PROC_FOR_LIBRARIES |