[src/trunk]: src/sys/arch/powerpc/include Make this work.

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

details:   https://anonhg.NetBSD.org/src/rev/0c826545a0dc
branches:  trunk
changeset: 327137:0c826545a0dc
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Feb 28 05:31:38 2014 +0000

description:
Make this work.

diffstat:

 sys/arch/powerpc/include/netbsd32_machdep.h |  20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diffs (53 lines):

diff -r 0f908355f9dd -r 0c826545a0dc sys/arch/powerpc/include/netbsd32_machdep.h
--- a/sys/arch/powerpc/include/netbsd32_machdep.h       Fri Feb 28 05:30:24 2014 +0000
+++ b/sys/arch/powerpc/include/netbsd32_machdep.h       Fri Feb 28 05:31:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep.h,v 1.7 2011/06/20 06:21:45 matt Exp $        */
+/*     $NetBSD: netbsd32_machdep.h,v 1.8 2014/02/28 05:31:38 matt Exp $        */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -32,21 +32,17 @@
 #include <sys/types.h>
 #include <sys/proc.h>
 
-typedef        u_int32_t netbsd32_pointer_t;
+#define NETBSD32_POINTER_TYPE                  uint32_t
+typedef struct { NETBSD32_POINTER_TYPE i32; }  netbsd32_pointer_t;
 
-/*
- * Convert a pointer in the 32-bit world to a valid 64-bit pointer.
- */
-#define        NETBSD32PTR64(p32)      ((void *)(u_long)(u_int)(p32))
-
-/* ppc32 has 32bit aligned 64bit integers */
-#define NETBSD32_INT64_ALIGN __attribute__((__aligned__(4)))
+/* ppc32 has normally aligned 64bit integers */
+#define NETBSD32_INT64_ALIGN
 
 #include <compat/netbsd32/netbsd32.h>
 #include <powerpc/frame.h>
 
 /* from <sparc/include/signal.h> */
-typedef u_int32_t netbsd32_sigcontextp_t;
+typedef uint32_t netbsd32_sigcontextp_t;
 
 struct netbsd32_sigcontext {
        int             sc_onstack;     /* sigstack state to restore */
@@ -65,8 +61,6 @@
 
 struct exec_package;
 void netbsd32_setregs (struct lwp *, struct exec_package *, vaddr_t);
-int netbsd32_sigreturn (struct lwp *, void *, register_t *);
-void netbsd32_sendsig (int sig, sigset_t *, u_long);
 
 extern char netbsd32_esigcode[], netbsd32_sigcode[];
 
@@ -74,6 +68,6 @@
  * Need to plug into get sparc specific ioctl's.
  */
 #define        NETBSD32_MD_IOCTL       /* enable netbsd32_md_ioctl() */
-int netbsd32_md_ioctl(struct file *, netbsd32_u_long, void *, struct proc *);
+int netbsd32_md_ioctl(struct file *, netbsd32_u_long, void *, struct lwp *);
 
 #endif /* _MACHINE_NETBSD32_H_ */