diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2022-10-21 08:08:53 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2022-10-21 09:30:38 +0300 |
| commit | b6b58ab0a11e726be7acae22095742fdcc565de0 (patch) | |
| tree | 14f5daf43c92c0d8b10a34a27920bb7450333280 /malloc.c | |
| parent | 6c47e6d4c929d97aa59efc970c0b3a07d6ee7ad6 (diff) | |
| download | bdwgc-b6b58ab0a11e726be7acae22095742fdcc565de0.tar.gz | |
Define GC_GLIBC_PREREQ internal macro
(refactoring)
* dyn_load.c [(SCO_ELF || DGUX || HURD || NACL || __ELF__ && (LINUX
|| FREEBSD || NETBSD || OPENBSD)) && !USE_PROC_FOR_LIBRARIES &&
!HAVE_DL_ITERATE_PHDR] (HAVE_DL_ITERATE_PHDR): Replace
__GLIBC__>2||__GLIBC__==2&&__GLIBC_MINOR__>2 to GC_GLIBC_PREREQ(2,3).
* dyn_load.c [(SCO_ELF || DGUX || HURD || NACL || __ELF__ && (LINUX
|| FREEBSD || NETBSD || OPENBSD)) && !USE_PROC_FOR_LIBRARIES &&
__GLIBC__==2 && __GLIBC_MINOR__==2 && DT_CONFIG
&& !HAVE_DL_ITERATE_PHDR] (HAVE_DL_ITERATE_PHDR): Do not define.
* include/private/gcconfig.h [LINUX]: Move include features.h upper
(to be before GC_GLIBC_PREREQ); add TODO item; refine comment.
* include/private/gcconfig.h (GC_GLIBC_PREREQ): Define macro.
* include/private/gcconfig.h [(M68K || I386 || ARM32) && LINUX
&& __ELF__]: Replace defined(__GLIBC__)&&__GLIBC__>=2 to
GC_GLIBC_PREREQ(2,0).
* include/private/gcconfig.h [MIPS && LINUX]: Replace
__GLIBC__>2||__GLIBC__==2&&__GLIBC_MINOR__>=2 to GC_GLIBC_PREREQ(2,2).
* include/private/gcconfig.h [MPROTECT_VDB && __GLIBC__]: Replace
__GLIBC__<2||__GLIBC__==2&&__GLIBC_MINOR__<2 to !GC_GLIBC_PREREQ(2,2).
* malloc.c [REDIRECT_MALLOC && GC_LINUX_THREADS && __GLIBC__]
(GC_init_lib_bounds): Replace
__GLIBC__<2||__GLIBC__==2&&__GLIBC_MINOR__<34 to
!GC_GLIBC_PREREQ(2,34).
* os_dep.c [(I386 && SAVE_CALL_CHAIN || SPARC) && LINUX]: Do not
include features.h.
Diffstat (limited to 'malloc.c')
| -rw-r--r-- | malloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -476,8 +476,7 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_malloc_uncollectable(size_t lb) /* handling on the libgc side. Checking glibc version at */ /* compile time to turn off the warning seems to be fine. */ /* TODO: Remove GC_text_mapping() call for this case. */ -# if defined(__GLIBC__) \ - && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 34)) +# if defined(__GLIBC__) && !GC_GLIBC_PREREQ(2, 34) WARN("Failed to find libpthread.so text mapping: Expect crash\n", 0); /* This might still work with some versions of libpthread, */ /* so we do not abort. */ |