From c4b2c6620b5562a372fc95f44e49f05308309841 Mon Sep 17 00:00:00 2001
From: Camm Maguire <camm@debian.org>
Date: Sun, 13 Nov 2022 12:55:14 +0000
Subject: [PATCH] <short summary of the patch>

Bug-Debian: https://bugs.debian.org/919477

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.12-83) unstable; urgency=high

  * Version_2_6_13pre79
  * Fix acl2 arm builds (Closes: #919477).

Gbp-Pq: Name Version_2_6_13pre80
---
 h/notcomp.h |  2 +-
 o/alloc.c   | 13 +++----------
 o/array.c   | 18 +++++++++++-------
 o/utils.c   | 14 --------------
 4 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/h/notcomp.h b/h/notcomp.h
index 3d33090..e4835d4 100755
--- a/h/notcomp.h
+++ b/h/notcomp.h
@@ -175,7 +175,7 @@ TS_MEMBER(t0,TS(t1)|TS(t2)|TS(t3)...)
 #define TS(s) (1<<s)
 #define TS_MEMBER(t1,ts) ((TS(t1)) & (ts))
 
-#define ASSURE_TYPE(val,t) if(type_of(val)!=t) val= Icheck_one_type(val,t)
+#define ASSURE_TYPE(val,t) if (type_of(val)!=t) TYPE_ERROR(val,type_name(t))
 
 object IisArray();
 
diff --git a/o/alloc.c b/o/alloc.c
index fc2b481..444eae8 100644
--- a/o/alloc.c
+++ b/o/alloc.c
@@ -526,16 +526,9 @@ exhausted_report(enum type t,struct typemanager *tm) {
 
   available_pages+=resv_pages;
   resv_pages=0;
-  vs_push(type_name(t));
-  vs_push(make_fixnum(tm->tm_npage));
-  CEerror("The storage for ~A is exhausted.~%\
-Currently, ~D pages are allocated.~%	     \
-Use ALLOCATE to expand the space.",
-	  "Continues execution.",
-	  2, vs_top[-2], vs_top[-1], Cnil, Cnil);
-
-  vs_popp;
-  vs_popp;
+  CEerror("Continues execution.",
+	  "The storage for ~A is exhausted. ~D pages allocated. Use ALLOCATE to expand the space.",
+	  2, type_name(t), make_fixnum(tm->tm_npage));
 
   call_after_gbc_hook(t);
 
diff --git a/o/array.c b/o/array.c
index 6ef9947..a16c012 100755
--- a/o/array.c
+++ b/o/array.c
@@ -211,14 +211,18 @@ DEFUN_NEW("ASET1", object, fSaset1, SI, 3, 3, NONE, OO, IO, OO,OO,(object x, fix
       break;
     case aet_bit:
       i +=  BV_OFFSET(x);
-    AGAIN_BIT: 
       ASSURE_TYPE(val,t_fixnum);
-      {int v = Mfix(val);
-       if (v == 0) CLEAR_BITREF(x,i);
-       else if (v == 1) SET_BITREF(x,i);
-       else {val= fSincorrect_type(val,sLbit);
-	     goto AGAIN_BIT;}
-       break;}
+      switch (Mfix(val)) {
+      case 0:
+	CLEAR_BITREF(x,i);
+	break;
+      case 1:
+	SET_BITREF(x,i);
+	break;
+      default:
+	TYPE_ERROR(val,sLbit);
+      }
+      break;
     case aet_fix:
       ASSURE_TYPE(val,t_fixnum);
       (x->fixa.fixa_self[i]) = Mfix(val);
diff --git a/o/utils.c b/o/utils.c
index 06a54fd..14e458c 100755
--- a/o/utils.c
+++ b/o/utils.c
@@ -169,20 +169,6 @@ Ifuncall_n(object fun,int n,...) {
 /*   return res; */
 /* } */
 
-object
-Icheck_one_type(object x, enum type t)
-{ if (x->d.t != t)
-    { return CEerror("Expected a ~a ","Supply right type",1,type_name(t),Cnil,Cnil,Cnil);
-    }
-  return x;
-}
-
-
-object
-fSincorrect_type(object val, object type)
-{ return CEerror("Got ~a,Expected a ~a","Supply a new one",1,val,type,Cnil,Cnil);
-}
-
 /* static void */
 /* Ineed_in_image(object (*foo) (/\* ??? *\/)) */
 /* {;} */
-- 
2.30.2