From 9b624dbeed0c879156474b1da5d9fb52bd179d8b Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sat, 17 Nov 2007 00:44:38 +0000 Subject: * config/arm/embed.mt (SIM_OBS, SIM): Remove. * config/avr/avr.mt (SIM_OBS, SIM): Remove. * config/frv/frv.mt (SIM_OBS, SIM): Remove. * config/h8300/h8300.mt (SIM_OBS, SIM): Remove. * config/iq2000/iq2000.mt (SIM_OBS, SIM): Remove. * config/m32c/m32c.mt (SIM_OBS, SIM): Remove. * config/m32r/linux.mt (SIM_OBS, SIM): Remove. * config/m32r/m32r.mt (SIM_OBS, SIM): Remove. * config/m68hc11/m68hc11.mt (SIM_OBS, SIM): Remove. * config/mips/embed.mt (SIM_OBS, SIM): Remove. * config/mips/linux.mt (SIM_OBS, SIM): Remove. * config/mips/nbsd.mt (SIM_OBS, SIM): Remove. * config/mn10300/mn10300.mt (SIM_OBS, SIM): Remove. * config/powerpc/linux.mt (SIM_OBS, SIM): Remove. * config/powerpc/nbsd.mt (SIM_OBS, SIM): Remove. * config/powerpc/ppc-sim.mt: Remove file. * config/sh/embed.mt (SIM_OBS, SIM): Remove. * config/sh/linux.mt (SIM_OBS, SIM): Remove. * config/sh/nbsd.mt (SIM_OBS, SIM): Remove. * config/sh/sh64.mt (SIM_OBS, SIM): Remove. * config/sparc/embed.mt (SIM_OBS, SIM): Remove. * config/v850/v850.mt (SIM_OBS, SIM): Remove. * config/xstormy16/xstormy16.mt (SIM_OBS, SIM): Remove. * configure.tgt (gdb_sim): Document variable. (arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*): Set it. (avr-*-*): Likewise. (frv-*-*): Likewise. (h8300-*-*): Likewise. (iq2000-*-*): Likewise. (m32c-*-*): Likewise. (m32r*-*-linux*): Likewise. (m32r*-*-*): Likewise. (m68hc11*-*-*|m6811*-*-*): Likewise. (mips*-*-*): Likewise. (mips*-*-linux*): Likewise. (mips*-*-netbsd* | mips*-*-knetbsd*-gnu): Likewise. (mn10300-*-*): Likewise. (powerpc-*-linux* | powerpc64-*-linux*): Likewise. (powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu): Likewise. (powerpc*-*-*): Use ppc-eabi target. Conditionally set gdb_sim. (sh*): Set gdb_sim. (sh-*-linux*): Likewise. (sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu): Likewise. (sh64-*-elf*): Likewise. (sparc-*-rtems*): Likewise. (v850*-*-elf): Likewise. (xstormy16-*-*): Likewise. * configure.ac (IGNORE_SIM, IGNORE_SIM_OBS): Do not set. (SIM, SIM_OBS): Set depending on ${ignore_sim} and ${gdb_sim}. * configure: Regenerate. * Makefile.in (SIM, SIM_OBS): Substitute from configure. (@IGNORE_SIM@, @IGNORE_SIM_OBS@): Remove. --- gdb/configure | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gdb/configure') diff --git a/gdb/configure b/gdb/configure index 4d89161..72cf6e3 100755 --- a/gdb/configure +++ b/gdb/configure @@ -313,7 +313,7 @@ ac_includes_default="\ ac_subdirs_all="$ac_subdirs_all gdbtk" ac_subdirs_all="$ac_subdirs_all multi-ice" ac_subdirs_all="$ac_subdirs_all gdbserver" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir PACKAGE subdirs AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_CC TCL_DEFS TCL_SHLIB_CFLAGS TCL_SHLIB_LD TCL_SHLIB_LD_LIBS TCL_SHLIB_SUFFIX TCL_DL_LIBS TCL_LD_FLAGS TCL_LD_SEARCH_FLAGS TCL_CC_SEARCH_FLAGS TCL_COMPAT_OBJS TCL_RANLIB TCL_BUILD_LIB_SPEC TCL_LIB_SPEC TCL_LIB_VERSIONS_OK TK_VERSION TK_DEFS TK_BUILD_INCLUDES TK_XINCLUDES TK_XLIBSW TK_BUILD_LIB_SPEC TK_LIB_SPEC TCLHDIR TKHDIR ITCLHDIR ITKHDIR ITCL_VERSION ITCL_DEFS ITCL_BUILD_INCLUDES ITCL_BUILD_LIB_SPEC ITCL_LIB_SPEC ITK_VERSION ITK_DEFS ITK_BUILD_INCLUDES ITK_BUILD_LIB_SPEC ITK_LIB_SPEC X_CFLAGS X_LDFLAGS X_LIBS TCL_DEPS TK_DEPS ITCLLIB ITCL_DEPS ITKLIB ITK_DEPS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR IGNORE_SIM IGNORE_SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBICONV LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir PACKAGE subdirs AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_CC TCL_DEFS TCL_SHLIB_CFLAGS TCL_SHLIB_LD TCL_SHLIB_LD_LIBS TCL_SHLIB_SUFFIX TCL_DL_LIBS TCL_LD_FLAGS TCL_LD_SEARCH_FLAGS TCL_CC_SEARCH_FLAGS TCL_COMPAT_OBJS TCL_RANLIB TCL_BUILD_LIB_SPEC TCL_LIB_SPEC TCL_LIB_VERSIONS_OK TK_VERSION TK_DEFS TK_BUILD_INCLUDES TK_XINCLUDES TK_XLIBSW TK_BUILD_LIB_SPEC TK_LIB_SPEC TCLHDIR TKHDIR ITCLHDIR ITKHDIR ITCL_VERSION ITCL_DEFS ITCL_BUILD_INCLUDES ITCL_BUILD_LIB_SPEC ITCL_LIB_SPEC ITK_VERSION ITK_DEFS ITK_BUILD_INCLUDES ITK_BUILD_LIB_SPEC ITK_LIB_SPEC X_CFLAGS X_LDFLAGS X_LIBS TCL_DEPS TK_DEPS ITCLLIB ITCL_DEPS ITKLIB ITK_DEPS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBICONV LIBOBJS LTLIBOBJS' ac_subst_files='host_makefile_frag target_makefile_frag' # Initialize some variables set by options. @@ -23887,7 +23887,7 @@ echo "$as_me: WARNING: no enhanced curses library found; disabling TUI" >&2;} fi # Unlike the sim directory, whether a simulator is linked is controlled by -# presence of a SIM= and a SIM_OBS= definition in the target '.mt' file. +# presence of a gdb_sim definition in the target configure.tgt entry. # This code just checks for a few cases where we'd like to ignore those # definitions, even when they're present in the '.mt' file. These cases # are when --disable-sim is specified, or if the simulator directory is @@ -23911,17 +23911,18 @@ if test ! -d "${srcdir}/../sim"; then ignore_sim=true fi -if test "${ignore_sim}" = "true"; then - IGNORE_SIM="SIM=" - IGNORE_SIM_OBS="SIM_OBS=" -else - IGNORE_SIM="" - IGNORE_SIM_OBS="" +SIM= +SIM_OBS= +if test "${ignore_sim}" = "false"; then + if test x"${gdb_sim}" != x ; then + SIM="${gdb_sim}" + SIM_OBS="remote-sim.o" cat >>confdefs.h <<\_ACEOF #define WITH_SIM 1 _ACEOF + fi fi @@ -25084,8 +25085,8 @@ s,@ITK_DEPS@,$ITK_DEPS,;t t s,@GDBTKLIBS@,$GDBTKLIBS,;t t s,@GDBTK_CFLAGS@,$GDBTK_CFLAGS,;t t s,@GDBTK_SRC_DIR@,$GDBTK_SRC_DIR,;t t -s,@IGNORE_SIM@,$IGNORE_SIM,;t t -s,@IGNORE_SIM_OBS@,$IGNORE_SIM_OBS,;t t +s,@SIM@,$SIM,;t t +s,@SIM_OBS@,$SIM_OBS,;t t s,@ENABLE_CFLAGS@,$ENABLE_CFLAGS,;t t s,@PROFILE_CFLAGS@,$PROFILE_CFLAGS,;t t s,@CONFIG_OBS@,$CONFIG_OBS,;t t -- cgit v1.1