Fixes for NetBSD 1.5. NetBSD has been renumbering/renaming its

SYS_* interfaces.

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index c299d54f2fbb1ca29098f0c76237bfcb6296082e..8fee13a4d9af1393d16ef53b2089bf202398c33c 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-04  Andrew Cagney  <ac131313@redhat.com>
+
+       * emul_netbsd.c [WITH_NetBSD_HOST]: Include <sys/mount.h> and
+       <errno.h>.
+       (do_stat): Only do SYS test when SYS_stat defined.
+       (do_sigprocmask): Ditto for SYS_sigprocmask.
+       (do_fstat): Ditto for SYS_fstat.
+       (do_getdirentries): Ditto for SYS_getdirentries.
+       (do_lstat): Ditto for SYS_lstat.
+
 2001-01-15  Geoffrey Keating  <geoffk@redhat.com>
 
        * emul_netbsd.c (do_open): Translate the flag parameter to the

diff --git a/sim/ppc/emul_netbsd.c b/sim/ppc/emul_netbsd.c
index 777c364ac32090de6d515128ad980b34629de550..13897face2dfeb9ad8db8e1149f8e561810008d2 100644 (file)
--- a/sim/ppc/emul_netbsd.c
+++ b/sim/ppc/emul_netbsd.c
@@ -42,6 +42,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <sys/errno.h>
 #include <sys/param.h>
 #include <sys/time.h>
@@ -91,6 +92,7 @@ int getrusage();
 #if WITH_NetBSD_HOST /* here NetBSD as that is what we're emulating */
 #include <sys/syscall.h> /* FIXME - should not be including this one */
 #include <sys/sysctl.h>
+#include <sys/mount.h>
 extern int getdirentries(int fd, char *buf, int nbytes, long *basep);
 #else
 
@@ -595,7 +597,9 @@ do_sigprocmask(os_emul_data *emul,
   natural_word how = cpu_registers(processor)->gpr[arg0];
   unsigned_word set = cpu_registers(processor)->gpr[arg0+1];
   unsigned_word oset = cpu_registers(processor)->gpr[arg0+2];
+#ifdef SYS_sigprocmask
   SYS(sigprocmask);
+#endif
 
   if (WITH_TRACE && ppc_trace[trace_os_emul])
     printf_filtered ("%ld, 0x%ld, 0x%ld", (long)how, (long)set, (long)oset);
@@ -811,7 +815,9 @@ do_stat(os_emul_data *emul,
   char *path = emul_read_string(path_buf, path_addr, PATH_MAX, processor, cia);
   struct stat buf;
   int status;
+#ifdef SYS_stat
   SYS(stat);
+#endif
   status = stat(path, &buf);
   emul_write_status(processor, status, errno);
   if (status == 0)
@@ -833,7 +839,9 @@ do_fstat(os_emul_data *emul,
   unsigned_word stat_buf_addr = cpu_registers(processor)->gpr[arg0+1];
   struct stat buf;
   int status;
+#ifdef SYS_fstat
   SYS(fstat);
+#endif
   /* Can't combine these statements, cuz fstat sets errno. */
   status = fstat(fd, &buf);
   emul_write_status(processor, status, errno);
@@ -857,7 +865,9 @@ do_lstat(os_emul_data *emul,
   unsigned_word stat_buf_addr = cpu_registers(processor)->gpr[arg0+1];
   struct stat buf;
   int status;
+#ifdef SYS_lstat
   SYS(lstat);
+#endif
   /* Can't combine these statements, cuz lstat sets errno. */
   status = lstat(path, &buf);
   emul_write_status(processor, status, errno);
@@ -882,7 +892,9 @@ do_getdirentries(os_emul_data *emul,
   unsigned_word basep_addr = cpu_registers(processor)->gpr[arg0+3];
   long basep;
   int status;
+#ifdef SYS_getdirentries
   SYS(getdirentries);
+#endif
   if (buf_addr != 0 && nbytes >= 0)
     buf = zalloc(nbytes);
   else