[src/trunk]: src/sys/compat/linux/arch/mips Fixed errors in header files

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/473c7d7071c4
branches:  trunk
changeset: 515360:473c7d7071c4
user:      manu <manu%NetBSD.org@localhost>
date:      Sat Sep 22 21:15:18 2001 +0000

description:
Fixed errors in header files

diffstat:

 sys/compat/linux/arch/mips/linux_exec.h    |  29 +++++++++++++++++++++++------
 sys/compat/linux/arch/mips/linux_machdep.h |  11 +++++++----
 sys/compat/linux/arch/mips/linux_mmap.h    |   6 +++---
 sys/compat/linux/arch/mips/linux_signal.h  |  24 +++++++++++++++++++++++-
 sys/compat/linux/arch/mips/linux_types.h   |   8 ++++----
 5 files changed, 60 insertions(+), 18 deletions(-)

diffs (197 lines):

diff -r e88ddf4144ad -r 473c7d7071c4 sys/compat/linux/arch/mips/linux_exec.h
--- a/sys/compat/linux/arch/mips/linux_exec.h   Sat Sep 22 21:14:37 2001 +0000
+++ b/sys/compat/linux/arch/mips/linux_exec.h   Sat Sep 22 21:15:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_exec.h,v 1.2 2001/09/02 08:39:37 manu Exp $ */
+/*     $NetBSD: linux_exec.h,v 1.3 2001/09/22 21:15:18 manu Exp $ */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -52,16 +52,27 @@
 /*
  * Linux a.out format parameters
  */
-#define LINUX_M_MIPS           MID_MIPS        /* XXX This is a guess */
+#define LINUX_M_MIPS           MID_MIPS
 #define LINUX_MID_MACHINE      LINUX_M_MIPS    
 
 /*
  * Linux Elf32 format parameters
  */
 
-#define LINUX_GCC_SIGNATURE 1                  /* XXX to be tested */
+#define LINUX_ATEXIT_SIGNATURE 1
+#define LINUX_GCC_SIGNATURE 1
 
-#define LINUX_COPYARGS_FUNCTION ELFNAME2(linux,copyargs)
+/* #define LINUX_COPYARGS_FUNCTION linux_elf32_copyargs */
+#if defined(ELFSIZE) && (ELFSIZE == 64)
+#define LINUX_COPYARGS_FUNCTION ELF64NAME(copyargs)
+#else
+#define LINUX_COPYARGS_FUNCTION ELF32NAME(copyargs)
+#endif
+
+#define LINUX_ELF_AUX_ENTRIES 14
+
+#define LINUX_ELF_AUX_ARGSIZ \
+    ((howmany(ELF_AUX_ENTRIES * sizeof(LinuxAuxInfo), sizeof(Elf32_Addr))))
 
 typedef struct {
        Elf32_Sword a_type;
@@ -79,8 +90,14 @@
 
 #ifdef _KERNEL
 __BEGIN_DECLS
-void * ELFNAME2(linux,copyargs) __P((struct exec_package *,
-    struct ps_strings *, void *, void *)); 
+#ifdef EXEC_ELF32
+int linux_elf32_copyargs __P((struct exec_package *, struct ps_strings *, 
+    char **, void *)); 
+#endif
+#ifdef EXEC_ELF64
+int linux_elf64_copyargs __P((struct exec_package *, struct ps_strings *, 
+    char **, void *)); 
+#endif
 __END_DECLS
 #endif /* _KERNEL */
 
diff -r e88ddf4144ad -r 473c7d7071c4 sys/compat/linux/arch/mips/linux_machdep.h
--- a/sys/compat/linux/arch/mips/linux_machdep.h        Sat Sep 22 21:14:37 2001 +0000
+++ b/sys/compat/linux/arch/mips/linux_machdep.h        Sat Sep 22 21:15:18 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.h,v 1.2 2001/09/02 08:39:37 manu Exp $ */
+/* $NetBSD: linux_machdep.h,v 1.3 2001/09/22 21:15:18 manu Exp $ */
 
 /*-
  * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,6 +42,9 @@
 #include <compat/linux/common/linux_signal.h>
 
 #if defined(ELFSIZE) && (ELFSIZE == 64)
+/* 
+ * From Linux's include/asm-mips64/sigcontext.h 
+ */
 struct linux_sigcontext {
        unsigned long long sc_regs[32];
        unsigned long long sc_fpregs[32];
@@ -57,7 +60,7 @@
 }
 #else
 /* 
- * From Linux's include/asm-mips64/sigcontext.h 
+ * From Linux's include/asm-mips/sigcontext.h 
  */
 struct linux_sigcontext { 
        unsigned int lsc_regmask;               /* Unused */
@@ -92,7 +95,7 @@
        unsigned int lsf_ass[4];
        unsigned int lsf_code[2];
        struct linux_sigcontext lsf_sc;
-       sigset_t lsf_mask;
+       linux_sigset_t lsf_mask;
 };
 
 /*
@@ -107,7 +110,7 @@
 };
 
 /*
- * From Linux's arch/mips/kernel/signal.c, the real rt_sigframe
+ * From Linux's arch/mips/kernel/signal.c
  */
 struct linux_rt_sigframe
 {
diff -r e88ddf4144ad -r 473c7d7071c4 sys/compat/linux/arch/mips/linux_mmap.h
--- a/sys/compat/linux/arch/mips/linux_mmap.h   Sat Sep 22 21:14:37 2001 +0000
+++ b/sys/compat/linux/arch/mips/linux_mmap.h   Sat Sep 22 21:15:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_mmap.h,v 1.3 2001/09/02 07:26:11 manu Exp $      */
+/*     $NetBSD: linux_mmap.h,v 1.4 2001/09/22 21:15:18 manu Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -40,8 +40,8 @@
 #define _MIPS_LINUX_MMAP_H
 
 /* 
- * LINUX_PROT_* defined in common/linux_mmap.h */
- * LINUX_MAP_SHARED/PRIVATE defined in common/linux_mmap.h */
+ * LINUX_PROT_* defined in common/linux_mmap.h
+ * LINUX_MAP_SHARED/PRIVATE defined in common/linux_mmap.h
  */
 
 /*
diff -r e88ddf4144ad -r 473c7d7071c4 sys/compat/linux/arch/mips/linux_signal.h
--- a/sys/compat/linux/arch/mips/linux_signal.h Sat Sep 22 21:14:37 2001 +0000
+++ b/sys/compat/linux/arch/mips/linux_signal.h Sat Sep 22 21:15:18 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.h,v 1.3 2001/09/02 08:39:37 manu Exp $ */
+/* $NetBSD: linux_signal.h,v 1.4 2001/09/22 21:15:18 manu Exp $ */
 
 /*-
  * Copyright (c) 1995, 1998, 2001 The NetBSD Foundation, Inc.
@@ -39,6 +39,20 @@
 #ifndef _MIPS_LINUX_SIGNAL_H
 #define _MIPS_LINUX_SIGNAL_H
 
+/*
+ * From Linux's include/asm-mips/ptrace.h 
+ */
+struct linux_pt_regs {
+       unsigned long lpad0[6];
+       unsigned long lregs[32];
+       unsigned long llo;
+       unsigned long lhi;
+       unsigned long lcp0_spc;
+       unsigned long lcp0_badvaddr;
+       unsigned long lcp0_status;
+       unsigned long lcp0_cause;
+};
+
 /* 
  * Everything is from Linux's include/asm-mips/signal.h 
  */
@@ -123,6 +137,14 @@
        struct linux_sigaction sa;
 };
 
+struct linux_old_sigaction {
+       unsigned int            sa_flags;
+       linux___sighandler_t    sa_handler;
+       linux_old_sigset_t      sa_mask;
+       void                    (*sa_restorer) __P((void));
+       int                     sa_resv[1];
+};
+
 #define        LINUX_SS_ONSTACK        1
 #define        LINUX_SS_DISABLE        2
 
diff -r e88ddf4144ad -r 473c7d7071c4 sys/compat/linux/arch/mips/linux_types.h
--- a/sys/compat/linux/arch/mips/linux_types.h  Sat Sep 22 21:14:37 2001 +0000
+++ b/sys/compat/linux/arch/mips/linux_types.h  Sat Sep 22 21:15:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_types.h,v 1.2 2001/09/02 08:39:37 manu Exp $ */
+/*     $NetBSD: linux_types.h,v 1.3 2001/09/22 21:15:18 manu Exp $ */
 
 /*-
  * Copyright (c) 1995, 1998, 2001 The NetBSD Foundation, Inc.
@@ -74,8 +74,8 @@
 typedef unsigned int linux_speed_t;
 typedef unsigned int linux_tcflag_t;
 #else
-typedef unsigned long speed_t;
-typedef unsigned long tcflag_t;
+typedef unsigned long linux_speed_t;
+typedef unsigned long linux_tcflag_t;
 #endif
 
 /* 
@@ -199,7 +199,7 @@
        long            lst_blocks;
        char            lst_fstype[16];
        long            lst_pad4[8];
-       unsigned int    lst_flags
+       unsigned int    lst_flags;
        unsigned int    lst_gen;
 };
 #endif