From 331e39447af2c799db997a1eb2ea178253e8c809 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 16 Jan 2018 02:22:37 +0300 Subject: [PATCH] Prevent DATASTART redefinition for NaCl (fix commit 9738a14) * include/private/gcconfig.h [NACL] (NO_PTHREAD_GETATTR_NP): Define. * include/private/gcconfig.h [I386 && NACL] (OS_TYPE, etext, DATASTART, _end, DATAEND, STACK_GRAN, HEURISTIC1, NO_PTHREAD_GETATTR_NP, GETPAGESIZE, MAX_NACL_GC_THREADS): Remove. --- include/private/gcconfig.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index a045eca..ab2b6c0 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -1102,6 +1102,7 @@ # undef STACK_GRAN # define STACK_GRAN 0x10000 # define HEURISTIC1 +# define NO_PTHREAD_GETATTR_NP # define USE_MUNMAP # define USE_MMAP_ANON # define GETPAGESIZE() 65536 @@ -1353,24 +1354,6 @@ # define MAP_FAILED (void *) ((word)-1) # define HEAP_START (ptr_t)0x40000000 # endif /* DGUX */ - -# ifdef NACL -# define OS_TYPE "NACL" - extern int etext[]; -/* #define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) */ -# define DATASTART ((ptr_t)0x10000000) - extern int _end[]; -# define DATAEND ((ptr_t)_end) -# undef STACK_GRAN -# define STACK_GRAN 0x10000 -# define HEURISTIC1 -# define NO_PTHREAD_GETATTR_NP -# define GETPAGESIZE() 65536 -# ifndef MAX_NACL_GC_THREADS -# define MAX_NACL_GC_THREADS 1024 -# endif -# endif /* NACL */ - # ifdef LINUX # define OS_TYPE "LINUX" # define LINUX_STACKBOTTOM -- 2.7.4