From e40b7407d56a0d5ded4f5894bc9da23aaa4ca4e4 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Tue, 3 May 1988 12:44:32 +0000
Subject: [PATCH] declare some variables in init.c instead of runtime startoff

---
 lang/m2/libm2/head_m2.e | 18 ------------------
 lang/m2/libm2/init.c    |  7 +++++++
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/lang/m2/libm2/head_m2.e b/lang/m2/libm2/head_m2.e
index 84caaacdd..b49cf1799 100644
--- a/lang/m2/libm2/head_m2.e
+++ b/lang/m2/libm2/head_m2.e
@@ -26,24 +26,6 @@
  exp $init
  inp $trap_handler
 
-handler
- con $catch
-environ
- bss EM_PSIZE,0,0
-argv
- bss EM_PSIZE,0,0
-argc
- bss EM_WSIZE,0,0
-CurrentProcess
- bss EM_PSIZE,0,0
-MainProcess
- bss EM_PSIZE,0,0
-StackBase
- bss EM_PSIZE,0,0
-MainLB
- bss EM_PSIZE,0,0
-StackSize
- bss EM_WSIZE,0,0
 mainroutine
  bss 2*EM_PSIZE,0,0
 
diff --git a/lang/m2/libm2/init.c b/lang/m2/libm2/init.c
index 9dc40a4b8..f94e07615 100644
--- a/lang/m2/libm2/init.c
+++ b/lang/m2/libm2/init.c
@@ -25,3 +25,10 @@ init()
 	sigtrp(M2_UNIXSIG, SIGALRM);
 	sigtrp(M2_UNIXSIG, SIGTERM);
 }
+
+extern int catch();
+
+int (*handler)() = catch;
+char **argv, **environ;
+int argc, StackSize;
+char *CurrentProcess, MainProcess, StackBase, MainLB;
-- 
2.34.1