diff options
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/Makefile.am | 3 | ||||
-rw-r--r-- | libguile/bdw-gc.h | 65 | ||||
-rw-r--r-- | libguile/fluids.c | 1 | ||||
-rw-r--r-- | libguile/hashtab.c | 1 | ||||
-rw-r--r-- | libguile/numbers.c | 3 | ||||
-rw-r--r-- | libguile/smob.c | 1 | ||||
-rw-r--r-- | libguile/srfi-4.c | 3 | ||||
-rw-r--r-- | libguile/struct.c | 1 | ||||
-rw-r--r-- | libguile/vectors.c | 1 | ||||
-rw-r--r-- | libguile/vm.c | 3 |
10 files changed, 3 insertions, 79 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 403444f64..21ea143a5 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -546,7 +546,7 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD = \ version_info = @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS = \ - $(BDW_GC_LIBS) $(LIBFFI_LIBS) \ + $(LIBFFI_LIBS) \ $(CEIL_LIBM) \ $(FLOOR_LIBM) \ $(FREXP_LIBM) \ @@ -594,7 +594,6 @@ modinclude_HEADERS = \ async.h \ atomic.h \ backtrace.h \ - bdw-gc.h \ boolean.h \ bitvectors.h \ bytevectors.h \ diff --git a/libguile/bdw-gc.h b/libguile/bdw-gc.h deleted file mode 100644 index 3107ebcef..000000000 --- a/libguile/bdw-gc.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef SCM_BDW_GC_H -#define SCM_BDW_GC_H - -/* Copyright 2006,2008-2009,2011-2014,2018 - Free Software Foundation, Inc. - - This file is part of Guile. - - Guile is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Guile is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with Guile. If not, see - <https://www.gnu.org/licenses/>. */ - -/* Correct header inclusion. */ - -#include "libguile/scmconfig.h" - -#if SCM_USE_PTHREAD_THREADS - -/* When pthreads are used, let `libgc' know about it and redirect allocation - calls such as `GC_MALLOC ()' to (contention-free, faster) thread-local - allocation. */ - -# define GC_THREADS 1 -# define GC_REDIRECT_TO_LOCAL 1 - -/* Don't #define pthread routines to their GC_pthread counterparts. - Instead we will be careful inside Guile to use the GC_pthread - routines. */ -# define GC_NO_THREAD_REDIRECTS 1 - -#ifdef __MINGW32__ -/* Rely on pthreads-w32. */ -#define GC_WIN32_PTHREADS -#endif - -#endif - -#include <gc/gc.h> - -/* Return true if PTR points to the heap. */ -#define SCM_I_IS_POINTER_TO_THE_HEAP(ptr) \ - (GC_base (ptr) != NULL) - -/* Register a disappearing link for the object pointed to by OBJ such that - the pointer pointed to be LINK is cleared when OBJ is reclaimed. Do so - only if OBJ actually points to the heap. See - http://thread.gmane.org/gmane.comp.programming.garbage-collection.boehmgc/2563 - for details. */ -#define SCM_I_REGISTER_DISAPPEARING_LINK(link, obj) \ - ((SCM_I_IS_POINTER_TO_THE_HEAP (obj)) \ - ? GC_GENERAL_REGISTER_DISAPPEARING_LINK ((link), (obj)) \ - : 0) - - -#endif /* SCM_BDW_GC_H */ diff --git a/libguile/fluids.c b/libguile/fluids.c index 6de7b83f7..b95930782 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -26,7 +26,6 @@ #include "alist.h" #include "atomics-internal.h" -#include "bdw-gc.h" #include "cache-internal.h" #include "deprecation.h" #include "dynwind.h" diff --git a/libguile/hashtab.c b/libguile/hashtab.c index 09738436c..c96961c2e 100644 --- a/libguile/hashtab.c +++ b/libguile/hashtab.c @@ -28,7 +28,6 @@ #include <stdio.h> #include "alist.h" -#include "bdw-gc.h" #include "boolean.h" #include "deprecation.h" #include "eq.h" diff --git a/libguile/numbers.c b/libguile/numbers.c index ae2aa7766..80ace24f6 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -1,4 +1,4 @@ -/* Copyright 1995-2016,2018-2022 +/* Copyright 1995-2016,2018-2022,2025 Free Software Foundation, Inc. Portions Copyright 1990-1993 by AT&T Bell Laboratories and Bellcore. @@ -57,7 +57,6 @@ #include <complex.h> #endif -#include "bdw-gc.h" #include "boolean.h" #include "deprecation.h" #include "dynwind.h" diff --git a/libguile/smob.c b/libguile/smob.c index ed15186a4..8b8091c04 100644 --- a/libguile/smob.c +++ b/libguile/smob.c @@ -30,7 +30,6 @@ #include "async.h" #include "atomics-internal.h" -#include "bdw-gc.h" #include "finalizers.h" #include "goops.h" #include "gsubr.h" diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c index 23896c32c..48f90f0b6 100644 --- a/libguile/srfi-4.c +++ b/libguile/srfi-4.c @@ -1,6 +1,6 @@ /* srfi-4.c --- Uniform numeric vector datatypes. - Copyright 2001,2004,2006,2009-2011,2014,2018 + Copyright 2001,2004,2006,2009-2011,2014,2018,2025 Free Software Foundation, Inc. This file is part of Guile. @@ -25,7 +25,6 @@ #include <string.h> -#include "bdw-gc.h" #include "boolean.h" #include "bytevectors.h" #include "error.h" diff --git a/libguile/struct.c b/libguile/struct.c index f41859cda..82329ec76 100644 --- a/libguile/struct.c +++ b/libguile/struct.c @@ -31,7 +31,6 @@ #include "alist.h" #include "async.h" -#include "bdw-gc.h" #include "boolean.h" #include "chars.h" #include "deprecation.h" diff --git a/libguile/vectors.c b/libguile/vectors.c index d81dc61a7..a2a620b79 100644 --- a/libguile/vectors.c +++ b/libguile/vectors.c @@ -27,7 +27,6 @@ #include <string.h> #include "array-handle.h" -#include "bdw-gc.h" #include "boolean.h" #include "deprecation.h" #include "eq.h" diff --git a/libguile/vm.c b/libguile/vm.c index acdc0ad8f..cb46c54cc 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -39,7 +39,6 @@ #include "async.h" #include "atomic.h" #include "atomics-internal.h" -#include "bdw-gc.h" #include "cache-internal.h" #include "continuations.h" #include "control.h" @@ -79,8 +78,6 @@ #include "vm.h" -#include <gc/gc_mark.h> - #if (defined __GNUC__) # define SCM_NOINLINE __attribute__ ((__noinline__)) #else |