diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 95195c9892..bb28373254 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,7 +1,12 @@
+Thu Sep 17 17:35:37 1992  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* Makefile.in, configure.in: add support for files used only when
+	configured native, that is, when host = target.
+
 Wed Sep 16 23:03:23 1992  K. Richard Pixley  (rich@sendai.cygnus.com)
 
 	* tm-sparc.h, xm-sparc.h: externs and macros relating to deferred
-	  stores are target dependent and were moved from xm to tm.
+	stores are target dependent and were moved from xm to tm.
 
 Sat Sep 19 03:14:37 1992  John Gilmore  (gnu@cygnus.com)
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index ff2c0fa25b..d459af3486 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -139,7 +139,7 @@ CFLAGS = -g
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
 INTERNAL_CFLAGS = ${CFLAGS} ${GLOBAL_CFLAGS} ${PROFILE_CFLAGS} ${MMALLOC_CFLAGS} ${INCLUDE_CFLAGS} ${USER_CFLAGS}
 # None of the things in CFLAGS will do any harm, and on some systems
-#  (e.g. SunOS4) it is important to use the M_CFLAGS.
+#  (e.g. SunOS4) it is important to use the MH_CFLAGS.
 LDFLAGS = $(CFLAGS)
 
 # Where is the "-liberty" library, containing getopt and obstack?
@@ -153,18 +153,17 @@ OPCODES = ./../opcodes${subdir}/libopcodes.a
 # The config/mh-* file must define REGEX and REGEX1 on USG machines.
 # If your sysyem is missing alloca(), or, more likely, it's there but
 # it doesn't work, define ALLOCA & ALLOCA1 too.
-# If your system is missing putenv(), add putenv.c to XM_ADD_FILES.
 
 # Libraries and corresponding dependencies for compiling gdb.
 # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
 # TERMCAP comes after readline, since readline depends on it.
-CLIBS = ${BFD_LIB}  ${RL_LIB} ${TERMCAP} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} \
-	${XM_CLIBS} ${TM_CLIBS}
-CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} \
-	${RL_LIB} ${MMALLOC_LIB}
+CLIBS = ${BFD_LIB} ${RL_LIB} ${TERMCAP} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} \
+	${XM_CLIBS} ${TM_CLIBS} ${NAT_CLIBS}
+CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${NAT_CDEPS} \
+	${BFD_LIB} ${RL_LIB} ${TERMCAP} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY}
 
-ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
-ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES}
+ADD_FILES = ${REGEX} ${ALLOCA}  ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES}
+ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES}
 
 VERSION = 4.6.6
 DIST=gdb
@@ -276,7 +275,7 @@ TARDIRS = doc # tests
 # GDB "info" files, which should be included in their entirety
 INFOFILES = gdb.info*
 
-DEPFILES= ${TDEPFILES} ${XDEPFILES}
+DEPFILES= ${TDEPFILES} ${XDEPFILES} ${NATDEPFILES}
 
 SOURCES=$(SFILES) $(ALLDEPFILES) $(YYFILES)
 TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS} 
@@ -395,11 +394,12 @@ alldeps.mak: ${srcdir}/config
 	for i in `ls -d ${srcdir}/config/*.m[ht]` ; do \
 	  echo $$i >>allconfig.tmp; \
 	  awk <$$i ' \
-	    $$1 == "TDEPFILES=" || $$1 == "XDEPFILES=" { \
+	    $$1 == "TDEPFILES=" || $$1 == "XDEPFILES=" \
+		|| $$1 == "NATDEPFILES" { \
 	      for (i = 2; i <= NF; i++) \
 	        print $$i >> "alldeps.tmp" ; \
             } \
-	    $$1 == "TM_FILE=" || $$1 == "XM_FILE=" { \
+	    $$1 == "TM_FILE=" || $$1 == "XM_FILE=" || $$1 == "NAT_FILE" { \
 	      print $$2 >> "allparam.tmp" }' ; \
 	done
 	sort <alldeps.tmp | uniq | \
@@ -519,7 +519,8 @@ kdb: $(NTSSTART) $(OBS) $(NTSOBS) ${ADD_DEPS} ${CDEPS}
 # Put the proper machine-specific files first.
 # createtags will edit the .o in DEPFILES into .c
 TAGS: ${TAGFILES}
-	$(srcdir)/createtags $(TM_FILE) ${XM_FILE} $(DEPFILES) ${TAGFILES}
+	$(srcdir)/createtags $(TM_FILE) ${XM_FILE} ${NAT_FILE} \
+			     $(DEPFILES) ${TAGFILES}
 tags: TAGS
 
 # Making distributions of GDB and friends.
diff --git a/gdb/configure.in b/gdb/configure.in
index 8cf7be787a..44312eb47d 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -233,13 +233,19 @@ fi
 #  We really shouldn't depend on there being a space after TM_FILE= ...
 targetfile=`awk '$1 == "TM_FILE=" { print $2 }' <${srcdir}/config/${gdb_target}.mt`
 
+if [ "${target}" = "${host}" ] ; then
+	nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' <${srcdir}/config/${gdb_host}.mh`
+fi
+
 host_makefile_frag=config/${gdb_host}.mh
 target_makefile_frag=config/${gdb_target}.mt
 
-# If hostfile (XM_FILE) and/or targetfile (TM_FILE) is not set in the
-# ?config/* file, we don't make the corresponding links.  But we have
-# to remove the xm.h files and tm.h files anyway, e.g. when switching
-# from "configure host" to "configure none".
+# If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
+# (NAT_FILE) is not set in the ?config/* file, we don't make the
+# corresponding links.  But we have to remove the xm.h files and tm.h
+# files anyway, e.g. when switching from "configure host" to
+# "configure none".
+
 files=
 links=
 rm -f xm.h
@@ -252,6 +258,11 @@ if [ "${targetfile}" != "" ]; then
 	files="${files} ${targetfile}"
 	links="${links} tm.h"
 fi
+rm -f nat.h
+if [ "${nativefile}" != "" ]; then
+	files="${files} ${nativefile}"
+	links="${links} nat.h"
+fi
 
 # post-target:
 
@@ -263,4 +274,10 @@ case ${srcdir} in
       echo "source ${srcdir}/.gdbinit" >> .gdbinit
 esac
 
+if [ "${nativefile}" != "" ] ; then
+	sed -e '/^NATDEPFILES= /s//# NATDEPFILES= ' \
+		< Makefile > Makefile.tem
+	mv -f Makefile.tem Makefile
+fi
+
 cat ${srcdir}/alldeps.mak ${srcdir}/depend >>Makefile