2000-12-20 Fernando Nasser <fnasser@redhat.com>

* Makefile.in (UIOUT_CFLAGS): New macro. CFLAGS needed for uiout code
        to be compiled.  Defines UI_OUT.
        (SUBDIR_MI_CFLAGS): Defines MI_OUT, not UI_OUT.
        (INTERNAL_WARN_CFLAGS): Also include UIOUT_CFLAGS.
        * configure.in (UIOUT_CFLAGS): New configuration variable.
        (--with-uiout): New configuration option.  Causes uiout code to
        be compiled, instead of the old *printf one.
        * configure: Regenerate.
        * top.c (print_gdb_version): Test for and print MI_OUT, not UI_OUT.
        * testsuite/lib/mi-support.exp (mi_gdb_start): Test for MI_OUT,
        not UI_OUT.
This commit is contained in:
Fernando Nasser 2000-12-20 21:24:28 +00:00
parent 5bff4f5642
commit b4df4f6849
7 changed files with 407 additions and 335 deletions

View File

@ -1,3 +1,15 @@
2000-12-20 Fernando Nasser <fnasser@redhat.com>
* Makefile.in (UIOUT_CFLAGS): New macro. CFLAGS needed for uiout code
to be compiled. Defines UI_OUT.
(SUBDIR_MI_CFLAGS): Defines MI_OUT, not UI_OUT.
(INTERNAL_WARN_CFLAGS): Also include UIOUT_CFLAGS.
* configure.in (UIOUT_CFLAGS): New configuration variable.
(--with-uiout): New configuration option. Causes uiout code to
be compiled, instead of the old *printf one.
* configure: Regenerate.
* top.c (print_gdb_version): Test for and print MI_OUT, not UI_OUT.
2000-12-20 Fernando Nasser <fnasser@redhat.com>
* complaints.c (complain): Call warning_hook if defined, instead of

View File

@ -106,6 +106,9 @@ LIBIBERTY = ../libiberty/libiberty.a
MMALLOC = @MMALLOC@
MMALLOC_CFLAGS = @MMALLOC_CFLAGS@
# Configured by the --with-uiout option to configure.
UIOUT_CFLAGS = @UIOUT_CFLAGS@
# We are using our own version of REGEX now to be consistent across
# machines.
REGEX = @REGEX@
@ -169,7 +172,7 @@ SUBDIR_MI_INITS = \
mi/mi-cmds.c mi/mi-parse.c mi/mi-main.c mi/mi-out.c
SUBDIR_MI_LDFLAGS=
SUBDIR_MI_CFLAGS= \
-DUI_OUT=1
-DMI_OUT=1
SUBDIR_MI_ALL=
SUBDIR_MI_CLEAN=
SUBDIR_MI_INSTALL=
@ -318,7 +321,7 @@ INTERNAL_WARN_CFLAGS = \
$(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
$(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) \
$(INTL_CFLAGS) $(ENABLE_CFLAGS) \
$(INTL_CFLAGS) $(ENABLE_CFLAGS) $(UIOUT_CFLAGS) \
$(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)

689
gdb/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -525,6 +525,29 @@ case ${enable_gdbmi} in
;;
esac
# Configure UI_OUT by default (before 5.2 it can be disabled)
# It must be configured if gdbmi is configured
UIOUT_CFLAGS=
AC_SUBST(UIOUT_CFLAGS)
AC_ARG_WITH(uiout,
[ --with-uiout Use new uiout functions intead of *printf's],
[case "${withval}" in
yes) want_uiout=true ;;
no) if test $enable_gdbmi = yes; then
AC_MSG_ERROR(uiout is needed for MI and cannot be disabled)
else
want_uiout=false
fi ;;
*) AC_MSG_ERROR(bad value ${withval} for GDB with-uiout option) ;;
esac],
[want_uiout=true])dnl
if test $want_uiout = true; then
UIOUT_CFLAGS="-DUI_OUT=1"
fi
AC_ARG_ENABLE(tui,
[ --enable-tui Enable full-screen terminal user interface],
[

View File

@ -1,3 +1,8 @@
2000-12-20 Fernando Nasser <fnasser@redhat.com>
* testsuite/lib/mi-support.exp (mi_gdb_start): Test for MI_OUT,
not UI_OUT.
2000-12-18 Michael Snyder <msnyder@mvstp600e.cygnus.com>
* gdb.base/setvar.exp: Use double '\\' to quote curly braces

View File

@ -117,7 +117,7 @@ proc mi_gdb_start { } {
return 1;
}
gdb_expect {
-re ".*UI_OUT.*$mi_gdb_prompt$" {
-re ".*MI_OUT.*$mi_gdb_prompt$" {
verbose "GDB initialized."
}
-re ".*$mi_gdb_prompt$" {

View File

@ -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