From 94efb705cdfbaef867673049bbe54cc5eea9c578 Mon Sep 17 00:00:00 2001
From: bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 25 Jan 2006 19:33:37 +0000
Subject: [PATCH] * include/private/gcconfig.h: Revert to GC 6.6
version, removing all local changes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110222 138bc75d-0d04-0410-961f-82ee72b054a4
---
boehm-gc/ChangeLog | 5 +++++
boehm-gc/include/private/gcconfig.h | 24 ++++++++++++------------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 082cbfc000dc..dbbc12cbc3f2 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-25 Bryce McKinlay <mckinlay@redhat.com>
+
+ * include/private/gcconfig.h: Revert to GC 6.6 version, removing
+ all local changes.
+
2006-01-24 Bryce McKinlay <mckinlay@redhat.com>
Import Boehm GC version 6.6.
diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
index 044fcf81c00c..c028e5dbf6cf 100644
--- a/boehm-gc/include/private/gcconfig.h
+++ b/boehm-gc/include/private/gcconfig.h
@@ -131,6 +131,9 @@
# endif
# endif
# endif /* !LINUX */
+# if defined(__NetBSD__) && defined(__MIPSEL__)
+# undef ULTRIX
+# endif
# define mach_type_known
# endif
# if defined(DGUX) && (defined(i386) || defined(__i386__))
@@ -294,17 +297,15 @@
# define MACOS
# define mach_type_known
# endif
-# if defined(macosx) \
- || defined(__APPLE__) && defined(__MACH__) && defined(__ppc__) \
- || defined(__APPLE__) && defined(__MACH__) && defined(__ppc64__)
-# define DARWIN
+# if defined(macosx) || (defined(__APPLE__) && defined(__MACH__))
+# define DARWIN
+# if defined(__ppc__) || defined(__ppc64__)
# define POWERPC
# define mach_type_known
-# else
-# if defined(__i386__)
-# define I386
+# elif defined(__i386__)
+# define I386
--> Not really supported, but at least we recognize it.
-# endif
+# endif
# endif
# if defined(NeXT) && defined(mc68000)
# define M68K
@@ -666,8 +667,7 @@
# define OS_TYPE "LINUX"
# define STACKBOTTOM ((ptr_t)0xf0000000)
# define USE_GENERIC_PUSH_REGS
-# define USE_MMAP
- /* We never got around to the assembly version. */
+ /* We never got around to the assembly version. */
/* # define MPROTECT_VDB - Reported to not work 9/17/01 */
# ifdef __ELF__
# define DYNAMIC_LOADING
@@ -1406,8 +1406,8 @@
# define DATAEND /* not needed */
# endif
# if defined(NETBSD)
-# define OS_TYPE "NETBSD"
# define ALIGNMENT 4
+# define OS_TYPE "NETBSD"
# define HEURISTIC2
# define USE_GENERIC_PUSH_REGS
# ifdef __ELF__
@@ -1587,7 +1587,7 @@
/* the text segment immediately follows the stack. */
/* Hence we give an upper pound. */
/* This is currently unused, since we disabled HEURISTIC2 */
- extern int __start[];
+ extern int __start[];
# define HEURISTIC2_LIMIT ((ptr_t)((word)(__start) & ~(getpagesize()-1)))
# ifndef GC_OSF1_THREADS
/* Unresolved signal issues with threads. */
--
GitLab