From d6b924937038457f83b47b26b9163bdfbdc230f2 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Sat, 7 Apr 2001 21:37:12 +0000 Subject: [PATCH] use asm/sysmips.h and linux/utsname.h if they exist fix some silly typos in mips sections --- ChangeLog | 7 +++++++ configure.in | 2 +- linux/syscall.h | 6 +++--- system.c | 14 +++++++++++++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac4ff0ae..3dabbadd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-04-07 Wichert Akkerman + + * configure.in: test for asm/sysmips.h and linux/utsname.h + * linux/syscall.h: fix a typo for sys_sysmips + * system.c: include asm/sysmips.h and linux/utsname.h if they exist, + fix typo + 2001-03-31 Wichert Akkerman * linux/mips/ioctlent.h: updated using new Linux ioctl setup diff --git a/configure.in b/configure.in index 4baf06f0..f4425a85 100644 --- a/configure.in +++ b/configure.in @@ -163,7 +163,7 @@ if test x$OPSYS != xLINUX; then AC_CHECK_LIB(nsl, main) fi AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl putpmsg prctl sendmsg inet_ntop if_indextoname) -AC_CHECK_HEADERS(sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h sys/stream.h sys/tiuser.h sys/sysconfig.h asm/sigcontext.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h linux/icmp.h linux/in6.h sys/uio.h sys/aio.h linux/netlink.h linux/if_packet.h sys/poll.h sys/vfs.h netinet/tcp.h netinet/udp.h) +AC_CHECK_HEADERS(sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h sys/stream.h sys/tiuser.h sys/sysconfig.h asm/sigcontext.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h linux/icmp.h linux/in6.h sys/uio.h sys/aio.h linux/netlink.h linux/if_packet.h sys/poll.h sys/vfs.h netinet/tcp.h netinet/udp.h asm/sysmips.h linux/utsname.h) AC_DECL_SYS_ERRLIST AC_DECL_SYS_SIGLIST AC_DECL__SYS_SIGLIST diff --git a/linux/syscall.h b/linux/syscall.h index 99b29951..8efa8ae7 100644 --- a/linux/syscall.h +++ b/linux/syscall.h @@ -134,7 +134,7 @@ int sys_osf_utimes(); #define SYS_recvmsg (SYS_socket_subcall + 17) #define SYS_socket_nsubcalls 18 -#endif /* !(ALPHA || IA64 || MIPS) */ +#endif /* !(ALPHA || IA64 || MIPS || HPPA) */ /* sys_ipc subcalls */ @@ -161,7 +161,7 @@ int sys_shmat(), sys_shmdt(), sys_shmget(), sys_shmctl(); #define SYS_shmctl (SYS_ipc_subcall + 24) #define SYS_ipc_nsubcalls 25 -#endif /* !(ALPHA || IA64 || MIPS) */ +#endif /* !(ALPHA || IA64 || MIPS || HPPA) */ #if defined(ALPHA) || defined(IA64) int sys_getpagesize(); @@ -176,7 +176,7 @@ int sys_getpmsg(), sys_putpmsg(); /* STREAMS stuff */ #endif #ifdef MIPS -int sys_sysmips() +int sys_sysmips(); #endif int sys_setpgrp(), sys_gethostname(), sys_getdtablesize(), sys_utimes(); diff --git a/system.c b/system.c index 89723bef..48d06e28 100644 --- a/system.c +++ b/system.c @@ -68,6 +68,14 @@ struct pt_regs; #include #endif +#ifdef HAVE_LINUX_USTNAME_H +#include +#endif + +#ifdef HAVE_ASM_SYSMIPS_H +#include +#endif + #include static struct xlat mount_flags[] = { @@ -2004,7 +2012,11 @@ struct tcb *tcp; #ifdef MIPS -static struct xlat_sysmips[] = { +#ifndef __NEW_UTS_LEN +#define __NEW_UTS_LEN 64 +#endif + +static struct xlat xlat_sysmips[] = { { SETNAME, "SETNAME" }, { FLUSH_CACHE, "FLUSH_CACHE" }, { MIPS_FIXADE, "MIPS_FIXADE" }, -- 2.40.0