Fix debugging programs statically linked against the thread library.

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

diff --git a/gdb/top.c b/gdb/top.c
index f80be47e13c3934950650114e68b0e1840bb2d24..5973f7c02bc8d02925e8c9f65962f8f0ae8292d2 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -657,7 +657,7 @@ void
 do_chdir_cleanup (void *old_dir)
 {
   chdir (old_dir);
-  free (old_dir);
+  xfree (old_dir);
 }
 #endif
 
@@ -1023,7 +1023,7 @@ gdb_readline (char *prompt_arg)
               if we are called again fgetc will still return EOF and
               we'll return NULL then.  */
            break;
-         free (result);
+         xfree (result);
          return NULL;
        }
 
@@ -1275,7 +1275,7 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix)
       while (*p1)
        *p++ = *p1++;
 
-      free (rl);               /* Allocated in readline.  */
+      xfree (rl);              /* Allocated in readline.  */
 
       if (p == linebuffer || *(p - 1) != '\\')
        break;
@@ -1323,7 +1323,7 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix)
          /* If there was an error, call this function again.  */
          if (expanded < 0)
            {
-             free (history_value);
+             xfree (history_value);
              return command_line_input (prompt_arg, repeat, annotation_suffix);
            }
          if (strlen (history_value) > linelength)
@@ -1333,7 +1333,7 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix)
            }
          strcpy (linebuffer, history_value);
          p = linebuffer + strlen (linebuffer);
-         free (history_value);
+         xfree (history_value);
        }
     }
 
@@ -1385,9 +1385,9 @@ print_gdb_version (struct ui_file *stream)
      program to parse, and is just canonical program name and version
      number, which starts after last space. */
 
-#ifdef UI_OUT
+#ifdef MI_OUT
   /* Print it console style until a format is defined */
-  fprintf_filtered (stream, "GNU gdb %s (UI_OUT)\n", version);
+  fprintf_filtered (stream, "GNU gdb %s (MI_OUT)\n", version);
 #else
   fprintf_filtered (stream, "GNU gdb %s\n", version);
 #endif
@@ -1574,7 +1574,7 @@ get_prompt_1 (void *data)
                         from bad user-supplied format string? */
                      sprintf (outp, fmt[0] == 0 ? default_fmt : fmt,
                               tmp);
-                     free (tmp);
+                     xfree (tmp);
                    }
                  else
                    {
@@ -1692,7 +1692,7 @@ set_prompt (char *s)
 /* ??rehrauer: I don't know why this fails, since it looks as though
    assignments to prompt are wrapped in calls to savestring...
    if (prompt != NULL)
-   free (prompt);
+   xfree (prompt);
  */
   if (event_loop_p)
     PROMPT (0) = savestring (s, strlen (s));