This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[rfc] [1/9] Multi-target support: Remove DEPRECATED_TM_FILE
- From: "Ulrich Weigand" <uweigand at de dot ibm dot com>
- To: gdb-patches at sourceware dot org
- Date: Fri, 26 Oct 2007 03:15:28 +0200 (CEST)
- Subject: [rfc] [1/9] Multi-target support: Remove DEPRECATED_TM_FILE
Hello,
this patch removes support for DEPRECATED_TM_FILE and XM_FILE (which are
no longer is use now) from the Makefile and configure infrastructure.
NAT_FILE remains supported for the time being.
Bye,
Ulrich
ChangeLog:
* 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.
diff -urNp gdb-orig/gdb/config/score/embed.mt gdb-head/gdb/config/score/embed.mt
--- gdb-orig/gdb/config/score/embed.mt 2007-10-24 16:28:18.797798000 +0200
+++ gdb-head/gdb/config/score/embed.mt 2007-10-24 23:34:42.973727296 +0200
@@ -1,3 +1,2 @@
# Target: S+core embedded system
TDEPFILES=score-tdep.o
-#DEPRECATED_TM_FILE=tm-score.h
diff -urNp gdb-orig/gdb/config.in gdb-head/gdb/config.in
--- gdb-orig/gdb/config.in 2007-10-24 23:09:49.563031000 +0200
+++ gdb-head/gdb/config.in 2007-10-24 23:34:42.978726576 +0200
@@ -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
diff -urNp gdb-orig/gdb/configure gdb-head/gdb/configure
--- gdb-orig/gdb/configure 2007-10-24 23:10:04.211183000 +0200
+++ gdb-head/gdb/configure 2007-10-24 23:34:43.034718517 +0200
@@ -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.
@@ -23693,14 +23693,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.
@@ -23754,49 +23746,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
@@ -24849,8 +24804,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
@@ -25902,9 +25855,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
diff -urNp gdb-orig/gdb/configure.ac gdb-head/gdb/configure.ac
--- gdb-orig/gdb/configure.ac 2007-10-24 23:09:52.082067000 +0200
+++ gdb-head/gdb/configure.ac 2007-10-24 23:34:43.091842388 +0200
@@ -1547,14 +1547,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.
@@ -1592,41 +1584,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
@@ -1665,9 +1628,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
diff -urNp gdb-orig/gdb/defs.h gdb-head/gdb/defs.h
--- gdb-orig/gdb/defs.h 2007-10-24 16:28:18.880786000 +0200
+++ gdb-head/gdb/defs.h 2007-10-24 23:34:43.097841524 +0200
@@ -798,14 +798,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'
@@ -815,14 +807,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
diff -urNp gdb-orig/gdb/gdbarch.c gdb-head/gdb/gdbarch.c
--- gdb-orig/gdb/gdbarch.c 2007-10-24 16:28:18.891785000 +0200
+++ gdb-head/gdb/gdbarch.c 2007-10-24 23:34:43.108839941 +0200
@@ -617,27 +617,13 @@ verify_gdbarch (struct gdbarch *current_
void
gdbarch_dump (struct gdbarch *current_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 (current_gdbarch->addr_bit));
diff -urNp gdb-orig/gdb/gdbarch.sh gdb-head/gdb/gdbarch.sh
--- gdb-orig/gdb/gdbarch.sh 2007-10-24 16:28:18.899783000 +0200
+++ gdb-head/gdb/gdbarch.sh 2007-10-24 23:34:43.151833752 +0200
@@ -1364,27 +1364,13 @@ cat <<EOF
void
gdbarch_dump (struct gdbarch *current_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
diff -urNp gdb-orig/gdb/Makefile.in gdb-head/gdb/Makefile.in
--- gdb-orig/gdb/Makefile.in 2007-10-24 23:19:13.357478000 +0200
+++ gdb-head/gdb/Makefile.in 2007-10-24 23:34:43.162832169 +0200
@@ -642,8 +642,6 @@ process_reply_S_h = process_reply_S.h
# config/ headers
#
-xm_h = @xm_h@
-tm_h = @tm_h@
nm_h = @nm_h@
#
@@ -683,7 +681,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
@@ -1287,9 +1285,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 \
@@ -1323,7 +1319,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
@@ -1343,7 +1339,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)" \
--
Dr. Ulrich Weigand
GNU Toolchain for Linux on System z and Cell BE
Ulrich.Weigand@de.ibm.com