diff options
author | Ivan Maidanski <ivmai@mail.ru> | 2023-02-01 21:08:38 +0300 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2023-02-01 21:08:38 +0300 |
commit | 1ee5c7dea2c4a99eae4f97de4bdb4bc79c9fc92d (patch) | |
tree | 9e4933897842cefd05bfa2d794071778f7750cd2 /include/private | |
parent | 31fa843270a83e5e93c8dee16a3654eb93a98833 (diff) | |
download | bdwgc-1ee5c7dea2c4a99eae4f97de4bdb4bc79c9fc92d.tar.gz |
Move QNX macro definitions outside I386 block in gcconfig.h
(refactoring)
* include/private/gcconfig.h [__QNX__ && !QNX] (QNX): Define macro.
* include/private/gcconfig.h [__i386__ || i386] (I386): Check QNX
instead of __QNX__.
* include/private/gcconfig.h [I386 && QNX] (OS_TYPE, SA_RESTART,
HEURISTIC1, DATASTART, DATAEND): Move definition upper outside I386
block.
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/gcconfig.h | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index b9a55b85..0bbccfe6 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -127,6 +127,10 @@ EXTERN_C_BEGIN # define FREEBSD # endif +# if defined(__QNX__) && !defined(QNX) +# define QNX +# endif + /* And one for Darwin: */ # if defined(macosx) || (defined(__APPLE__) && defined(__MACH__)) # define DARWIN @@ -521,7 +525,7 @@ EXTERN_C_BEGIN # define mach_type_known # elif (defined(__i386__) || defined(i386)) \ && (defined(DARWIN) || defined(LINUX) || defined(FREEBSD) \ - || defined(NETBSD) || defined(OPENBSD) || defined(__QNX__)) + || defined(NETBSD) || defined(OPENBSD) || defined(QNX)) # define I386 # define mach_type_known # elif (defined(__ia64) || defined(__ia64__)) && defined(LINUX) @@ -958,6 +962,16 @@ EXTERN_C_BEGIN # endif # endif /* OPENBSD */ +# ifdef QNX +# define OS_TYPE "QNX" +# define SA_RESTART 0 +# define HEURISTIC1 + extern char etext[]; +# define DATASTART ((ptr_t)etext) + extern int _end[]; +# define DATAEND ((ptr_t)_end) +# endif /* QNX */ + # ifdef SOLARIS # define OS_TYPE "SOLARIS" extern int _etext[], _end[]; @@ -1330,19 +1344,13 @@ EXTERN_C_BEGIN # error No threads support yet # endif # endif -# if defined(__QNX__) -# define OS_TYPE "QNX" -# define SA_RESTART 0 -# define HEURISTIC1 - extern char etext[]; - extern int _end[]; -# define DATASTART ((ptr_t)etext) -# define DATAEND ((ptr_t)_end) -# endif # ifdef HAIKU extern int etext[]; # define DATASTART ((ptr_t)((((word)(etext)) + 0xfff) & ~0xfff)) # endif +# ifdef QNX + /* Nothing specific. */ +# endif # ifdef SOLARIS # define DATASTART GC_SysVGetDataStart(0x1000, (ptr_t)_etext) /* At least in Solaris 2.5, PROC_VDB gives wrong values for */ |