From a24e404ca885beff4e26406f6d9901c505fddba8 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 2 Apr 2019 23:11:41 +0300 Subject: [PATCH] Fix OS_TYPE and USE_MMAP_ANON definitions for Cygwin/x64 (fix of commit 6c535e8d6) * include/private/gcconfig.h [IA64 && CYGWIN32] (OS_TYPE, DATASTART, DATAEND, STACK_GRAN, NEED_FIND_LIMIT, USE_MMAP_ANON): Do not define. * include/private/gcconfig.h [X86_64 && CYGWIN32] (OS_TYPE): Define. * include/private/gcconfig.h [X86_64 && CYGWIN32 && USE_MMAP] (USE_MMAP_ANON): Define. --- include/private/gcconfig.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index 8f86315..3a61ed6 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -2183,17 +2183,6 @@ EXTERN_C_BEGIN # endif /* __INTEL_COMPILER */ # endif # endif -# ifdef CYGWIN32 -# define OS_TYPE "CYGWIN32" -# define DATASTART ((ptr_t)GC_DATASTART) /* From gc.h */ -# define DATAEND ((ptr_t)GC_DATAEND) -# undef STACK_GRAN -# define STACK_GRAN 0x10000 -# ifdef USE_MMAP -# define NEED_FIND_LIMIT -# define USE_MMAP_ANON -# endif -# endif # ifdef MSWIN32 /* FIXME: This is a very partial guess. There is no port, yet. */ # define OS_TYPE "MSWIN32" @@ -2782,6 +2771,12 @@ EXTERN_C_BEGIN # define HEAP_START DATAEND # endif # endif +# ifdef CYGWIN32 +# define OS_TYPE "CYGWIN32" +# ifdef USE_MMAP +# define USE_MMAP_ANON +# endif +# endif # ifdef MSWIN_XBOX1 # define NO_GETENV # define DATASTART (ptr_t)ALIGNMENT -- 2.7.4