3 files changed, 0 insertions, 18 deletions
diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h
index 60a8bf3..aeef77a 100644
--- a/gdb/guile/guile-internal.h
+++ b/gdb/guile/guile-internal.h
@@ -156,18 +156,6 @@ struct scheme_integer_constant
 #define gdbscm_is_false(scm) scm_is_eq ((scm), SCM_BOOL_F)
 #define gdbscm_is_true(scm) (!gdbscm_is_false (scm))
 
-#ifndef HAVE_SCM_NEW_SMOB
-
-/* Guile <= 2.0.5 did not provide this function, so provide it here.  */
-
-static inline SCM
-scm_new_smob (scm_t_bits tc, scm_t_bits data)
-{
-  SCM_RETURN_NEWSMOB (tc, data);
-}
-
-#endif
-
 /* Function name that is passed around in case an error needs to be reported.
    __func is in C99, but we provide a wrapper "just in case",
    and because FUNC_NAME is the canonical value used in guile sources.
diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c
index 66a74b3..bbeea9c 100644
--- a/gdb/guile/guile.c
+++ b/gdb/guile/guile.c
@@ -633,9 +633,7 @@ call_initialize_gdb_module (void *data)
      performed within the desired module.  */
   scm_c_define_module (gdbscm_module_name, initialize_gdb_module, NULL);
 
-#if HAVE_GUILE_MANUAL_FINALIZATION
   scm_run_finalizers ();
-#endif
 
   return NULL;
 }
@@ -651,12 +649,10 @@ gdbscm_initialize (const struct extension_language_defn *extlang)
      Python side to define module "gdb" which imports "_gdb".  There is
      evidently no similar convention in Guile so we skip this.  */
 
-#if HAVE_GUILE_MANUAL_FINALIZATION
   /* Our SMOB free functions are not thread-safe, as GDB itself is not
      intended to be thread-safe.  Disable automatic finalization so that
      finalizers aren't run in other threads.  */
   scm_set_automatic_finalization_enabled (0);
-#endif
 
   /* Before we initialize Guile, block signals needed by gdb (especially
      SIGCHLD).  This is done so that all threads created during Guile
diff --git a/gdb/guile/scm-safe-call.c b/gdb/guile/scm-safe-call.c
index 95dcf3a..3023eb4 100644
--- a/gdb/guile/scm-safe-call.c
+++ b/gdb/guile/scm-safe-call.c
@@ -155,9 +155,7 @@ gdbscm_with_catch (void *data)
 		   d->unwind_handler, d,
 		   d->pre_unwind_handler, d);
 
-#if HAVE_GUILE_MANUAL_FINALIZATION
   scm_run_finalizers ();
-#endif
 
   return NULL;
 }