Use attributes consistently.

4 files changed, 96 insertions, 6 deletions

diff --git a/lang/vscm/distinfo b/lang/vscm/distinfo
index 2d3c53d6e82..6518071e4cc 100644
--- a/lang/vscm/distinfo
+++ b/lang/vscm/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.5 2012/06/23 21:30:05 dholland Exp $
+$NetBSD: distinfo,v 1.6 2012/11/19 02:54:42 joerg Exp $
 
 SHA1 (vscmV1R2.tar.gz) = 5c9107d825370e2a3b0d02c008faee2ca9f35eba
 RMD160 (vscmV1R2.tar.gz) = 3c405b384b4fb55594fd9a84c3aec6f10cda6bae
 Size (vscmV1R2.tar.gz) = 229752 bytes
+SHA1 (patch-Code.c) = 11f97f7aaeef3878da5ebfaeb6e8e92a93309743
 SHA1 (patch-aa) = 3c85e4519b8d17724672b093889016ec6bee5402
 SHA1 (patch-ab) = e4cd3a11cf083ab08dc7a5e83eb74965f0a1a163
-SHA1 (patch-ac) = 73adae14da2fb236fb41277a17e0b936a75b9433
+SHA1 (patch-ac) = de82fbea05306a9d70708696f4a7b53ec22d69d4
 SHA1 (patch-ad) = 80ccfbe99d114cd6695faf09f4d27a22e68a31cb
+SHA1 (patch-except.c) = c9542f192e5c71d0b74f94a793e244de14823af0
diff --git a/lang/vscm/patches/patch-Code.c b/lang/vscm/patches/patch-Code.c
new file mode 100644
index 00000000000..f78e42aedc8
--- /dev/null
+++ b/lang/vscm/patches/patch-Code.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-Code.c,v 1.1 2012/11/19 02:54:42 joerg Exp $
+
+--- Code.c.orig	2012-11-19 01:59:02.000000000 +0000
++++ Code.c
+@@ -659,7 +659,7 @@ long ScmTimer (long units)
+  * The VSCM virtual machine:
+  */
+ 
+-void ScmVM (void)
++void NORETURN ScmVM (void) NRUTERON
+ {
+   register const unsigned short *cp;
+   unsigned int cp_save;
diff --git a/lang/vscm/patches/patch-ac b/lang/vscm/patches/patch-ac
index e67e677dc52..025291aa395 100644
--- a/lang/vscm/patches/patch-ac
+++ b/lang/vscm/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/11/02 11:01:53 itojun Exp $
+$NetBSD: patch-ac,v 1.2 2012/11/19 02:54:42 joerg Exp $
 
---- main.c-	Thu Nov  2 19:51:47 2000
-+++ main.c	Thu Nov  2 19:52:00 2000
-@@ -17,6 +17,8 @@
+--- main.c.orig	1999-02-09 05:05:17.000000000 +0000
++++ main.c
+@@ -18,6 +18,8 @@ RCSID ("$Id: main.c,v 2.17 1994/11/12 22
  # include <string.h>
  # include <errno.h>
  
@@ -11,3 +11,29 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/11/02 11:01:53 itojun Exp $
  # include "main.h"
  # include "storage.h"
  # include "storext.h"
+@@ -72,14 +74,14 @@ static void *argv_list = NULL;
+ 
+ const char *dump_prefix = DEFAULT_DUMP_PREFIX;
+ 
+-void ScmRaiseError (void *handler, void *data)
++void NORETURN ScmRaiseError (void *handler, void *data) NRUTERON
+ {
+   user_error_handler = handler;
+   user_error_data = data;
+   longjmp (recovery_point, ERROR_RECOVERY);
+ }
+ 
+-void ScmReRaiseError (void *handler, void *data, void *cont)
++void NORETURN ScmReRaiseError (void *handler, void *data, void *cont) NRUTERON
+ {
+   user_error_handler = handler;
+   user_error_data = data;
+@@ -87,7 +89,7 @@ void ScmReRaiseError (void *handler, voi
+   longjmp (recovery_point, ERROR_RE_RECOVERY);
+ }
+ 
+-void ScmRaiseReset (void)
++void NORETURN ScmRaiseReset (void) NRUTERON
+ {
+   longjmp (recovery_point, RESET_RECOVERY);
+ }
diff --git a/lang/vscm/patches/patch-except.c b/lang/vscm/patches/patch-except.c
new file mode 100644
index 00000000000..0f103cb6e4f
--- /dev/null
+++ b/lang/vscm/patches/patch-except.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-except.c,v 1.1 2012/11/19 02:54:42 joerg Exp $
+
+--- except.c.orig	2012-11-19 01:59:57.000000000 +0000
++++ except.c
+@@ -107,7 +107,7 @@ void warning (const char *text, ...)
+   putc ('\n', stderr);
+ }
+ 
+-void error (const char *text, ...)
++void NORETURN error (const char *text, ...) NRUTERON
+ {
+   void *eh, *tmp;
+   va_list ap;
+@@ -118,17 +118,13 @@ void error (const char *text, ...)
+   ScmRaiseError (eh, tmp);
+ }
+ 
+-void fatal (const char *text)
++void NORETURN fatal (const char *text) NRUTERON
+ {
+-# ifndef EXIT_VOLATILE
+-  extern NORETURN void exit (int) NRUTERON;
+-# endif
+-
+   fprintf (stderr, "fatal: %s\n", text);
+   exit (EXIT_FAILURE);
+ }
+ 
+-void restriction (const char *text, ...)
++void NORETURN restriction (const char *text, ...) NRUTERON
+ {
+   void *eh, *tmp;
+   va_list ap;
+@@ -140,13 +136,13 @@ void restriction (const char *text, ...)
+   ScmRaiseError (eh, tmp);
+ }
+ 
+-void reset (const char *text)
++void NORETURN reset (const char *text) NRUTERON
+ {
+   fprintf (stderr, "System reset: %s\n", text);
+   ScmRaiseReset ();
+ }
+ 
+-void badarg (const char *fname, void *arg)
++void NORETURN badarg (const char *fname, void *arg) NRUTERON
+ {
+   error ("bad argument to primitive procedure %s: %w", fname, arg);
+ }