* Makefile.in: Make SunOS halfdone VPATH work.

* p1.c:  Lint picked up by HP native compiler.

diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in
index 281ca990b22011a7f18c3f868d9a35130499881b..abb3f6f17add1e5715dbd25df7b1281e9824b692 100644 (file)
--- 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 4297e7babe5e1b410f4393f81d6a4df6e9eb97b0..da139d5df42153acb4d1667c67d4b7110fd82bba 100644 (file)
--- 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++)