Use sigsetjmp/siglongjmp in opcodes

[deliverable/binutils-gdb.git] / gdb / extension.c

diff --git a/gdb/extension.c b/gdb/extension.c
index 4392dec225046247bb7d56ae64c99c3f50957ddf..1146cc7d03c552aa64445b78d0fcc4da091c8018 100644 (file)
--- a/gdb/extension.c
+++ b/gdb/extension.c
@@ -1,6 +1,6 @@
 /* Interface between gdb and its extension languages.
 
-   Copyright (C) 2013 Free Software Foundation, Inc.
+   Copyright (C) 2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -30,6 +30,7 @@
 #include "observer.h"
 #include "cli/cli-script.h"
 #include "python/python.h"
+#include "guile/guile.h"
 
 /* Iterate over all external extension languages, regardless of whether the
    support has been compiled in or not.
@@ -100,6 +101,7 @@ static const struct extension_language_defn * const extension_languages[] =
 {
   /* To preserve existing behaviour, python should always appear first.  */
   &extension_language_python,
+  &extension_language_guile,
   NULL
 };
 
@@ -340,7 +342,8 @@ eval_ext_lang_from_control_command (struct command_line *cmd)
     {
       if (extlang->cli_control_type == cmd->control_type)
        {
-         if (extlang->ops->eval_from_control_command != NULL)
+         if (extlang->ops != NULL
+             && extlang->ops->eval_from_control_command != NULL)
            {
              extlang->ops->eval_from_control_command (extlang, cmd);
              return;