aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/bsd
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/bsd')
-rw-r--r--sysdeps/unix/bsd/bsd4.4/fchdir.S2
-rw-r--r--sysdeps/unix/bsd/clock.c4
-rw-r--r--sysdeps/unix/bsd/sun/m68k/brk.S2
-rw-r--r--sysdeps/unix/bsd/sun/m68k/vfork.S2
-rw-r--r--sysdeps/unix/bsd/ualarm.c2
-rw-r--r--sysdeps/unix/bsd/vax/vfork.S1
6 files changed, 6 insertions, 7 deletions
diff --git a/sysdeps/unix/bsd/bsd4.4/fchdir.S b/sysdeps/unix/bsd/bsd4.4/fchdir.S
index e749adee2b..c4184bcf8d 100644
--- a/sysdeps/unix/bsd/bsd4.4/fchdir.S
+++ b/sysdeps/unix/bsd/bsd4.4/fchdir.S
@@ -18,5 +18,5 @@ Cambridge, MA 02139, USA. */
#include <sysdep.h>
-SYSCALL (fchdir, 2)
+SYSCALL (fchdir, 1)
ret
diff --git a/sysdeps/unix/bsd/clock.c b/sysdeps/unix/bsd/clock.c
index 2c3e028444..d8fd2749cc 100644
--- a/sysdeps/unix/bsd/clock.c
+++ b/sysdeps/unix/bsd/clock.c
@@ -28,7 +28,7 @@ static clock_t
DEFUN(timeval_to_clock_t, (tv), CONST struct timeval *tv)
{
return (clock_t) ((tv->tv_sec * CLK_TCK) +
- (tv->tv_usec * CLK_TCK / 1000));
+ (tv->tv_usec * CLK_TCK / 1000000));
}
/* Return the time used by the program so far (user time + system time). */
@@ -41,5 +41,5 @@ DEFUN_VOID(clock)
return (clock_t) -1;
return (timeval_to_clock_t(&usage.ru_stime) +
- timeval_to_clock_t(&usage.ru_utime)) * CLOCKS_PER_SEC;
+ timeval_to_clock_t(&usage.ru_utime));
}
diff --git a/sysdeps/unix/bsd/sun/m68k/brk.S b/sysdeps/unix/bsd/sun/m68k/brk.S
index 114fa73c85..462910ad30 100644
--- a/sysdeps/unix/bsd/sun/m68k/brk.S
+++ b/sysdeps/unix/bsd/sun/m68k/brk.S
@@ -33,7 +33,7 @@ ___curbrk:
.text
ENTRY (__brk)
- movel __end, d0
+ movel #__end, d0
cmpl sp@(4), d0
ble 0f
movel d0, sp@(4)
diff --git a/sysdeps/unix/bsd/sun/m68k/vfork.S b/sysdeps/unix/bsd/sun/m68k/vfork.S
index cb7dae8d2b..63d2a09903 100644
--- a/sysdeps/unix/bsd/sun/m68k/vfork.S
+++ b/sysdeps/unix/bsd/sun/m68k/vfork.S
@@ -41,7 +41,7 @@ ___vfork:
bits set) for the parent, and 0 (no bits set) for the child.
Then AND it with D0, so the parent gets D0&-1==R0, and the child
gets D0&0==0. */
- decl d1
+ subql #1, d1
andl d1, d0
/* Jump to the return PC. */
diff --git a/sysdeps/unix/bsd/ualarm.c b/sysdeps/unix/bsd/ualarm.c
index 8d8e01d475..5d1ba1a8db 100644
--- a/sysdeps/unix/bsd/ualarm.c
+++ b/sysdeps/unix/bsd/ualarm.c
@@ -38,5 +38,5 @@ DEFUN(ualarm, (value, interval),
if (setitimer(ITIMER_REAL, &timer, &otimer) < 0)
return -1;
- return (otimer.it_value.tv_sec * 1000) + otimer.it_value.tv_usec;
+ return (otimer.it_value.tv_sec * 1000000) + otimer.it_value.tv_usec;
}
diff --git a/sysdeps/unix/bsd/vax/vfork.S b/sysdeps/unix/bsd/vax/vfork.S
index daf8f0f20d..96f27ea098 100644
--- a/sysdeps/unix/bsd/vax/vfork.S
+++ b/sysdeps/unix/bsd/vax/vfork.S
@@ -27,7 +27,6 @@ Cambridge, MA 02139, USA. */
replaced by a call to `execve'. Return -1 for errors, 0 to the new process,
and the process ID of the new process to the old process. */
.globl ___vfork
-error: jmp syscall_error
___vfork:
.word 0
/* Save our return address in R2, and return to code below. */