overhaul glibc compatibility workarounds

This commit is contained in:
Daniel Micay 2019-03-26 01:45:15 -04:00
parent df9650fe64
commit 7acebaa837

20
util.h
View File

@ -39,20 +39,30 @@ typedef uint64_t u64;
typedef unsigned __int128 u128; typedef unsigned __int128 u128;
// use __register_atfork directly to avoid linking with libpthread for glibc < 2.28 // use __register_atfork directly to avoid linking with libpthread for glibc < 2.28
#if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 28) #ifdef __GLIBC__
#if !__GLIBC_PREREQ(2, 28)
extern void *__dso_handle; extern void *__dso_handle;
extern int __register_atfork(void (*)(void), void (*)(void), void (*)(void), void *); extern int __register_atfork(void (*)(void), void (*)(void), void (*)(void), void *);
#define atfork(prepare, parent, child) __register_atfork(prepare, parent, child, __dso_handle) #define atfork(prepare, parent, child) __register_atfork(prepare, parent, child, __dso_handle)
#else #endif
#endif
#ifndef atfork
#define atfork pthread_atfork #define atfork pthread_atfork
#endif #endif
#ifdef CONFIG_SEAL_METADATA #ifdef CONFIG_SEAL_METADATA
#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 27)
#ifdef __GLIBC__
#if __GLIBC_PREREQ(2, 27)
#define USE_PKEY #define USE_PKEY
#else
#error "CONFIG_SEAL_METADATA requires Memory Protection Key support"
#endif #endif
#endif #endif
#ifndef USE_PKEY
#error "CONFIG_SEAL_METADATA requires Memory Protection Key support"
#endif
#endif // CONFIG_SEAL_METADATA
#endif #endif