* lynx-core.c (lynx_core_file_p): Change bfd_zalloc to bfd_alloc.

	* m68klynx.c:  Define core file macros.
	* hosts/i386lynx.h, hosts/m68klynx.h, hosts/lynx.h:  Move all
	non-architecture specific stuff into lynx.h.

6 files changed, 60 insertions, 54 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 288eedb..87cc534 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 16 17:03:41 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* lynx-core.c (lynx_core_file_p):  Change bfd_zalloc to bfd_alloc.
+	* m68klynx.c:  Define core file macros.
+	* hosts/i386lynx.h, hosts/m68klynx.h, hosts/lynx.h:  Move all
+	non-architecture specific stuff into lynx.h.
+
 Tue Nov 16 15:45:54 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* i386linux.c: Define new macro ZMAGIC_DISK_BLOCK_SIZE to 1024, and
diff --git a/bfd/hosts/.Sanitize b/bfd/hosts/.Sanitize
index c4a6652..25a425e 100644
--- a/bfd/hosts/.Sanitize
+++ b/bfd/hosts/.Sanitize
@@ -53,6 +53,7 @@ i386v.h
 i386v4.h
 irix3.h
 irix4.h
+lynx.h
 m68klynx.h
 miniframe.h
 mipsbsd.h
diff --git a/bfd/hosts/i386lynx.h b/bfd/hosts/i386lynx.h
index 2c93f50..b5be30c 100644
--- a/bfd/hosts/i386lynx.h
+++ b/bfd/hosts/i386lynx.h
@@ -3,35 +3,8 @@
 #ifndef hosts_i386lynx_h
 #define hosts_i386lynx_h
 
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
+#include "hosts/lynx.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>
-
-#define	HOST_PAGE_SIZE		NBPG
 #define	HOST_MACHINE_ARCH	bfd_arch_i386
-#define	HOST_TEXT_START_ADDR	USRTEXT
-
-#define HOST_LYNX
-
-#include "fopen-same.h"
-
-#undef I386			/* Lynx defines this for some reason */
-
-/* Lynx has calloc, but no cfree, and gprof uses it. */
-
-#define cfree free
 
 #endif /* hosts_i386lynx_h */
diff --git a/bfd/hosts/lynx.h b/bfd/hosts/lynx.h
new file mode 100644
index 0000000..737c9bd
--- /dev/null
+++ b/bfd/hosts/lynx.h
@@ -0,0 +1,36 @@
+/* Architecture independant LynxOS host support for 2.2 */
+
+#ifndef hosts_lynx_h
+#define hosts_lynx_h
+
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.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>
+
+#define	HOST_PAGE_SIZE		NBPG
+#define	HOST_TEXT_START_ADDR	USRTEXT
+
+#define HOST_LYNX
+
+#include "fopen-same.h"
+
+#undef I386			/* Lynx defines this for some reason */
+
+/* Lynx has calloc, but no cfree, and gprof uses it. */
+
+#define cfree free
+
+#endif /* hosts_lynx_h */
diff --git a/bfd/hosts/m68klynx.h b/bfd/hosts/m68klynx.h
index 394289a..2d370da 100644
--- a/bfd/hosts/m68klynx.h
+++ b/bfd/hosts/m68klynx.h
@@ -3,33 +3,8 @@
 #ifndef hosts_m68klynx_H
 #define hosts_m68klynx_H
 
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/file.h>
+#include "hosts/lynx.h"
 
-#ifndef O_ACCMODE
-#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
-#endif
-
-#define SEEK_SET 0
-#define SEEK_CUR 1
-
-#define	HOST_PAGE_SIZE		NBPG
 #define	HOST_MACHINE_ARCH	bfd_arch_m68k
-#define	HOST_TEXT_START_ADDR		USRTEXT
-
-#define u_comm u_kproc.kp_proc.p_comm
-
-#include "fopen-same.h"
-
-/* Lynx has calloc, but no cfree, and gprof uses it. */
-
-#define cfree free
 
 #endif /* hosts_m68klynx_H */
diff --git a/bfd/m68klynx.c b/bfd/m68klynx.c
index 295b7d0..0c7fce3 100644
--- a/bfd/m68klynx.c
+++ b/bfd/m68klynx.c
@@ -38,4 +38,18 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define TARGET_IS_BIG_ENDIAN_P
 
+#ifdef HOST_LYNX
+
+char *lynx_core_file_failing_command();
+int lynx_core_file_failing_signal();
+boolean lynx_core_file_matches_executable_p();
+bfd_target *lynx_core_file_p();
+
+#define	MY_core_file_failing_command lynx_core_file_failing_command
+#define	MY_core_file_failing_signal lynx_core_file_failing_signal
+#define	MY_core_file_matches_executable_p lynx_core_file_matches_executable_p
+#define	MY_core_file_p lynx_core_file_p
+
+#endif /* HOST_LYNX */
+
 #include "aout-target.h"