2011-07-04 Ivan Maidanski <ivmai@mail.ru>

	* include/private/gcconfig.h (etext): Don't define if unused
	(NetBSD).
	* include/private/gcconfig.h (GC_data_start, DATASTART): Define
	for NetBSD/amd64 if ELF.
	* include/private/gcconfig.h (SEARCH_FOR_DATA_START): Don't define
	for NetBSD/amd64 if ELF.

diff --git a/ChangeLog b/ChangeLog
index d0c9bab8a99bb3a6b70fb7f16ab3beafa477348f..112d7de6f952c387f77433f544a1b8ac6e082a6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-04  Ivan Maidanski <ivmai@mail.ru>
+
+       * include/private/gcconfig.h (etext): Don't define if unused
+       (NetBSD).
+       * include/private/gcconfig.h (GC_data_start, DATASTART): Define
+       for NetBSD/amd64 if ELF.
+       * include/private/gcconfig.h (SEARCH_FOR_DATA_START): Don't define
+       for NetBSD/amd64 if ELF.
+
 2011-07-04  Ivan Maidanski <ivmai@mail.ru> (mostly really Andy Wingo)
 
        * configure.ac (GC_THREADS): Refine the comment.

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index d1695d92523732a2397d4ca8c66963ac995fd6ba..a3600f11200a3115867828e44bb4983feb5e979e 100644 (file)
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -878,7 +878,6 @@
 #     define ALIGNMENT 4
 #     define OS_TYPE "NETBSD"
 #     define HEURISTIC2
-      extern char etext[];
       extern ptr_t GC_data_start;
 #     define DATASTART GC_data_start
 #     define DYNAMIC_LOADING
@@ -1529,7 +1528,6 @@
 #     define ALIGNMENT 4
 #     define HEURISTIC2
 #     ifdef __ELF__
-        extern int etext[];
         extern ptr_t GC_data_start;
 #       define DATASTART GC_data_start
 #       define NEED_FIND_LIMIT
@@ -2171,12 +2169,14 @@
 #   endif
 #   ifdef NETBSD
 #       define OS_TYPE "NETBSD"
+#       define HEURISTIC2
 #       ifdef __ELF__
+            extern ptr_t GC_data_start;
+#           define DATASTART GC_data_start
 #           define DYNAMIC_LOADING
+#       else
+#           define SEARCH_FOR_DATA_START
 #       endif
-#       define HEURISTIC2
-        extern char etext[];
-#       define SEARCH_FOR_DATA_START
 #   endif
 #   ifdef SOLARIS
 #       define OS_TYPE "SOLARIS"