5 files changed, 13 insertions, 10 deletions
diff --git a/gdb/config/i386/tm-i386m3.h b/gdb/config/i386/tm-i386m3.h
index 0c70930..f05081c 100644
--- a/gdb/config/i386/tm-i386m3.h
+++ b/gdb/config/i386/tm-i386m3.h
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Include common definitions for Mach3 systems */
-#include "os-mach3.h"
+#include "nm-m3.h"
 
 /* Define offsets to access CPROC stack when it does not have
  * a kernel thread.
@@ -57,15 +57,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NAMES_HAVE_UNDERSCORE
 
 /* Sigh. There should be a file for i386 but no sysv stuff in it */
-#include "tm-i386v.h"
+#include "i386/tm-i386v.h"
 
 /* I want to test this float info code. See comment in tm-i386v.h */
 #undef FLOAT_INFO
 #define FLOAT_INFO { i386_mach3_float_info (); }
 
-/* We use a.out format */
-#undef COFF_NO_LONG_FILE_NAMES
-
 /* Address of end of stack space.
  * for MACH, see <machine/vmparam.h>
  * @@@ I don't know what is in the 5 ints...
diff --git a/gdb/config/i386/tm-i386mk.h b/gdb/config/i386/tm-i386mk.h
index 8035433..3bbb2e0 100644
--- a/gdb/config/i386/tm-i386mk.h
+++ b/gdb/config/i386/tm-i386mk.h
@@ -22,4 +22,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  */
 #define MK67 1
 
-#include "tm-i386mach3.h"
+#include "i386/tm-i386m3.h"
diff --git a/gdb/config/mips/tm-mipsm3.h b/gdb/config/mips/tm-mipsm3.h
index 27a03dc..8bad365 100644
--- a/gdb/config/mips/tm-mipsm3.h
+++ b/gdb/config/mips/tm-mipsm3.h
@@ -24,7 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  */
 
 /* Include common definitions for Mach3 systems */
-#include "os-mach3.h"
+#include "nm-m3.h"
 
 /* Define offsets to access CPROC stack when it does not have
  * a kernel thread.
@@ -54,7 +54,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Mach supports attach/detach */
 #define ATTACH_DETACH 1
 
-#include "tm-mips.h"
+#include "mips/tm-mips.h"
 
 /*
  * On Mach 3.0 this is the number of exec() system calls before
diff --git a/gdb/config/ns32k/tm-ns32km3.h b/gdb/config/ns32k/tm-ns32km3.h
index 8055f7a..e123759 100644
--- a/gdb/config/ns32k/tm-ns32km3.h
+++ b/gdb/config/ns32k/tm-ns32km3.h
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Include common definitions for Mach3 systems */
-#include "os-mach3.h"
+#include "nm-m3.h"
 
 /* Define offsets to access CPROC stack when it does not have
  * a kernel thread.
@@ -61,4 +61,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  */
 #define STACK_END_ADDR USRSTACK
 
-#include "tm-umax.h"
+#include "ns32k/tm-umax.h"
diff --git a/gdb/config/ns32k/tm-umax.h b/gdb/config/ns32k/tm-umax.h
index ded8252..6d3e1ca 100644
--- a/gdb/config/ns32k/tm-umax.h
+++ b/gdb/config/ns32k/tm-umax.h
@@ -17,6 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+/* This is also included by tm-ns32km3.h, as well as being used by umax.  */
+
 #define TARGET_BYTE_ORDER LITTLE_ENDIAN
 
 /* Need to get function ends by adding this to epilogue address from .bf
@@ -50,7 +52,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Address of end of stack space.  */
 
+#ifndef STACK_END_ADDR
 #define STACK_END_ADDR (0xfffff000)
+#endif
 
 /* Stack grows downward.  */
 
@@ -70,6 +74,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define ABOUT_TO_RETURN(pc) (read_memory_integer (pc, 1) == 0x12)
 
+#ifndef INVALID_FLOAT
 #ifndef NaN
 #include <nan.h>
 #endif NaN
@@ -80,6 +85,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 	 ((s == sizeof (float))?	\
 		NaF (*(float *) p) :	\
 		NaD (*(double *) p))
+#endif /* INVALID_FLOAT */
 
 /* Say how long (ordinary) registers are.  */