Fix GCC 3.4+: label at end of compound statement.

Fix FILE usage: Don't assert the offset of a FILE member, it must not
be used as such.

2 files changed, 76 insertions, 4 deletions

diff --git a/lang/stalin/distinfo b/lang/stalin/distinfo
index 351dbad5ee1..e8f65fb3be7 100644
--- a/lang/stalin/distinfo
+++ b/lang/stalin/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:12 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/12/21 18:21:31 joerg Exp $
 
 SHA1 (stalin-0.9.tgz) = e2f98792fcfb582d031b480bc9fe4b800681ddd5
 RMD160 (stalin-0.9.tgz) = 55b29e062900046f647c0e4b42d8d8377c9eb604
 Size (stalin-0.9.tgz) = 12652154 bytes
 SHA1 (patch-aa) = dd9f3fcd1d38fc64a22a79049a55c472444435ae
 SHA1 (patch-ab) = 2fde348b86616e2d790c687be55038e420e920bf
-SHA1 (patch-ac) = a8db35d48e30c0fc309c9d854115d17cfd42fab6
+SHA1 (patch-ac) = 0027fef60522b2ad7e20744946ffa49560715ada
 SHA1 (patch-ad) = f07e6f35f1bf5b0eb116dd8f9b589ca86eb99d71
 SHA1 (patch-ae) = e64ded48229b6b6ac2d23a1572423b1583cceeef
diff --git a/lang/stalin/patches/patch-ac b/lang/stalin/patches/patch-ac
index 77fd1fa3207..9d301cb6f93 100644
--- a/lang/stalin/patches/patch-ac
+++ b/lang/stalin/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2001/06/25 17:49:33 jtb Exp $
+$NetBSD: patch-ac,v 1.4 2005/12/21 18:21:31 joerg Exp $
 
---- stalin-ia32.c.orig	Mon Jun 25 08:04:48 2001
+--- stalin-ia32.c.orig	2000-06-15 23:01:19.000000000 +0000
 +++ stalin-ia32.c
 @@ -1,7 +1,6 @@
  #include <stddef.h>
@@ -10,3 +10,75 @@ $NetBSD: patch-ac,v 1.3 2001/06/25 17:49:33 jtb Exp $
  #include <gc.h>
  #include <string.h>
  #include <math.h>
+@@ -271935,6 +271934,7 @@ struct w10500 f11659(struct p11657 *p116
+   /* x71541 stalin.sc:2538:88226 */
+   break;
+   default:
++  break;
+   /* x111269 stalin.sc:10922:382727 */}
+  /* x102535 */
+  t56675 = p11661;
+@@ -313620,6 +313620,7 @@ void f9302(struct p9300 *p9302, struct w
+   /* x260584 stalin.sc:9753:340477 */
+   break;
+   default:
++  break;
+   /* x260628 stalin.sc:2446:84988 */}
+  /* x76986 */
+  t63818 = p9310;
+@@ -313748,6 +313749,7 @@ void f9302(struct p9300 *p9302, struct w
+   /* x260592 stalin.sc:9753:340477 */
+   break;
+   default:
++  break;
+   /* x260636 stalin.sc:2446:84988 */}
+  /* x77072 */
+  t63796 = p9318;
+@@ -313998,6 +314000,7 @@ void f9302(struct p9300 *p9302, struct w
+   /* x106836 stalin.sc:9753:340477 */
+   break;
+   default:
++  break;
+   /* x71246 stalin.sc:2446:84988 */}
+  /* x77166 */
+  t63758 = p9340;
+@@ -314071,6 +314074,7 @@ void f9302(struct p9300 *p9302, struct w
+   /* x260596 stalin.sc:9753:340477 */
+   break;
+   default:
++  break;
+   /* x260640 stalin.sc:2446:84988 */}
+  /* x77193 */
+  t63747 = p9344;
+@@ -314140,6 +314144,7 @@ void f9302(struct p9300 *p9302, struct w
+   /* x260600 stalin.sc:9753:340477 */
+   break;
+   default:
++  break;
+   /* x260644 stalin.sc:2446:84988 */}
+  /* x77220 */
+  t63736 = p9348;
+@@ -314209,6 +314214,7 @@ void f9302(struct p9300 *p9302, struct w
+   /* x260590 stalin.sc:9753:340477 */
+   break;
+   default:
++  break;
+   /* x260634 stalin.sc:2446:84988 */}
+  /* x77247 */
+  t63725 = p9352;
+@@ -400667,6 +400673,7 @@ struct w10500 f1383(struct w190593 a1501
+    /* x71315 stalin.sc:2453:85342 */
+    break;
+    default:
++   break;
+    /* x71881 stalin.sc:2614:90587 */}
+   /* x102338 */
+   t76376 = p11628;
+@@ -585808,7 +585815,6 @@ int main(int argc, char **argv)
+  assert(offsetof(struct{char dummy; FILE *probe;}, probe)==4);
+  assert(offsetof(struct{char dummy; unsigned int probe;}, probe)==4);
+  assert(offsetof(struct{char dummy; unsigned int probe;}, probe)==4);
+- assert(offsetof(struct{char dummy; FILE probe;}, probe)==4);
+  assert(offsetof(struct{char dummy; struct p10810 *probe;}, probe)==4);
+  assert(offsetof(struct{char dummy; struct p15702 *probe;}, probe)==4);
+  assert(offsetof(struct{char dummy; struct p15698 *probe;}, probe)==4);