Try to make it at least compile.

4 files changed, 103 insertions, 1 deletions

diff --git a/crosspkgtools/kwacross-netbsd1-arm/distinfo b/crosspkgtools/kwacross-netbsd1-arm/distinfo
index 74d672fd8cf..820b86522b8 100644
--- a/crosspkgtools/kwacross-netbsd1-arm/distinfo
+++ b/crosspkgtools/kwacross-netbsd1-arm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2006/10/22 05:15:32 rillig Exp $
+$NetBSD: distinfo,v 1.3 2008/06/20 13:55:49 joerg Exp $
 
 SHA1 (kwacross-netbsd-1.6.2/kwacross-netbsd1-arm-20050605.tgz) = 3dc5a7a85dbc262b11c602ae280131cca5c8fbd1
 RMD160 (kwacross-netbsd-1.6.2/kwacross-netbsd1-arm-20050605.tgz) = 249a6eb652c2b6efa3a39fcec4b0566ad127f2b5
@@ -18,3 +18,6 @@ Size (kwacross-netbsd-1.6.2/syssrc.tgz) = 22986092 bytes
 SHA1 (patch-aa) = 505ff3f62f8ee12744a15c8382e36989b1de4218
 SHA1 (patch-ab) = 97b2f67cdc04e66fd55b18124fcafac6f111c403
 SHA1 (patch-ac) = 37384bf42f86a5d0787968ba6ac5c5432a9b291d
+SHA1 (patch-ad) = 85a81f66d041435e8f54a43cbf2ead6c2d8a4762
+SHA1 (patch-ae) = 35a376b7d2e20c97c1706741dc18cb72584b074b
+SHA1 (patch-af) = 62d52c6948b14d8ba0328a3cf623c4eb5b208908
diff --git a/crosspkgtools/kwacross-netbsd1-arm/patches/patch-ad b/crosspkgtools/kwacross-netbsd1-arm/patches/patch-ad
new file mode 100644
index 00000000000..1feea987bb7
--- /dev/null
+++ b/crosspkgtools/kwacross-netbsd1-arm/patches/patch-ad
@@ -0,0 +1,53 @@
+$NetBSD: patch-ad,v 1.1 2008/06/20 13:55:49 joerg Exp $
+
+--- gdb/sim/netbsd/netbsd.c.orig	2008-06-20 15:26:09.000000000 +0200
++++ gdb/sim/netbsd/netbsd.c
+@@ -467,7 +467,11 @@ write_struct_statfs(EMUL_ADDR dst, struc
+   WRITE_LONG(dst, src->f_syncwrites); dst += EMUL_SIZEOF_LONG;
+   WRITE_LONG(dst, src->f_asyncwrites); dst += EMUL_SIZEOF_LONG;
+   /* f_spare[1]; */ dst += EMUL_SIZEOF_LONG;
++#if __NetBSD_Version__ >= 499002500
++  write_memory(dst, src->f_fstypename, sizeof(src->f_fstypename));
++#else
+   write_memory(dst, src->f_fstypename, MFSNAMELEN + MNAMELEN + MNAMELEN);
++#endif
+ }
+ 
+ 
+@@ -2357,8 +2361,10 @@ do__sysctl(void)  /* XXX */
+           break;
+         case HW_DISKNAMES:
+           xfatal("sysctl HW_DISKNAMES not implemented\n");  // XXX
++#ifdef HW_DISKSTATS
+         case HW_DISKSTATS:
+           xfatal("sysctl HW_DISKSTATS not implemented\n");  // XXX
++#endif
+         case HW_MACHINE_ARCH:
+           strcpy(buf, EMUL_HW_MACHINE_ARCH);
+           bufsize = strlen(buf) + 1;
+@@ -2444,9 +2450,15 @@ do__sysctl(void)  /* XXX */
+         case KERN_SAVED_IDS:
+         case KERN_SECURELVL:
+         case KERN_SYNCHRONIZED_IO:
++#ifdef KER_SYSVMSG
+         case KERN_SYSVMSG:
++#endif
++#ifdef KERN_SYSVSEM
+         case KERN_SYSVSEM:
++#endif
++#ifdef KERN_SYSVSHM
+         case KERN_SYSVSHM:
++#endif
+           /* int */
+           {
+             status = sysctl(tmp_name, namelen,
+@@ -2537,7 +2549,9 @@ do__sysctl(void)  /* XXX */
+         case KERN_NTPTIME: // XXX struct ntptimeval
+         case KERN_PROC: // XXX struct kinfo_proc
+         case KERN_PROF:  // XXX node
++#if KERN_SYSVIPC_INFO != KERN_OSTYPE
+         case KERN_SYSVIPC_INFO: // XXX node
++#endif
+         case KERN_TKSTAT: // XXX node
+         case KERN_VNODE: // XXX struct vnode
+           xfatal("sysctl CTL_KERN:0x%x not implemented\n", tmp_name[1]);
diff --git a/crosspkgtools/kwacross-netbsd1-arm/patches/patch-ae b/crosspkgtools/kwacross-netbsd1-arm/patches/patch-ae
new file mode 100644
index 00000000000..3e618f4c006
--- /dev/null
+++ b/crosspkgtools/kwacross-netbsd1-arm/patches/patch-ae
@@ -0,0 +1,34 @@
+$NetBSD: patch-ae,v 1.1 2008/06/20 13:55:49 joerg Exp $
+
+--- gdb/include/obstack.h.orig	2003-04-17 17:37:14.000000000 +0200
++++ gdb/include/obstack.h
+@@ -417,14 +417,12 @@ __extension__								\
+ /* These assume that the obstack alignment is good enough for pointers or ints,
+    and that the data added so far to the current object
+    shares that much alignment.  */
+-
+ # define obstack_ptr_grow(OBSTACK,datum)				\
+ __extension__								\
+ ({ struct obstack *__o = (OBSTACK);					\
+    if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
+      _obstack_newchunk (__o, sizeof (void *));				\
+-   *((void **)__o->next_free)++ = ((void *)datum);			\
+-   (void) 0; })
++   obstack_ptr_grow_fast (__o, datum); })
+ 
+ # define obstack_int_grow(OBSTACK,datum)				\
+ __extension__								\
+@@ -434,7 +432,12 @@ __extension__								\
+    *((int *)__o->next_free)++ = ((int)datum);				\
+    (void) 0; })
+ 
+-# define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr)
++# define obstack_ptr_grow_fast(OBSTACK,aptr)				\
++__extension__								\
++({ struct obstack *__o1 = (OBSTACK);					\
++   *(const void **) __o1->next_free = (aptr);				\
++   __o1->next_free += sizeof (const void *);				\
++   (void) 0; })
+ # define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)
+ 
+ # define obstack_blank(OBSTACK,length)					\
diff --git a/crosspkgtools/kwacross-netbsd1-arm/patches/patch-af b/crosspkgtools/kwacross-netbsd1-arm/patches/patch-af
new file mode 100644
index 00000000000..f2cee65180d
--- /dev/null
+++ b/crosspkgtools/kwacross-netbsd1-arm/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2008/06/20 13:55:49 joerg Exp $
+
+--- gdb/gdb/arm-tdep.c.orig	2008-06-20 15:40:46.000000000 +0200
++++ gdb/gdb/arm-tdep.c
+@@ -2751,6 +2751,7 @@ arm_gdbarch_init (struct gdbarch_info in
+ 
+ 	    default:
+ 	      /* Leave it as "unknown".  */
++	      break;
+ 	    }
+ 	}
+     }