* The following patches are from Jeffrey Law <law@cs.utah.edu>.

	* hppa.c (hppa_core_file_p): Provide a temporary dummy routine
	for HOST_HPPABSD.
	* bfd/hosts/hppabsd.h: Fix declarations of malloc and free.
	* bfd/libhppa.h: Include sysdep here.  Conditionalize
	includes based on HOST_HPPAHPUX or HOST_HPPABSD.
	Provide definitions for MAXCOMLEN and _PA_RISC_ID suitable
	for BSD.

5 files changed, 65 insertions, 4 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7f0f36e..ac925f9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+Fri Apr 30 17:25:23 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* The following patches are from Jeffrey Law <law@cs.utah.edu>.
+	* hppa.c (hppa_core_file_p): Provide a temporary dummy routine
+	for HOST_HPPABSD.
+	* bfd/hosts/hppabsd.h: Fix declarations of malloc and free.
+	* bfd/libhppa.h: Include sysdep here.  Conditionalize
+	includes based on HOST_HPPAHPUX or HOST_HPPABSD.
+	Provide definitions for MAXCOMLEN and _PA_RISC_ID suitable
+	for BSD.
+
 Fri Apr 30 17:34:11 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
 	* elf32-hppa.c: Don't include a.out.h.  Apparently not even the
diff --git a/bfd/hosts/hppabsd.h b/bfd/hosts/hppabsd.h
index 8c9ef11..5f786a8 100644
--- a/bfd/hosts/hppabsd.h
+++ b/bfd/hosts/hppabsd.h
@@ -1,3 +1,6 @@
+#ifndef _HPPABSD_H
+#define _HPPABSD_H
+
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
@@ -7,8 +10,8 @@
 #include <string.h>
 #include <sys/file.h>
 
-void *malloc();
-void free();
+extern PTR  EXFUN(malloc,(unsigned));
+extern void EXFUN(free, (PTR));
 
 #define HOST_HPPABSD
 
@@ -46,3 +49,5 @@ typedef unsigned short uint16_type;
 typedef int int32_type;
 typedef unsigned int uint32_type;
 #include "fopen-same.h"
+
+#endif /* _HPPABSD_H */
diff --git a/bfd/hosts/hppahpux.h b/bfd/hosts/hppahpux.h
index f58bd7e..5f5e7c3 100644
--- a/bfd/hosts/hppahpux.h
+++ b/bfd/hosts/hppahpux.h
@@ -1,3 +1,6 @@
+#ifndef _HPPAHPUX_H
+#define _HPPAHPUX_H
+
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
@@ -51,3 +54,5 @@ typedef int int32_type;
 typedef unsigned int uint32_type;
 
 #include "fopen-same.h"
+
+#endif /* _HPPAHPUX_H */
diff --git a/bfd/hppa.c b/bfd/hppa.c
index 113a1e3..8cdfff1 100644
--- a/bfd/hppa.c
+++ b/bfd/hppa.c
@@ -43,18 +43,23 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef CPU_PA_RISC1_0
 #define CPU_PA_RISC1_0 0x20B
 #endif /* CPU_PA_RISC1_0 */
+
 #ifndef CPU_PA_RISC1_1
 #define CPU_PA_RISC1_1 0x210
 #endif /* CPU_PA_RISC1_1 */
+
 #ifndef _PA_RISC1_0_ID
 #define _PA_RISC1_0_ID CPU_PA_RISC1_0
 #endif /* _PA_RISC1_0_ID */
+
 #ifndef _PA_RISC1_1_ID
 #define _PA_RISC1_1_ID CPU_PA_RISC1_1
 #endif /* _PA_RISC1_1_ID */
+
 #ifndef _PA_RISC_MAXID
 #define _PA_RISC_MAXID	0x2FF
 #endif /* _PA_RISC_MAXID */
+
 #ifndef _PA_RISC_ID
 #define _PA_RISC_ID(__m_num)		\
     (((__m_num) == _PA_RISC1_0_ID) ||	\
@@ -523,6 +528,7 @@ make_bfd_asection (abfd, name, flags, _raw_size, vma, alignment_power)
   return asect;
 }
 
+#ifdef HOST_HPPAHPUX
 static bfd_target *
 hppa_core_file_p (abfd)
      bfd *abfd;
@@ -621,13 +627,22 @@ hppa_core_file_matches_executable_p  (core_bfd, exec_bfd)
 {
   return true;          /* FIXME, We have no way of telling at this point */
 }
+#endif /* HOST_HPPAHPUX */
+
+#ifdef HOST_HPPABSD
+  /* All the core file code for BSD needs to be rewritten cleanly.  For
+     now we do not support core files under BSD.  */
+
+#define hppa_core_file_p _bfd_dummy_target
+#define hppa_core_file_failing_command _bfd_dummy_core_file_failing_command
+#define hppa_core_file_failing_signal _bfd_dummy_core_file_failing_signal
+#define hppa_core_file_matches_executable_p _bfd_dummy_core_file_matches_executable_p
+#endif /* HOST_HPPABSD */
 
 #define hppa_bfd_debug_info_start        bfd_void
 #define hppa_bfd_debug_info_end          bfd_void
 #define hppa_bfd_debug_info_accumulate   (PROTO(void,(*),(bfd*, struct sec *))) bfd_void
 
-
-
 #define hppa_openr_next_archived_file    bfd_generic_openr_next_archived_file
 #define hppa_generic_stat_arch_elt       bfd_generic_stat_arch_elt
 #define hppa_slurp_armap                  bfd_false
diff --git a/bfd/libhppa.h b/bfd/libhppa.h
index 830e5cb..76b096e 100644
--- a/bfd/libhppa.h
+++ b/bfd/libhppa.h
@@ -20,9 +20,32 @@ 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.  */
 
+#ifndef _LIBHPPA_H
+#define _LIBHPPA_H
+
+#include "sysdep.h"
+
+#ifdef HOST_HPPAHPUX
+
 #include <sys/core.h>
 #include <sys/utsname.h>
 
+#endif /* HOST_HPPAHPUX */
+
+#ifdef HOST_HPPABSD
+
+/* Defining MAXCOMLEN avoids bringing in several (7 or 8) otherwise
+   useless include files which tend to clutter up the namespace.  
+
+   BSD uses a completely different scheme for object file identification.
+   so for now, define _PA_RISC_ID to accept any random value for a model
+   number.  */
+#include <a.out.h>
+#define MAXCOMLEN 16
+#define _PA_RISC_ID(__m_num) 1
+
+#endif /* HOST_HPPABSD */
+
 #define BYTES_IN_WORD 4
 
 struct header;
@@ -157,3 +180,5 @@ enum hppa_reloc_expr_type_alt
 	e_plabel = R_HPPA_E_PLABEL,
 	e_abs	= R_HPPA_E_ABS
 };
+
+#endif /* _LIBHPPA_H */