From a082325bd2660b06c46452bd9894258a55343288 Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@cygnus>
Date: Tue, 2 Feb 1993 00:45:59 +0000
Subject: [PATCH] * Makefile.in:  Make SunOS halfdone VPATH work. * p1.c:  Lint
 picked up by HP native compiler.

---
 sim/h8300/Makefile.in | 5 ++---
 sim/h8300/p1.c        | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in
index 281ca990b22..abb3f6f17ad 100644
--- a/sim/h8300/Makefile.in
+++ b/sim/h8300/Makefile.in
@@ -75,9 +75,8 @@ p2.c:writecode
 writecode:writecode.c
 	$(CC) -o writecode -g $(CSEARCH)  $(srcdir)/writecode.c 
 
-
-
-
+run.o: run.c
+perifs.o: perifs.c
 
 #### host and target dependent Makefile fragments come in here.
 ###
diff --git a/sim/h8300/p1.c b/sim/h8300/p1.c
index 4297e7babe5..da139d5df42 100644
--- a/sim/h8300/p1.c
+++ b/sim/h8300/p1.c
@@ -51,11 +51,11 @@ littleendian;
 static void
 meminit ()
 {
-  if (!saved_state.mem)
+  if (saved_state.mem == 0)
     {
       int tmp;
 
-      saved_state.mem = calloc (1024, 64);
+      saved_state.mem = (unsigned short *)calloc (1024, 64);
       littleendian.i = 1;
       /* initialze the array of pointers to byte registers */
       for (tmp = 0; tmp < 8; tmp++)
-- 
2.30.2