summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--boehm-gc/ChangeLog4
-rw-r--r--boehm-gc/include/private/gcconfig.h11
2 files changed, 12 insertions, 3 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 5f5c2c0a2c4..347a310d82c 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-31 Richard Earnshaw <rearnsha@arm.com>
+
+ * include/private/gcconfig.h: Re-install change of 2003-04-16.
+
2003-10-20 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* mips_sgi_mach_dep.s: Use _ABIO32 instead of external
diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
index fceba8fa205..65e71479892 100644
--- a/boehm-gc/include/private/gcconfig.h
+++ b/boehm-gc/include/private/gcconfig.h
@@ -62,7 +62,7 @@
/* Determine the machine type: */
# if defined(__arm__) || defined(__thumb__)
# define ARM32
-# if !defined(LINUX)
+# if !defined(LINUX) && !defined(NETBSD)
# define NOSYS
# define mach_type_known
# endif
@@ -1688,8 +1688,13 @@
# ifdef NETBSD
# define OS_TYPE "NETBSD"
# define HEURISTIC2
- extern char etext[];
-# define DATASTART ((ptr_t)(etext))
+# ifdef __ELF__
+# define DATASTART GC_data_start
+# define DYNAMIC_LOADING
+# else
+ extern char etext[];
+# define DATASTART ((ptr_t)(etext))
+# endif
# define USE_GENERIC_PUSH_REGS
# endif
# ifdef LINUX