From 2c4143f4012c77dcdf722bd87b10397e170ecb0d Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 4 Sep 2008 20:26:18 +0000 Subject: [PATCH] 2008-09-04 Ken Werner * spu/Makefile.in: Fix missing linux_syscalls.o. * spu/linux_syscalls.c: Remove extraneous "3D" sequences. --- libgloss/ChangeLog | 5 +++++ libgloss/spu/Makefile.in | 3 ++- libgloss/spu/linux_syscalls.c | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 4eeda4b1f..94b8a3200 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,8 @@ +2008-09-04 Ken Werner + + * spu/Makefile.in: Fix missing linux_syscalls.o. + * spu/linux_syscalls.c: Remove extraneous "3D" sequences. + 2008-08-14 Jie Zhang * bfin/Makefile.in: (top_srcdir): Define. diff --git a/libgloss/spu/Makefile.in b/libgloss/spu/Makefile.in index 86f9d4710..18680b6c8 100644 --- a/libgloss/spu/Makefile.in +++ b/libgloss/spu/Makefile.in @@ -58,7 +58,8 @@ OBJS = \ access.o chdir.o chmod.o chown.o close.o conv_stat.o dirfuncs.o dup.o \ dup2.o exit.o fchdir.o fchmod.o fchown.o fdatasync.o fstat.o \ fsync.o ftruncate.o getcwd.o getpagesize.o getpid.o \ - gettimeofday.o isatty.o kill.o lchown.o link.o lockf.o lseek.o \ + gettimeofday.o isatty.o kill.o lchown.o \ + link.o linux_syscalls.o lockf.o lseek.o \ lstat.o mkdir.o mknod.o mkstemp.o mktemp.o nanosleep.o open.o \ pread.o pwrite.o read.o readlink.o readv.o rmdir.o sbrk.o \ sched_yield.o shm_open.o shm_unlink.o stat.o symlink.o sync.o \ diff --git a/libgloss/spu/linux_syscalls.c b/libgloss/spu/linux_syscalls.c index e8563ef26..1ecc241d7 100644 --- a/libgloss/spu/linux_syscalls.c +++ b/libgloss/spu/linux_syscalls.c @@ -37,26 +37,26 @@ int __linux_syscall (struct spu_syscall_block *s) { int ret; - __vector unsigned int stopfunc =3D { + __vector unsigned int stopfunc = { 0x00002104, /* stop 0x2104 */ (unsigned int) s, 0x4020007f, /* nop */ 0x35000000 /* bi $0 */ }; - void (*f) (void) =3D (void *) &stopfunc; + void (*f) (void) = (void *) &stopfunc; asm ("sync"); f (); if (s->nr_ret > -4096ull) { - errno =3D -s->nr_ret; - ret =3D -1; + errno = -s->nr_ret; + ret = -1; } else { - ret =3D s->nr_ret; + ret = s->nr_ret; } return ret; }