automatically turn off handlers chaining if gdb-stub is compiled in at configure time

This commit is contained in:
Stanislav Shwartsman 2011-11-10 19:27:29 +00:00
parent cf314eb064
commit 23b7b23d63
2 changed files with 733 additions and 693 deletions

1318
bochs/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1088,6 +1088,58 @@ AC_ARG_ENABLE(debugger-gui,
]
)
bx_gdb_stub=0
AC_MSG_CHECKING(for gdb stub enable)
AC_ARG_ENABLE(gdb-stub,
[ --enable-gdb-stub enable gdb stub support],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_GDBSTUB, 1)
GDBSTUB_VAR='$(GDBSTUB_OBJS)'
bx_gdb_stub=1
if test "$bx_debugger" = 1; then
AC_MSG_ERROR([[--enable-debugger and --enable-gdb-stub are mutually exclusive]])
fi
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_GDBSTUB, 0)
GDBSTUB_VAR=''
fi],
[
AC_MSG_RESULT(no)
AC_DEFINE(BX_GDBSTUB, 0)
GDBSTUB_VAR=''
]
)
AC_SUBST(GDBSTUB_VAR)
AC_MSG_CHECKING(for I/O Interface to the debugger)
IODEBUG_OBJS=''
AC_ARG_ENABLE(iodebug,
[ --enable-iodebug enable I/O interface to debugger],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_SUPPORT_IODEBUG, 1)
IODEBUG_OBJS='iodebug.o'
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_SUPPORT_IODEBUG, 0)
fi
],
[
if test "$bx_debugger" = 1; then
# enable by default if debugger is on
AC_MSG_RESULT(yes)
AC_DEFINE(BX_SUPPORT_IODEBUG, 1)
IODEBUG_OBJS='iodebug.o'
else
AC_MSG_RESULT(no)
fi
]
)
AC_SUBST(IODEBUG_OBJS)
AC_MSG_CHECKING(for ALL optimizations enabled)
AC_ARG_ENABLE(all-optimizations,
@ -1135,6 +1187,11 @@ if test "$bx_debugger" = 1 -a "$speedup_handlers_chaining" = 1; then
echo "ERROR: handlers-chaining speedups are not supported with internal debugger or gdbstub yet"
fi
if test "$bx_gdb_stub" = 1 -a "$speedup_handlers_chaining" = 1; then
speedup_handlers_chaining=0
echo "ERROR: handlers-chaining speedups are not supported with internal debugger or gdbstub yet"
fi
if test "$speedup_handlers_chaining" = 1; then
AC_DEFINE(BX_SUPPORT_HANDLERS_CHAINING_SPEEDUPS, 1)
else
@ -1690,57 +1747,6 @@ AC_ARG_ENABLE(gameport,
AC_SUBST(GAME_OBJS)
AC_MSG_CHECKING(for gdb stub enable)
AC_ARG_ENABLE(gdb-stub,
[ --enable-gdb-stub enable gdb stub support],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_GDBSTUB, 1)
GDBSTUB_VAR='$(GDBSTUB_OBJS)'
if test "$bx_debugger" = 1; then
AC_MSG_ERROR([[--enable-debugger and --enable-gdb-stub are mutually exclusive]])
fi
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_GDBSTUB, 0)
GDBSTUB_VAR=''
fi],
[
AC_MSG_RESULT(no)
AC_DEFINE(BX_GDBSTUB, 0)
GDBSTUB_VAR=''
]
)
AC_SUBST(GDBSTUB_VAR)
AC_MSG_CHECKING(for I/O Interface to the debugger)
IODEBUG_OBJS=''
AC_ARG_ENABLE(iodebug,
[ --enable-iodebug enable I/O interface to debugger],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_SUPPORT_IODEBUG, 1)
IODEBUG_OBJS='iodebug.o'
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_SUPPORT_IODEBUG, 0)
fi
],
[
if test "$bx_debugger" = 1; then
# enable by default if debugger is on
AC_MSG_RESULT(yes)
AC_DEFINE(BX_SUPPORT_IODEBUG, 1)
IODEBUG_OBJS='iodebug.o'
else
AC_MSG_RESULT(no)
fi
]
)
AC_SUBST(IODEBUG_OBJS)
AC_PATH_PROG(DOCBOOK2HTML, docbook2html, not_found)
AC_MSG_CHECKING(whether to build docbook documentation)
build_docbook=0