* i386ly-nat.c, i386lynx-nat.c, m68kly-nat.c: Remove. Move

	common code into lynx-nat.c.
	* lynx-nat.c:  New module.  Contains portable code for Lynx native
	stuff (mostly ptrace related).
	* config/i386/i386lynx.mh (NATDEPFILES):  i386ly-nat.o -> lynx-nat.o
	* config/m68k/m68klynx.mh (NATDEPFILES):  i386ly-nat.o -> lynx-nat.o

	* config/nm-lynx.h, config/tm-lynx.h:  New files to contain
	non-architecture specific native and target defs.
	* config/i386/nm-i386lynx.h, config/i386/tm-i386lynx.h,
	config/m68k/nm-m68klynx.h, config/m68k/tm-m68klynx.h:  Move all
	(arch) portable stuff into ../{tm nm}-lynx.h.

3 files changed, 3 insertions, 50 deletions

diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh
index b979292..6cbade8 100644
--- a/gdb/config/i386/i386lynx.mh
+++ b/gdb/config/i386/i386lynx.mh
@@ -2,7 +2,7 @@
 XM_FILE= xm-i386lynx.h
 XDEPFILES= 
 NAT_FILE= nm-i386lynx.h
-NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o i386ly-nat.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o
 REGEX=regex.o
 REGEX1=regex.o
 GDBSERVER_LIBS= -lbsd
diff --git a/gdb/config/i386/nm-i386lynx.h b/gdb/config/i386/nm-i386lynx.h
index b463501..a4d9cea 100644
--- a/gdb/config/i386/nm-i386lynx.h
+++ b/gdb/config/i386/nm-i386lynx.h
@@ -20,50 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef NM_I386LYNX_H
 #define NM_I386LYNX_H
 
-#include <sys/conf.h>
-#include <sys/kernel.h>
-#include <sys/mem.h>
-#include <sys/signal.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/itimer.h>
-#include <sys/file.h>
-#include <sys/proc.h>
-#include "thread.h"
-
-/* This is the amount to subtract from u.u_ar0 to get the offset in
-   the core file of the register values.  */
-
-#define KERNEL_U_ADDR USRSTACK
-
-#undef FLOAT_INFO	/* No float info yet */
-
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-	(addr) = i386_register_u_addr ((blockend),(regno));
-
-extern int
-i386_register_u_addr PARAMS ((int, int));
-
-#define PTRACE_ARG3_TYPE char*
-
-/* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
-#define FETCH_INFERIOR_REGISTERS
-
-/* Thread ID of stopped thread */
-
-#define WIFTID(x) (((union wait *)&x)->w_tid)
-
-#define CHILD_WAIT
-
-extern int child_wait PARAMS ((int pid, int *status));
-
-/* Lynx needs a special definition of this so that we can
-   print out the pid and thread number seperatly.  */
-
-#undef target_pid_to_str
-
-#define target_pid_to_str(PID) \
-	i386lynx_pid_to_str (PID)
-extern char *i386lynx_pid_to_str PARAMS ((int pid));
+#include "nm-lynx.h"
 
 #endif /* NM_I386LYNX_H */
diff --git a/gdb/config/i386/tm-i386lynx.h b/gdb/config/i386/tm-i386lynx.h
index 8faf9eb..9ac3e8b 100644
--- a/gdb/config/i386/tm-i386lynx.h
+++ b/gdb/config/i386/tm-i386lynx.h
@@ -20,8 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef TM_I386LYNX_H
 #define TM_I386LYNX_H
 
-/* Override number of expected traps from sysv. */
-#define START_INFERIOR_TRAPS_EXPECTED 2
+#include "tm-lynx.h"
 
 /* Most definitions from sysv could be used. */
 #include "i386/tm-i386v.h"
@@ -31,6 +30,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define SAVED_PC_AFTER_CALL i386lynx_saved_pc_after_call
 CORE_ADDR i386lynx_saved_pc_after_call ();
 
-#include "coff-solib.h"		/* COFF shared library support */
-
 #endif /* TM_I386LYNX_H */