From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 15 Jan 2018 23:22:37 +0000 (+0300)
Subject: Prevent DATASTART redefinition for NaCl
X-Git-Tag: v7.6.4~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53568c93d0959866c8c0c2ba3707f98653b5da91;p=gc

Prevent DATASTART redefinition for NaCl
(backport of commit 331e3944 from 'master')

* 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.
---

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index bec8a681..f77c9a86 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -1088,6 +1088,7 @@
 #   undef STACK_GRAN
 #   define STACK_GRAN 0x10000
 #   define HEURISTIC1
+#   define NO_PTHREAD_GETATTR_NP
 #   define USE_MMAP
 #   define USE_MUNMAP
 #   define USE_MMAP_ANON
@@ -1345,24 +1346,6 @@
 #         define HEAP_START DATAEND
 #       endif
 #   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