darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* configure.ac (hostfile, targetfile): Remove.

Browse source 
(GDB_XM_FILE, GDB_TM_FILE): Do not define.
	(xm_h, tm_h): Likewise.
	(DEPRECATED_TM_FILE, XM_FILE): Do not substitute into Makefile.
	* configure, config.in: Regenerate.

	* Makefile.in (xm_h, tm_h): Remove.  Update dependencies.
	(TAGS): Do not consider DEPRECATED_TM_FILE or XM_FILE.
	(clean, local-maintainer-clean): Do not remove xm.h or tm.h.
	* defs.h: Do not include "xm.h" or "tm.h".

	* gdbarch.sh (verify_gdbarch): Do not dump GDB_XM_FILE or GDB_TM_FILE.
	* gdbarch.c: Regenerate.

	* config/score/embed.mt: Remove obsolete comment.
This commit is contained in:
Ulrich Weigand 2007-11-17 00:41:17 +00:00
parent 3da755263c
commit db985757a9
9 changed files with 27 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gdb/ChangeLog
View file

@ -1,3 +1,21 @@
2007-11-16 Ulrich Weigand <uweigand@de.ibm.com>
* configure.ac (hostfile, targetfile): Remove.
(GDB_XM_FILE, GDB_TM_FILE): Do not define.
(xm_h, tm_h): Likewise.
(DEPRECATED_TM_FILE, XM_FILE): Do not substitute into Makefile.
* configure, config.in: Regenerate.
* Makefile.in (xm_h, tm_h): Remove. Update dependencies.
(TAGS): Do not consider DEPRECATED_TM_FILE or XM_FILE.
(clean, local-maintainer-clean): Do not remove xm.h or tm.h.
* defs.h: Do not include "xm.h" or "tm.h".
* gdbarch.sh (verify_gdbarch): Do not dump GDB_XM_FILE or GDB_TM_FILE.
* gdbarch.c: Regenerate.
* config/score/embed.mt: Remove obsolete comment.
2007-11-16 Markus Deuling <deuling@de.ibm.com>
* gdbarch.sh (cannot_fetch_register, cannot_store_register): Add gdbarch

12
gdb/Makefile.in
View file

@ -653,8 +653,6 @@ process_reply_S_h = process_reply_S.h
# config/ headers
#
xm_h = @xm_h@
tm_h = @tm_h@
nm_h = @nm_h@
#
@ -694,7 +692,7 @@ cp_abi_h = cp-abi.h
cp_support_h = cp-support.h $(symtab_h)
dcache_h = dcache.h
defs_h = defs.h $(config_h) $(ansidecl_h) $(gdb_locale_h) $(gdb_signals_h) \
$(libiberty_h) $(bfd_h) $(ui_file_h) $(xm_h) $(nm_h) $(tm_h) \
$(libiberty_h) $(bfd_h) $(ui_file_h) $(nm_h) \
$(fopen_bin_h) $(gdbarch_h)
dictionary_h = dictionary.h
disasm_h = disasm.h
@ -1299,9 +1297,7 @@ gdb1$(EXEEXT): gdb$(EXEEXT)
TAGS: $(DEPFILES) $(TAGFILES_NO_SRCDIR) $(TAGFILES_WITH_SRCDIR)
@echo Making TAGS
@etags $(srcdir)/$(DEPRECATED_TM_FILE) \
$(srcdir)/$(XM_FILE) \
$(srcdir)/$(NAT_FILE) \
@etags $(srcdir)/$(NAT_FILE) \
`(for i in $(DEPFILES) $(TAGFILES_NO_SRCDIR); do \
echo $(srcdir)/$$i ; \
done ; for i in $(TAGFILES_WITH_SRCDIR); do \
@ -1335,7 +1331,7 @@ distclean: clean
rm -f gdbserver/config.status gdbserver/config.log
rm -f gdbserver/tm.h gdbserver/xm.h gdbserver/nm.h
rm -f gdbserver/Makefile gdbserver/config.cache
rm -f nm.h tm.h xm.h config.status config.h stamp-h .gdbinit
rm -f nm.h config.status config.h stamp-h .gdbinit
rm -f gdb_stdint.h
rm -f y.output yacc.acts yacc.tmp y.tab.h
rm -f config.log config.cache
@ -1355,7 +1351,7 @@ local-maintainer-clean:
f-exp.c m2-exp.c p-exp.c
rm -f TAGS $(INFOFILES)
rm -f $(YYFILES)
rm -f nm.h tm.h xm.h config.status
rm -f nm.h config.status
do-maintainer-clean:
@$(MAKE) $(FLAGS_TO_PASS) DO=maintainer-clean "DODIRS=$(SUBDIRS)" \

6
gdb/config.in
View file

@ -45,12 +45,6 @@
/* Define to the default OS ABI for this configuration. */
#undef GDB_OSABI_DEFAULT
/* targetfile */
#undef GDB_TM_FILE
/* hostfile */
#undef GDB_XM_FILE
/* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE_ALLOCA

1
gdb/config/score/embed.mt
View file

@ -1,3 +1,2 @@
# Target: S+core embedded system
TDEPFILES=score-tdep.o
#DEPRECATED_TM_FILE=tm-score.h

55
gdb/configure vendored
View file

@ -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 xm_h tm_h 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 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_files='host_makefile_frag target_makefile_frag'
# Initialize some variables set by options.
@ -23986,14 +23986,6 @@ frags="$frags $target_makefile_frag"
hostfile=`sed -n '
s/XM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
' ${host_makefile_frag}`
targetfile=`sed -n '
s/^[ ]*DEPRECATED_TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
' ${target_makefile_frag}`
if test "${gdb_native}" = "yes"; then
# We pick this up from the host configuration file (.mh) because we
# do not have a native configuration Makefile fragment.
@ -24047,49 +24039,12 @@ echo "${ECHO_T}no" >&6
fi
fi
# If hostfile (XM_FILE) and/or targetfile (DEPRECATED_TM_FILE) and/or
# nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link
# If nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link
# to an empty version.
files=
links=
rm -f xm.h
xm_h=""
if test "${hostfile}" != ""; then
xm_h=xm.h
case "${hostfile}" in
xm-*.h ) GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" ;;
* ) GDB_XM_FILE="${hostfile}"
esac
files="${files} ${GDB_XM_FILE}"
links="${links} xm.h"
cat >>confdefs.h <<_ACEOF
#define GDB_XM_FILE "${GDB_XM_FILE}"
_ACEOF
fi
rm -f tm.h
tm_h=""
if test "${targetfile}" != ""; then
tm_h=tm.h
case "${targetfile}" in
tm-*.h ) GDB_TM_FILE="config/${gdb_target_cpu}/${targetfile}" ;;
* ) GDB_TM_FILE="${targetfile}"
esac
files="${files} ${GDB_TM_FILE}"
links="${links} tm.h"
cat >>confdefs.h <<_ACEOF
#define GDB_TM_FILE "${GDB_TM_FILE}"
_ACEOF
fi
rm -f nm.h
nm_h=""
if test "${nativefile}" != ""; then
@ -25142,8 +25097,6 @@ s,@CONFIG_INSTALL@,$CONFIG_INSTALL,;t t
s,@CONFIG_UNINSTALL@,$CONFIG_UNINSTALL,;t t
s,@target_subdir@,$target_subdir,;t t
s,@frags@,$frags,;t t
s,@xm_h@,$xm_h,;t t
s,@tm_h@,$tm_h,;t t
s,@nm_h@,$nm_h,;t t
s,@LIBICONV@,$LIBICONV,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
@ -26195,9 +26148,7 @@ fi
;;
default )
sed -e '/^DEPRECATED_TM_FILE[ ]*=/s,^DEPRECATED_TM_FILE[ ]*=[ ]*,&config/'"${gdb_target_cpu}"'/,
/^XM_FILE[ ]*=/s,^XM_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,
/^NAT_FILE[ ]*=/s,^NAT_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
sed -e '/^NAT_FILE[ ]*=/s,^NAT_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
mv -f Makefile.tmp Makefile

43
gdb/configure.ac
View file

@ -1567,14 +1567,6 @@ AC_SUBST_FILE(target_makefile_frag)
AC_SUBST(frags)
changequote(,)dnl
hostfile=`sed -n '
s/XM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
' ${host_makefile_frag}`
targetfile=`sed -n '
s/^[ ]*DEPRECATED_TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
' ${target_makefile_frag}`
if test "${gdb_native}" = "yes"; then
# We pick this up from the host configuration file (.mh) because we
# do not have a native configuration Makefile fragment.
@ -1612,41 +1604,12 @@ if test "$gdb_native" = "yes"; then
fi
fi
# If hostfile (XM_FILE) and/or targetfile (DEPRECATED_TM_FILE) and/or
# nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link
# If nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link
# to an empty version.
files=
links=
rm -f xm.h
xm_h=""
if test "${hostfile}" != ""; then
xm_h=xm.h
case "${hostfile}" in
xm-*.h ) GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" ;;
* ) GDB_XM_FILE="${hostfile}"
esac
files="${files} ${GDB_XM_FILE}"
links="${links} xm.h"
AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}", [hostfile])
fi
AC_SUBST(xm_h)
rm -f tm.h
tm_h=""
if test "${targetfile}" != ""; then
tm_h=tm.h
case "${targetfile}" in
tm-*.h ) GDB_TM_FILE="config/${gdb_target_cpu}/${targetfile}" ;;
* ) GDB_TM_FILE="${targetfile}"
esac
files="${files} ${GDB_TM_FILE}"
links="${links} tm.h"
AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}", [targetfile])
fi
AC_SUBST(tm_h)
rm -f nm.h
nm_h=""
if test "${nativefile}" != ""; then
@ -1685,9 +1648,7 @@ dnl provided by makefile fragments.
dnl
changequote(,)dnl
sed -e '/^DEPRECATED_TM_FILE[ ]*=/s,^DEPRECATED_TM_FILE[ ]*=[ ]*,&config/'"${gdb_target_cpu}"'/,
/^XM_FILE[ ]*=/s,^XM_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,
/^NAT_FILE[ ]*=/s,^NAT_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
sed -e '/^NAT_FILE[ ]*=/s,^NAT_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
mv -f Makefile.tmp Makefile
changequote([,])dnl

16
gdb/defs.h
View file

@ -795,14 +795,6 @@ typedef struct ptid ptid_t;
/* Optional host machine definition. Pure autoconf targets will not
need a "xm.h" file. This will be a symlink to one of the xm-*.h
files, built by the `configure' script. */
#ifdef GDB_XM_FILE
#include "xm.h"
#endif
/* Optional native machine support. Non-native (and possibly pure
multi-arch) targets do not need a "nm.h" file. This will be a
symlink to one of the nm-*.h files, built by the `configure'
@ -812,14 +804,6 @@ typedef struct ptid ptid_t;
#include "nm.h"
#endif
/* Optional target machine definition. Pure multi-arch configurations
do not need a "tm.h" file. This will be a symlink to one of the
tm-*.h files, built by the `configure' script. */
#ifdef GDB_TM_FILE
#include "tm.h"
#endif
/* Assume that fopen accepts the letter "b" in the mode string.
It is demanded by ISO C9X, and should be supported on all
platforms that claim to have a standard-conforming C library. On

14
gdb/gdbarch.c
View file

@ -601,27 +601,13 @@ verify_gdbarch (struct gdbarch *gdbarch)
void
gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
{
const char *gdb_xm_file = "<not-defined>";
const char *gdb_nm_file = "<not-defined>";
const char *gdb_tm_file = "<not-defined>";
#if defined (GDB_XM_FILE)
gdb_xm_file = GDB_XM_FILE;
#endif
fprintf_unfiltered (file,
"gdbarch_dump: GDB_XM_FILE = %s\n",
gdb_xm_file);
#if defined (GDB_NM_FILE)
gdb_nm_file = GDB_NM_FILE;
#endif
fprintf_unfiltered (file,
"gdbarch_dump: GDB_NM_FILE = %s\n",
gdb_nm_file);
#if defined (GDB_TM_FILE)
gdb_tm_file = GDB_TM_FILE;
#endif
fprintf_unfiltered (file,
"gdbarch_dump: GDB_TM_FILE = %s\n",
gdb_tm_file);
fprintf_unfiltered (file,
"gdbarch_dump: addr_bit = %s\n",
paddr_d (gdbarch->addr_bit));

14
gdb/gdbarch.sh
View file

@ -1346,27 +1346,13 @@ cat <<EOF
void
gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
{
const char *gdb_xm_file = "<not-defined>";
const char *gdb_nm_file = "<not-defined>";
const char *gdb_tm_file = "<not-defined>";
#if defined (GDB_XM_FILE)
gdb_xm_file = GDB_XM_FILE;
#endif
fprintf_unfiltered (file,
"gdbarch_dump: GDB_XM_FILE = %s\\n",
gdb_xm_file);
#if defined (GDB_NM_FILE)
gdb_nm_file = GDB_NM_FILE;
#endif
fprintf_unfiltered (file,
"gdbarch_dump: GDB_NM_FILE = %s\\n",
gdb_nm_file);
#if defined (GDB_TM_FILE)
gdb_tm_file = GDB_TM_FILE;
#endif
fprintf_unfiltered (file,
"gdbarch_dump: GDB_TM_FILE = %s\\n",
gdb_tm_file);
EOF
function_list | sort -t: -k 3 | while do_read
do