hppa.c: don't require DL_MAGIC, SHL_MAGIC, if they're not defined (hpux 7.0)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bb868c748763a10491c4b6d4bc72dc178f746234..c9aae000277dac5a4d60393a2dfaef3b69ff7b5f 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -2,6 +2,8 @@ Mon Mar  8 14:55:13 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
        * hppa.c (_PA_RISC_ID): Defined if not already defined (e.g., for
        hpux 7).  Patch from friedman@gnu.ai.mit.edu.
+       (hppa_object_p): Only check for DL_MAGIC and SHL_MAGIC if they're
+       defined, which they aren't in hpux 7.0.
 
        * aix386-core.c: Include uinfo.h and coredump.h.  Patch from Minh
        Tran-Le, tranle@intellicorp.com.

diff --git a/bfd/hppa.c b/bfd/hppa.c
index 19a237094f180c9b6adfb71d0c15f7c8b1d51f10..4a33c481382f0bb9d3e92f4d0b08d3273eb61c80 100644 (file)
--- a/bfd/hppa.c
+++ b/bfd/hppa.c
@@ -37,7 +37,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/user.h>           /* After a.out.h  */
 #include <sys/file.h>
 #include <errno.h>
- 
+
 /* Magic not defined in standard HP-UX header files until 8.0 */
 
 #ifndef CPU_PA_RISC1_0
@@ -317,8 +317,12 @@ hppa_object_p (abfd)
     case EXEC_MAGIC:
     case SHARE_MAGIC:
     case DEMAND_MAGIC:
+#ifdef DL_MAGIC
     case DL_MAGIC:
+#endif
+#ifdef SHL_MAGIC
     case SHL_MAGIC:
+#endif
       break;
     default:
       bfd_error = wrong_format;