From f85d36fb38bb1d97b52bbd87c67a334e14a752b2 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jan 25 2021 04:13:14 +0000
Subject: Version 4.4a.


- Drop upstreamed -format, -params, -sigtrap, and -underlink patches.
- Add -lto-type patch to silence LTO warnings.
- Install libraries with upstream's choice of names and places.

---

diff --git a/bigloo-format.patch b/bigloo-format.patch
deleted file mode 100644
index c53fd9d..0000000
--- a/bigloo-format.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- api/avahi/src/Clib/bglavahi.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/avahi/src/Clib/bglavahi.c	2020-07-22 11:37:30.380107176 -0600
-@@ -482,7 +482,7 @@ AvahiStringList *
- bgl_avahi_list_to_string_list( obj_t p ) {
-    // MS: 28 feb 2017
-    // AvahiStringList *l = avahi_string_list_new( "", NULL );
--   AvahiStringList *l = avahi_string_list_new( 0L );
-+   AvahiStringList *l = avahi_string_list_new( NULL );
- 
-    while( PAIRP( p ) ) {
-       l = avahi_string_list_add( l, BSTRING_TO_STRING( CAR( p ) ) );
---- bde/bmem/lib/gchook.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ bde/bmem/lib/gchook.c	2020-07-22 11:45:57.602471427 -0600
-@@ -57,12 +57,12 @@ GC_collect_hook( int heapsz, long livesz
- 		  ((double)heapsz / (1024. * 1024.)),
- 		  ((double)livesz / (1024. * 1024.)) );
-       } else {
--	 fprintf( stderr, "gc %3lu: alloc size=%luKB, heap size=%dKB, live size=%ldKB, fun=%s\n",
-+	 fprintf( stderr, "gc %3lu: alloc size=%luKB, heap size=%dKB, live size=%ldKB, fun=%lu\n",
- 		  gc_number,
- 		  gc_alloc_size / 1024,
- 		  heapsz / 1024,
- 		  livesz / 1024,
--		  lf );
-+		  (unsigned long)lf );
-       }
-    }
-       
-@@ -104,7 +104,7 @@ GC_dump_gc_sexp( gc_info_t *i, FILE *f )
- /*---------------------------------------------------------------------*/
- static void
- GC_dump_gc_json( gc_info_t *i, FILE *f ) {
--   fprintf( f, "    { \"number\": %lu, \"alloc\": %lu, \"heap\": %lu, \"live\": %lu, \"lastfun\": %s, \"time\": %ld }",
-+   fprintf( f, "    { \"number\": %lu, \"alloc\": %lu, \"heap\": %lu, \"live\": %lu, \"lastfun\": %s, \"time\": %lld }",
- 	    i->number,
- 	    BMEMSIZE( i->alloc_size ),
- 	    i->heap_size,
---- comptime/Cc/exec.c.orig	2020-05-12 00:36:18.000000000 -0600
-+++ comptime/Cc/exec.c	2020-07-22 11:37:30.381107176 -0600
-@@ -332,7 +332,7 @@ extern "C"
- 									BSTRING_TO_STRING(BGl_za2shellza2z00zzengine_paramz00);
- 								BgL_arg1031z00_37 =
- 									execl(BgL_tmpz00_118, BgL_auxz00_120, BgL_auxz00_122,
--									BgL_auxz00_124, 0L);
-+									BgL_auxz00_124, NULL);
- 							}
- 							bgl_display_obj(BINT(BgL_arg1031z00_37), BgL_port1017z00_36);
- 						}
diff --git a/bigloo-java-signum.patch b/bigloo-java-signum.patch
index 3dd8fc9..3905380 100644
--- a/bigloo-java-signum.patch
+++ b/bigloo-java-signum.patch
@@ -1,6 +1,6 @@
---- runtime/Jlib/foreign.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/foreign.java	2020-10-20 08:32:49.261739204 -0600
-@@ -5536,20 +5536,36 @@ public final class foreign
+--- runtime/Jlib/foreign.java.orig	2020-11-17 08:34:27.658967218 -0700
++++ runtime/Jlib/foreign.java	2020-11-17 08:37:47.902577663 -0700
+@@ -5582,21 +5582,36 @@ public final class foreign
     //////
     public static final int PTR_ALIGNMENT = 2;
     public static final int SIGHUP = 1;
@@ -9,20 +9,18 @@
 +   public static final int SIGINT = 2;
 +   public static final int SIGQUIT = 3;
     public static final int SIGILL = 4;
--   public static final int SIGABRT = 5;
+    public static final int SIGTRAP = 5;
+    public static final int SIGABRT = 6;
 -   public static final int SIGKILL = 9;
 -   public static final int SIGFPE = 8;
-+   public static final int SIGTRAP = 5;
-+   public static final int SIGABRT = 6;
     public static final int SIGBUS = 7;
 +   public static final int SIGFPE = 8;
 +   public static final int SIGKILL = 9;
 +   public static final int SIGUSR1 = 10;
     public static final int SIGSEGV = 11;
--   public static final int SIGALRM = 14;
 +   public static final int SIGUSR2 = 12;
     public static final int SIGPIPE = 13;
-+   public static final int SIGALRM = 14;
+    public static final int SIGALRM = 14;
     public static final int SIGTERM = 15;
 -   public static final int SIGUSR1 = 16;
 -   public static final int SIGUSR2 = 17;
diff --git a/bigloo-javac.patch b/bigloo-javac.patch
index d497909..5220f65 100644
--- a/bigloo-javac.patch
+++ b/bigloo-javac.patch
@@ -1,44 +1,89 @@
---- api/ssl/src/Makefile.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/ssl/src/Makefile	2020-07-22 08:44:56.063609035 -0600
-@@ -90,22 +90,26 @@ INCLUDES	= $(C_SRC_DIR)/bglssl.h $(C_SRC
+--- api/pthread/src/Java/bglpthread.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ api/pthread/src/Java/bglpthread.java	2021-01-24 10:19:30.017962237 -0700
+@@ -123,7 +123,7 @@ public class bglpthread extends Thread {
+ 
+    // Yield the processor
+    public static int sched_yield() {
+-      yield();
++      Thread.yield();
+       return 0;
+    }
+    
+--- api/srfi18/src/Java/jthread.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ api/srfi18/src/Java/jthread.java	2021-01-24 10:19:59.402882259 -0700
+@@ -123,7 +123,7 @@ public class jthread extends Thread {
+ 
+    // Yield the processor
+    public static int sched_yield() {
+-      yield();
++      Thread.yield();
+       return 0;
+    }
+    
+--- api/ssl/src/Makefile.orig	2020-11-09 00:06:14.000000000 -0700
++++ api/ssl/src/Makefile	2021-01-24 10:21:22.369671180 -0700
+@@ -90,24 +90,44 @@ INCLUDES	= $(C_SRC_DIR)/bglssl.h $(C_SRC
  #*---------------------------------------------------------------------*/
  #*    Java objects                                                     */
  #*---------------------------------------------------------------------*/
--ifeq ($(JAVA_VERSION), 1.9)
-+ifeq ($(JAVA_VERSION), 1.11)
++ifeq ($(JAVA_VERSION), 14)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++else
++ifeq ($(JAVA_VERSION), 13)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++else
++ifeq ($(JAVA_VERSION), 12)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++else
++ifeq ($(JAVA_VERSION), 11)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++else
++ifeq ($(JAVA_VERSION), 10)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++else
+ ifeq ($(JAVA_VERSION), 1.9)
    JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
--else 
+ else 
 -  ifeq ($(JAVA_VERSION), 1.8)
-+else
-+  ifeq ($(JAVA_VERSION), 1.9)
-     JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
+-    JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
 -  else
 -    ifeq ($(JAVA_VERSION), 1.7)
-+  else 
-+    ifeq ($(JAVA_VERSION), 1.8)
-       JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-     else
+-      JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
+-    else
 -     ifeq ($(JAVA_VERSION), 1.6)
 -      JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
 -     else
 -      ifeq ($(JAVA_VERSION), 1.5)
-+      ifeq ($(JAVA_VERSION), 1.7)
-+        JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+      else
-+       ifeq ($(JAVA_VERSION), 1.6)
-         JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+       else
-+        ifeq ($(JAVA_VERSION), 1.5)
-+          JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+        endif
-+       endif
-       endif
+-        JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
+-      endif
 -     endif
-     endif
-   endif
+-    endif
+-  endif
++ifeq ($(JAVA_VERSION), 1.8)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++else
++ifeq ($(JAVA_VERSION), 1.7)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++else
++ifeq ($(JAVA_VERSION), 1.6)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++else
++ifeq ($(JAVA_VERSION), 1.5)
++  JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++endif
++endif
++endif
++endif
++endif
++endif
++endif
++endif
++endif
  endif
---- bde/jas/produce.scm.orig	2020-05-12 00:36:56.000000000 -0600
-+++ bde/jas/produce.scm	2020-07-22 09:47:40.827937200 -0600
+ 
+ #*---------------------------------------------------------------------*/
+--- bde/jas/produce.scm.orig	2020-11-09 00:07:31.000000000 -0700
++++ bde/jas/produce.scm	2021-01-24 10:18:58.958050998 -0700
 @@ -24,8 +24,8 @@
  					   fields methods attributes )
        (outshort outchan #xCAFE)
@@ -50,8 +95,8 @@
        (produce-pool outchan pool-size (reverse pool))
        (outshort outchan flags)
        (outshort outchan me)
---- comptime/Jas/produce.scm.orig	2020-05-12 00:35:36.000000000 -0600
-+++ comptime/Jas/produce.scm	2020-07-22 09:46:52.491912174 -0600
+--- comptime/Jas/produce.scm.orig	2020-11-09 00:06:14.000000000 -0700
++++ comptime/Jas/produce.scm	2021-01-24 10:18:58.959050996 -0700
 @@ -24,8 +24,8 @@
  					   fields methods attributes )
        (outshort outchan #xCAFE)
@@ -63,9 +108,20 @@
        (produce-pool outchan pool-size (reverse pool))
        (outshort outchan flags)
        (outshort outchan me)
---- configure.orig	2020-05-12 00:35:36.000000000 -0600
-+++ configure	2020-07-22 09:00:56.761684617 -0600
-@@ -108,7 +108,7 @@ zip=zip
+--- comptime/SawJvm/out.scm.orig	2020-11-09 00:06:14.000000000 -0700
++++ comptime/SawJvm/out.scm	2021-01-24 10:21:57.449582777 -0700
+@@ -473,7 +473,7 @@
+ (define (localvar me::jvm r b e id);
+    (with-access::rtl_reg r (type var)
+       (when (and (local? var) (local-user? var))
+-	 (let ( (user-name (symbol->string (local-id var)))
++	 (let ( (user-name (bigloo-mangle (symbol->string (local-id var))))
+ 		(type (compile-type me type)) )
+ 	    (code! me `(localvar ,b ,e ,user-name ,type ,id)) ))))
+ 
+--- configure.orig	2020-11-09 00:06:14.000000000 -0700
++++ configure	2021-01-24 10:23:54.802287045 -0700
+@@ -109,7 +109,7 @@ zip=zip
  jar="jar cmf"
  zflags=
  javac=javac
@@ -74,7 +130,7 @@
  java=java
  jflags=
  jvflags=-noverify
-@@ -3241,7 +3241,7 @@ if [ $action = "all" -o $action = "biglo
+@@ -3255,7 +3255,7 @@ if [ $action = "all" -o $action = "biglo
                                --jflags=$jflags \
                                --jvflags=$jvflags \
                                --javac=$javac \
@@ -83,18 +139,26 @@
                                --cpsep="$cpsep"` || exit 1
  
      if [ $jtest != 0 ]; then
-@@ -3252,7 +3252,9 @@ if [ $action = "all" -o $action = "biglo
+@@ -3266,7 +3266,17 @@ if [ $action = "all" -o $action = "biglo
      fi
  
      java_version=`$javac -version 2>&1 | head -n 1` || exit 1
 -    if $echo "$java_version" | grep "1.9" > /dev/null
-+    if $echo "$java_version" | grep "javac 11" > /dev/null
-+      then java_version=1.11
++    if $echo "$java_version" | grep "14." > /dev/null
++      then java_version=14
++    elif $echo "$java_version" | grep "13." > /dev/null
++      then java_version=13
++    elif $echo "$java_version" | grep "12." > /dev/null
++      then java_version=12
++    elif $echo "$java_version" | grep "11." > /dev/null
++      then java_version=11
++    elif $echo "$java_version" | grep "10." > /dev/null
++      then java_version=10
 +    elif $echo "$java_version" | grep "1.9" > /dev/null
        then java_version=1.9
      elif $echo "$java_version" | grep "1.8" > /dev/null
        then java_version=1.8
-@@ -4602,7 +4604,7 @@ if [ $action = "all" -o $action = "Makef
+@@ -4624,7 +4634,7 @@ if [ $action = "all" -o $action = "Makef
  
        if [ "$java_configured" = "no" ]; then
          $autoconfdir/javatest --java=$java --jflags=$jflags --jvflags=$jvflags \
@@ -103,8 +167,8 @@
  
          if [ $? != 0 ]; then
            $echo "*** ERROR:configure:Can't configure JVM back-end"
---- jigloo/jigloo.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ jigloo/jigloo.java	2020-07-22 10:30:42.286391732 -0600
+--- jigloo/jigloo.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ jigloo/jigloo.java	2021-01-24 10:18:58.961050990 -0700
 @@ -21,7 +21,7 @@ public abstract class jigloo {
     static PrintStream out = System.out;
     static int verbose = 0;
@@ -153,16 +217,16 @@
  	 }
  
  
---- jigloo/Makefile.orig	2020-05-12 00:35:36.000000000 -0600
-+++ jigloo/Makefile	2020-07-22 09:26:49.186010999 -0600
+--- jigloo/Makefile.orig	2020-11-09 00:06:14.000000000 -0700
++++ jigloo/Makefile	2021-01-24 10:18:58.961050990 -0700
 @@ -133,4 +133,4 @@ pop:
  #*     .java --> .class                                                */
  #*---------------------------------------------------------------------*/
  .java.class:
 -	@ $(JAVAC) $*.java
 +	@ $(JAVAC) $(JCFLAGS) $*.java
---- runtime/Jlib/cnst.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/cnst.java	2020-07-22 10:36:09.964671652 -0600
+--- runtime/Jlib/cnst.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/cnst.java	2021-01-24 10:18:58.962050987 -0700
 @@ -6,7 +6,7 @@ public class cnst extends obj
  {
    public final int value;
@@ -187,8 +251,47 @@
  
      final cnst result = new cnst( value );
  
---- runtime/Jlib/dlopen.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/dlopen.java	2020-07-22 10:43:05.940993891 -0600
+--- runtime/Jlib/date.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/date.java	2021-01-24 10:26:33.417887275 -0700
+@@ -21,7 +21,7 @@ public class date extends obj {
+       if( !istz ) {
+ 	 calendar = new GregorianCalendar( y, mon, d, h, min, s );
+ 	 final TimeZone tmz = calendar.getTimeZone();
+-	 timezone = -tmz.getRawOffset() / 1000;
++	 timezone = tmz.getOffset(calendar.getTimeInMillis()) / 1000;
+       } else {
+ 	 final TimeZone tmz = new SimpleTimeZone( 0, "UTC" );
+ 	 calendar = new GregorianCalendar( tmz );
+@@ -35,21 +35,21 @@ public class date extends obj {
+    public date( final long seconds ) {
+       calendar = new GregorianCalendar();
+       final Date d = new Date();
+-	 
+-      d.setTime( seconds * 1000 );
++      final long milliseconds = seconds * 1000;
++      d.setTime( milliseconds );
+       calendar.setTime( d );
+       final TimeZone tmz = calendar.getTimeZone();
+-      timezone = -tmz.getRawOffset() / 1000;
++      timezone = tmz.getOffset( milliseconds ) / 1000;
+    }
+    
+    public date( final long nseconds, boolean _b ) {
+       calendar = new GregorianCalendar();
+       final Date d = new Date();
+-	 
+-      d.setTime( nseconds / _b ? 1000000 : 1000 );
++      final long milliseconds = nseconds / 1000000;
++      d.setTime( milliseconds );
+       calendar.setTime( d );
+       final TimeZone tmz = calendar.getTimeZone();
+-      timezone = -tmz.getRawOffset() / 1000;
++      timezone = tmz.getOffset( milliseconds ) / 1000;
+       nsec = _b ? (nseconds % 1000000) : (nseconds % 1000);
+    }
+ }
+--- runtime/Jlib/dlopen.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/dlopen.java	2021-01-24 10:18:58.962050987 -0700
 @@ -22,7 +22,7 @@ import java.lang.reflect.*;
  public abstract class dlopen {
     private static final String NO_ERROR_YET = "No error (yet)";
@@ -207,9 +310,41 @@
  	    return res;
  	 } else {
  	    return foreign.BUNSPEC;
---- runtime/Jlib/foreign.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/foreign.java	2020-07-22 10:16:51.686856986 -0600
-@@ -5042,7 +5042,7 @@ public final class foreign
+--- runtime/Jlib/foreign.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/foreign.java	2021-01-24 11:44:12.623838942 -0700
+@@ -3537,17 +3537,17 @@ public final class foreign
+ 	 return new bigloo.date(ns, s, min, h, d, mon - 1, y, tz, istz, dst);
+       }
+ 
+-   public static date bgl_update_date(date, long ns, int s,
++   public static date bgl_update_date(date dt, long ns, int s,
+ 				      int min, int h, int d, int mon,
+ 				      int y, int tz, boolean istz, int dst)
+       {
+ 	 date tmp = bgl_make_date( ns, s, min, h, d, mon,
+ 				   y, tz, istz, dst);
+ 
+-	 date.nsec = tmp.nsec;
+-	 date.calendar = tmp.calendar;
+-	 date.timezone = tmp.timezone;
+-	 return date;
++	 dt.nsec = tmp.nsec;
++	 dt.calendar = tmp.calendar;
++	 dt.timezone = tmp.timezone;
++	 return dt;
+       }
+    
+ 
+@@ -3579,7 +3579,7 @@ public final class foreign
+ 	 return d;
+       }
+ 
+-   public static date bgl_milliseconds_to_date(long sec)
++   public static date bgl_milliseconds_to_utc_date(long sec)
+       {
+ 	 date d = new bigloo.date(sec * 1000000, true);
+ 	 d.calendar.setTimeZone(new SimpleTimeZone(0, "UTC"));
+@@ -5088,7 +5088,7 @@ public final class foreign
        throw v;
     }
  
@@ -218,8 +353,8 @@
  
     public static void notify_exception( Throwable e ) throws Throwable {
        if( e instanceof ClassCastException ) {
---- runtime/Jlib/JDK16.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/JDK16.java	2020-07-22 10:44:46.662058975 -0600
+--- runtime/Jlib/JDK16.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/JDK16.java	2021-01-24 10:18:58.963050984 -0700
 @@ -19,7 +19,7 @@ import java.lang.reflect.*;
  
  public class JDK16 extends JDK {
@@ -229,8 +364,8 @@
        return c.getDeclaredMethod( new String( m ) );
     }
     
---- runtime/Jlib/JDK.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/JDK.java	2020-07-22 10:45:53.375101536 -0600
+--- runtime/Jlib/JDK.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/JDK.java	2021-01-24 10:18:58.964050981 -0700
 @@ -49,8 +49,8 @@ public abstract class JDK {
  
     private static JDK getImpl(String classname) {
@@ -260,8 +395,8 @@
        throws Exception;
     
     public abstract Object invokeImpl(Method m) throws Exception;
---- runtime/Jlib/output_pipe_port.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/output_pipe_port.java	2020-07-22 10:50:31.999276401 -0600
+--- runtime/Jlib/output_pipe_port.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/output_pipe_port.java	2021-01-24 10:18:58.964050981 -0700
 @@ -42,7 +42,7 @@ public class output_pipe_port extends ou
  
     static String[] tokenizer( byte[] s ) {
@@ -280,8 +415,8 @@
     }
  
     static String[] make_cmd( byte[] s ) {
---- runtime/Jlib/process.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/process.java	2020-07-22 10:52:53.127363693 -0600
+--- runtime/Jlib/process.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/process.java	2021-01-24 10:18:58.964050981 -0700
 @@ -12,6 +12,7 @@ package bigloo;
  
  import java.io.IOException;
@@ -337,8 +472,8 @@
      }
      catch (InterruptedException _i)
      {
---- runtime/Jlib/weakptr.java.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Jlib/weakptr.java	2020-07-22 10:40:30.461880495 -0600
+--- runtime/Jlib/weakptr.java.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Jlib/weakptr.java	2021-01-24 10:18:58.964050981 -0700
 @@ -4,10 +4,10 @@ import java.lang.ref.WeakReference;
  
  
@@ -361,35 +496,43 @@
    }
  
    public void write( final output_port p ) {
---- runtime/Makefile.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Makefile	2020-07-22 08:47:40.480618313 -0600
-@@ -108,28 +108,32 @@ C_CLIB		= $(CLIB:%=Clib/%.c)
+--- runtime/Makefile.orig	2020-11-09 00:06:14.000000000 -0700
++++ runtime/Makefile	2021-01-24 10:28:05.481655201 -0700
+@@ -108,30 +108,51 @@ C_CLIB		= $(CLIB:%=Clib/%.c)
  #*    Java objects                                                     */
  #*---------------------------------------------------------------------*/
  JDK_LIBS	= JDK
--ifeq ($(JAVA_VERSION), 1.9)
-+ifeq ($(JAVA_VERSION), 1.11)
++
++ifeq ($(JAVA_VERSION), 14)
++  JDK_LIBS += JDK16
++else
++ifeq ($(JAVA_VERSION), 13)
++  JDK_LIBS += JDK16
++else
++ifeq ($(JAVA_VERSION), 12)
 +  JDK_LIBS += JDK16
 +else
-+  ifeq ($(JAVA_VERSION), 1.9)
-     JDK_LIBS += JDK16
-   else
-     ifeq ($(JAVA_VERSION), 1.8)
-       JDK_LIBS += JDK16
-     else
++ifeq ($(JAVA_VERSION), 11)
++  JDK_LIBS += JDK16
++else
++ifeq ($(JAVA_VERSION), 10)
++  JDK_LIBS += JDK16
++else
+ ifeq ($(JAVA_VERSION), 1.9)
+-    JDK_LIBS += JDK16
+-  else
+-    ifeq ($(JAVA_VERSION), 1.8)
+-      JDK_LIBS += JDK16
+-    else
 -    ifeq ($(JAVA_VERSION), 1.7)
 -      JDK_LIBS += JDK16
 -    else
 -      ifeq ($(JAVA_VERSION), 1.6)
-+      ifeq ($(JAVA_VERSION), 1.7)
-         JDK_LIBS += JDK16
+-        JDK_LIBS += JDK16
 -       else
 -        ifeq ($(JAVA_VERSION), 1.5)
 -          JDK_LIBS += JDK15
-+      else
-+        ifeq ($(JAVA_VERSION), 1.6)
-+          JDK_LIBS += JDK16
-         else
+-        else
 -         ifeq ($(JAVA_VERSION), 1.4)
 -           JDK_LIBS += JDK14
 -         else
@@ -397,17 +540,36 @@
 -         endif
 -       endif
 -     endif
-+          ifeq ($(JAVA_VERSION), 1.5)
-+            JDK_LIBS += JDK15
-+          else
-+            ifeq ($(JAVA_VERSION), 1.4)
-+              JDK_LIBS += JDK14
-+            else
-+              JDK_LIBS += JDK13
-+            endif
-+          endif
-+        endif
-+      endif
-     endif
-   endif
+-    endif
+-  endif
++  JDK_LIBS += JDK16
++else
++ifeq ($(JAVA_VERSION), 1.8)
++  JDK_LIBS += JDK16
++else
++ifeq ($(JAVA_VERSION), 1.7)
++  JDK_LIBS += JDK16
++else
++ifeq ($(JAVA_VERSION), 1.6)
++  JDK_LIBS += JDK16
++else
++ifeq ($(JAVA_VERSION), 1.5)
++  JDK_LIBS += JDK15
++else
++ifeq ($(JAVA_VERSION), 1.4)
++  JDK_LIBS += JDK14
++else
++  JDK_LIBS += JDK13
++endif
++endif
++endif
++endif
++endif
++endif
++endif
++endif
++endif
++endif
  endif
+ 
+ JLIB		= foreign buffer configure stackwriter\
diff --git a/bigloo-lto-type.patch b/bigloo-lto-type.patch
new file mode 100644
index 0000000..ffe7c43
--- /dev/null
+++ b/bigloo-lto-type.patch
@@ -0,0 +1,11 @@
+--- runtime/Include/bigloo_pair.h.orig	2020-05-12 00:35:36.000000000 -0600
++++ runtime/Include/bigloo_pair.h	2020-10-13 17:39:33.656637491 -0600
+@@ -60,7 +60,7 @@ struct bgl_epair {
+    obj_t car;       
+    obj_t cdr;
+    /* extended header type */
+-#if( (BGL_GC == BGL_BOEHM_GC) && TAG_PAIR )
++#if( TAG_PAIR )
+    obj_t eheader;
+ #endif   
+    /* extended slot */
diff --git a/bigloo-noreturn.patch b/bigloo-noreturn.patch
index fd9c325..19d3d02 100644
--- a/bigloo-noreturn.patch
+++ b/bigloo-noreturn.patch
@@ -1,5 +1,5 @@
---- api/alsa/src/Clib/bglalsa.h.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/alsa/src/Clib/bglalsa.h	2020-10-19 13:45:47.282624580 -0600
+--- api/alsa/src/Clib/bglalsa.h.orig	2020-11-14 10:40:25.000000000 -0700
++++ api/alsa/src/Clib/bglalsa.h	2020-11-17 08:12:37.850529435 -0700
 @@ -13,7 +13,7 @@
  
  #include <bigloo.h>
@@ -9,8 +9,8 @@
  
  extern int bgl_snd_pcm_close( obj_t );
  extern int bgl_snd_pcm_open( obj_t, char *, snd_pcm_stream_t, int );
---- runtime/Clib/capply.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/capply.c	2020-10-19 13:45:09.670642185 -0600
+--- runtime/Clib/capply.c.orig	2020-11-14 10:40:25.000000000 -0700
++++ runtime/Clib/capply.c	2020-11-17 08:12:37.851529434 -0700
 @@ -13,7 +13,7 @@
  /*---------------------------------------------------------------------*/
  /*    Les recuperations externes                                       */
@@ -20,10 +20,10 @@
  extern long bgl_list_length( obj_t );
  
  /*---------------------------------------------------------------------*/
---- runtime/Clib/cmain.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/cmain.c	2020-10-19 13:45:09.670642185 -0600
-@@ -40,7 +40,7 @@ extern void cref();
- extern void memshow();
+--- runtime/Clib/cmain.c.orig	2020-11-14 10:40:25.000000000 -0700
++++ runtime/Clib/cmain.c	2020-11-17 08:12:37.852529432 -0700
+@@ -40,7 +40,7 @@ extern obj_t cref( obj_t );
+ extern void memshow( char *, char *, long );
  extern void bgl_init_eval_cnst();
  extern obj_t c_constant_string_to_string( char * );
 -extern void c_error( char *, char *, int );
@@ -31,9 +31,9 @@
  extern void bgl_init_objects();
  extern obj_t bigloo_exit_apply( obj_t );
  extern void *bgl_callcc_get_top_of_stack( void * );
---- runtime/Clib/csocket.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/csocket.c	2020-10-19 13:45:09.672642184 -0600
-@@ -254,7 +254,7 @@ bgl_init_socket() {
+--- runtime/Clib/csocket.c.orig	2020-11-14 10:40:25.000000000 -0700
++++ runtime/Clib/csocket.c	2020-11-17 08:12:37.852529432 -0700
+@@ -253,7 +253,7 @@ bgl_init_socket() {
  /*    static void                                                      */
  /*    socket_error ...                                                 */
  /*---------------------------------------------------------------------*/
@@ -42,7 +42,7 @@
  socket_error( const char *who, const char *message, obj_t object ) {
     C_SYSTEM_FAILURE( BGL_IO_ERROR, (char *)who, (char *)message, object );
  }
-@@ -263,7 +263,7 @@ socket_error( const char *who, const cha
+@@ -262,7 +262,7 @@ socket_error( const char *who, const cha
  /*    static void                                                      */
  /*    socket_timeout_error ...                                         */
  /*---------------------------------------------------------------------*/
@@ -51,9 +51,9 @@
  socket_timeout_error( obj_t hostname, int port ) {
     char buffer[ 512 ];
     
---- runtime/Include/bigloo.h.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Include/bigloo.h	2020-10-19 13:45:09.673642183 -0600
-@@ -2307,7 +2307,7 @@ BGL_RUNTIME_DECL obj_t (*bgl_multithread
+--- runtime/Include/bigloo.h.orig	2020-11-14 10:40:26.000000000 -0700
++++ runtime/Include/bigloo.h	2020-11-17 08:12:37.853529430 -0700
+@@ -2321,7 +2321,7 @@ BGL_RUNTIME_DECL obj_t (*bgl_multithread
  /*---------------------------------------------------------------------*/
  /*    The external declarations                                        */
  /*---------------------------------------------------------------------*/
@@ -61,4 +61,4 @@
 +BGL_RUNTIME_DECL obj_t bigloo_exit( obj_t ) __attribute__((noreturn));
  
  BGL_RUNTIME_DECL obj_t va_generic_entry( obj_t, ... );
- BGL_RUNTIME_DECL obj_t opt_generic_entry( obj_t, ... );
+ BGL_RUNTIME_DECL obj_t bgl_va_stack_entry( obj_t, ... );
diff --git a/bigloo-params.patch b/bigloo-params.patch
deleted file mode 100644
index f8d98bc..0000000
--- a/bigloo-params.patch
+++ /dev/null
@@ -1,455 +0,0 @@
---- api/alsa/src/Clib/bglalsa.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/alsa/src/Clib/bglalsa.c	2020-10-14 15:54:06.353446963 -0600
-@@ -597,7 +597,7 @@ bgl_snd_devices_list( char *iface ) {
- /*    bgl_snd_rawmidi_isdir ...                                        */
- /*---------------------------------------------------------------------*/
- bool_t
--bgl_snd_rawmidi_isdir( obj_t o, int card, int device, int sub, int dir ) {
-+bgl_snd_rawmidi_isdir( obj_t o, int device, int sub, int dir ) {
-    snd_rawmidi_info_t *info;
-    int status;
- 
---- api/alsa/src/Clib/bglalsa.h.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/alsa/src/Clib/bglalsa.h	2020-10-14 15:53:37.185464700 -0600
-@@ -50,4 +50,6 @@ extern void bgl_snd_ctl_rawmidi_info_ini
- 
- extern int bgl_snd_mixer_open( obj_t );
- 
-+extern bool_t bgl_snd_rawmidi_isdir( obj_t, int, int, int );
-+
- #endif
---- api/avahi/src/Clib/bavahi.h.orig	1969-12-31 17:00:00.000000000 -0700
-+++ api/avahi/src/Clib/bavahi.h	2020-10-19 11:52:39.166653215 -0600
-@@ -0,0 +1,46 @@
-+/*=====================================================================*/
-+/*    serrano/prgm/project/bigloo/api/avahi/src/Clib/bavahi.h          */
-+/*    -------------------------------------------------------------    */
-+/*    Author      :  Manuel Serrano                                    */
-+/*    Creation    :  Wed Oct 14 12:42:13 2020                          */
-+/*    Last change :  Wed Oct 14 12:42:13 2020 (jjames)                 */
-+/*    Copyright   :  2020 Manuel Serrano                               */
-+/*    -------------------------------------------------------------    */
-+/*    External declarations for the Bigloo avahi binding               */
-+/*=====================================================================*/
-+
-+/* Forward references */
-+struct BgL_avahizd2simplezd2pollz00_bgl;
-+struct BgL_avahizd2threadedzd2pollz00_bgl;
-+struct BgL_avahizd2clientzd2_bgl;
-+struct BgL_avahizd2entryzd2groupz00_bgl;
-+struct BgL_avahizd2servicezd2browserz00_bgl;
-+struct BgL_avahizd2servicezd2typezd2browserzd2_bgl;
-+struct BgL_avahizd2domainzd2browserz00_bgl;
-+struct BgL_avahizd2servicezd2resolverz00_bgl ;
-+
-+extern void bgl_avahi_simple_poll_new( struct BgL_avahizd2simplezd2pollz00_bgl * );
-+extern void bgl_avahi_simple_poll_timeout( AvahiSimplePoll *, long, obj_t );
-+extern void bgl_avahi_simple_poll_close( struct BgL_avahizd2simplezd2pollz00_bgl * );
-+
-+extern void bgl_avahi_threaded_poll_new( struct BgL_avahizd2threadedzd2pollz00_bgl * );
-+extern void bgl_avahi_threaded_poll_timeout( AvahiThreadedPoll *, long, obj_t );
-+extern void bgl_avahi_threaded_poll_close( struct BgL_avahizd2threadedzd2pollz00_bgl * );
-+
-+extern void bgl_avahi_client_new( struct BgL_avahizd2clientzd2_bgl * );
-+extern void bgl_avahi_client_close( struct BgL_avahizd2clientzd2_bgl * );
-+
-+extern void bgl_avahi_entry_group_new( struct BgL_avahizd2entryzd2groupz00_bgl * );
-+extern void bgl_avahi_entry_group_close( struct BgL_avahizd2entryzd2groupz00_bgl * );
-+
-+extern void bgl_avahi_service_browser_new( struct BgL_avahizd2servicezd2browserz00_bgl * );
-+extern void bgl_avahi_service_browser_close( struct BgL_avahizd2servicezd2browserz00_bgl * );
-+
-+extern void bgl_avahi_service_type_browser_new( struct BgL_avahizd2servicezd2typezd2browserzd2_bgl * );
-+extern void bgl_avahi_service_type_browser_close( struct BgL_avahizd2servicezd2typezd2browserzd2_bgl * );
-+
-+extern void bgl_avahi_domain_browser_new( struct BgL_avahizd2domainzd2browserz00_bgl *, AvahiDomainBrowserType );
-+extern void bgl_avahi_domain_browser_close( struct BgL_avahizd2domainzd2browserz00_bgl * );
-+
-+extern void bgl_avahi_service_resolver_new( struct BgL_avahizd2servicezd2resolverz00_bgl * );
-+extern void bgl_avahi_service_resolver_close( struct BgL_avahizd2servicezd2resolverz00_bgl * );
---- api/avahi/src/Clib/bglavahi.c.orig	2020-07-22 11:37:30.380107176 -0600
-+++ api/avahi/src/Clib/bglavahi.c	2020-10-19 11:46:15.574230717 -0600
-@@ -22,11 +22,12 @@
- #include <avahi-common/timeval.h>
- 
- #include "bglavahi.h"
-+#include "bavahi.h"
- 
- /*---------------------------------------------------------------------*/
- /*    Imports                                                          */
- /*---------------------------------------------------------------------*/
--extern int bgl_avahi_error( char *, char *, obj_t, int );
-+extern obj_t bgl_avahi_error( char *, char *, obj_t, int );
- extern obj_t bgl_avahi_client_state_to_symbol( AvahiClientState );
- extern obj_t bgl_avahi_entry_group_state_to_symbol( AvahiEntryGroupState );
- extern obj_t bgl_avahi_protocol_to_symbol( AvahiProtocol );
---- api/avahi/src/Llib/avahi.sch.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/avahi/src/Llib/avahi.sch	2020-10-14 13:01:30.782265154 -0600
-@@ -21,6 +21,7 @@
-       (include "avahi-common/thread-watch.h")
-       (include "avahi-common/error.h")
-       (include "avahi-common/alternative.h")
-+      (include "bavahi.h")
- 
-       ;; misc
-       (macro $avahi-strerror::string
---- api/flac/src/Llib/flac.sch.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/flac/src/Llib/flac.sch	2020-10-14 13:13:59.543037526 -0600
-@@ -15,6 +15,7 @@
- (directives
-    (extern
-     (include "FLAC/stream_decoder.h")
-+    (include "pulse/error.h")
-     (include "bglflac.h")
-     
-     ;; misc
---- api/libuv/src/Clib/bgluv.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/libuv/src/Clib/bgluv.c	2020-10-14 14:35:37.483412294 -0600
-@@ -138,14 +138,14 @@ bgl_uv_timer_new( BgL_uvtimerz00_bglt o,
- /*    bgl_uv_timer_cb ...                                              */
- /*---------------------------------------------------------------------*/
- void
--bgl_uv_timer_cb( uv_handle_t *handle, char *path, int events, int status ) {
-+bgl_uv_timer_cb( uv_handle_t *handle ) {
-    bgl_uv_watcher_t o = (bgl_uv_watcher_t)handle->data;
-    obj_t p = ((bgl_uv_watcher_t)COBJECT( o ))->BgL_cbz00;
-    bgl_uv_loop_t l = ((BgL_uvwatcherz00_bglt)COBJECT( o ))->BgL_loopz00;
- 
-    bgl_uv_pop_gcmark( (bgl_uv_handle_t)l, (obj_t)o );
- 
--   if( PROCEDUREP( p ) ) PROCEDURE_ENTRY( p )( p, o, BINT( status ), BEOA );
-+   if( PROCEDUREP( p ) ) PROCEDURE_ENTRY( p )( p, o, BEOA );
- }
- 
- /*---------------------------------------------------------------------*/
---- api/libuv/src/Llib/timer.scm.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/libuv/src/Llib/timer.scm	2020-10-14 15:01:57.345096285 -0600
-@@ -41,7 +41,7 @@
-       ;; store in the loop for the GC
-       (uv-push-gcmark! loop o)
-       ;; force Bigloo to add the extern clause for bgl_uv_timer_cb
--      (when (uv-gcmarks-empty? loop) ($bgl_uv_timer_cb $uv_timer_nil 0))
-+      (when (uv-gcmarks-empty? loop) ($bgl_uv_timer_cb $uv_timer_nil))
-       ($uv_timer_start ($uv-timer-t $builtin) $BGL_UV_TIMER_CB t r)))
- 
- ;*---------------------------------------------------------------------*/
---- api/libuv/src/Llib/uv.sch.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/libuv/src/Llib/uv.sch	2020-10-14 14:40:47.331959975 -0600
-@@ -148,7 +148,7 @@
-       (macro $uv_timer_start::void (::$uv_timer_t ::$uv_timer_cb ::uint64 ::uint64) "uv_timer_start")
-       (macro $uv_timer_stop::void (::$uv_timer_t) "uv_timer_stop")
-       
--      ($bgl_uv_timer_cb::$uv_timer_cb (::$uv_timer_t ::int) "bgl_uv_timer_cb")
-+      ($bgl_uv_timer_cb::$uv_timer_cb (::$uv_timer_t) "bgl_uv_timer_cb")
-       (macro $BGL_UV_TIMER_CB::$uv_timer_cb "(uv_timer_cb)&bgl_uv_timer_cb")
- 
-       (macro $uv-hrtime::uint64 () "uv_hrtime")
---- api/libuv/src/Llib/uvtypes.scm.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/libuv/src/Llib/uvtypes.scm	2020-10-11 09:04:55.893336615 -0600
-@@ -160,7 +160,7 @@
- 	   (uv-strerror::bstring ::int)
- 	   (uv-err-name::bstring ::int)
- 
--	   (uv-handle-type-symbol ::int)
-+	   (uv-handle-type-symbol ::long)
- 	   (uv-guess-handle::symbol ::int)
- 	   (inline uv-push-gcmark! ::UvHandle o)
- 	   (uv-pop-gcmark! ::UvHandle o)
---- api/mpg123/src/Clib/bglmpg123.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/mpg123/src/Clib/bglmpg123.c	2020-10-14 16:48:25.377460368 -0600
-@@ -121,13 +121,14 @@ bgl_mpg123_position( mpg123_handle *m )
- /*    bgl_mpg123_info ...                                              */
- /*---------------------------------------------------------------------*/
- long
--bgl_mpg123_info( mpg123_handle *m ) {
-+bgl_mpg123_info( obj_t o ) {
-    struct mpg123_frameinfo mi;
-+   mpg123_handle *m = BGL_HANDLE_BUILTIN( o );
-    int err = mpg123_info( m, &mi );
-    obj_t env = BGL_CURRENT_DYNAMIC_ENV();
- 
-    if( err < 0 ) {
--      bgl_mpg123_error( "mpg123-info", mpg123_plain_strerror( err ), m );
-+      bgl_mpg123_error( "mpg123-info", mpg123_plain_strerror( err ), o );
-    }
- 
-    BGL_ENV_MVALUES_NUMBER_SET( env, 1 );
-@@ -159,14 +160,15 @@ bgl_mpg123_getvolume( mpg123_handle *m )
- /*    bgl_mpg123_getparam ...                                          */
- /*---------------------------------------------------------------------*/
- obj_t
--bgl_mpg123_getparam( mpg123_handle *m, enum mpg123_parms type ) {
-+bgl_mpg123_getparam( obj_t o, enum mpg123_parms type ) {
-    long val;
-    double fval;
-+   mpg123_handle *m = BGL_HANDLE_BUILTIN( o );
-    int err = mpg123_getparam( m, type, &val, &fval );
-    obj_t env = BGL_CURRENT_DYNAMIC_ENV();
- 
-    if( err < 0 ) {
--      bgl_mpg123_error( "mpg123-getparam", mpg123_plain_strerror( err ), m );
-+      bgl_mpg123_error( "mpg123-getparam", mpg123_plain_strerror( err ), o );
-    }
- 
-    BGL_ENV_MVALUES_NUMBER_SET( env, 1 );
---- api/mpg123/src/Clib/bglmpg123.h.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/mpg123/src/Clib/bglmpg123.h	2020-10-14 17:22:26.259714509 -0600
-@@ -11,12 +11,13 @@
- #ifndef BGL_LIBMPG123
- #define BGL_LIBMPG123
- 
--extern obj_t bgl_mpg123_error();
-+extern int bgl_mpg123_error(char *, char *, obj_t);
- extern obj_t bgl_mpg123_decoders();
- extern int bgl_mpg123_decode( obj_t, char *, long, long, char *, long );
- extern mpg123_handle *bgl_mpg123_new( const char * );
- extern long bgl_mpg123_getformat( mpg123_handle * );
--extern long bgl_mpg123_info( mpg123_handle * );
-+extern long bgl_mpg123_info( obj_t );
- extern double bgl_mpg123_getvolume( mpg123_handle * );
-+extern obj_t bgl_mpg123_getparam( obj_t, enum mpg123_parms );
- 
- #endif
---- api/mpg123/src/Llib/mpg123.sch.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/mpg123/src/Llib/mpg123.sch	2020-10-14 16:46:11.521410373 -0600
-@@ -71,13 +71,13 @@
-     ($bgl-mpg123-position::long
-        (::$mpg123-handle) "bgl_mpg123_position")
-     ($bgl-mpg123-info::long
--       (::$mpg123-handle) "bgl_mpg123_info")
-+       (::obj) "bgl_mpg123_info")
-     ($bgl-mpg123-getvolume::double
-        (::$mpg123-handle) "bgl_mpg123_getvolume")
-     ($bgl-mpg123-param::obj
-        (::$mpg123-handle ::$mpg123-params ::long ::double) "bgl_mpg123_param")
-     ($bgl-mpg123-getparam::obj
--       (::$mpg123-handle ::$mpg123-params) "bgl_mpg123_getparam")
-+       (::obj ::$mpg123-params) "bgl_mpg123_getparam")
- 
-     (macro $mpg123-new-format::int "MPG123_NEW_FORMAT")
-     (macro $mpg123-err::int "MPG123_ERR")
---- api/phidget/src/Clib/bglphidget.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/phidget/src/Clib/bglphidget.c	2020-10-14 15:27:14.722113894 -0600
-@@ -1655,7 +1655,7 @@ bgl_phidget_encoder_add_event_listener(
- /*    bgl_phidget_encoder_get_input_count ...                          */
- /*---------------------------------------------------------------------*/
- int
--bgl_phidget_encoder_get_input_count( CPhidgetEncoderHandle phid, int i, obj_t o ) {
-+bgl_phidget_encoder_get_input_count( CPhidgetEncoderHandle phid, obj_t o ) {
-   int err, count;
- 
-   err = CPhidgetEncoder_getInputCount( phid, &count);
-@@ -1669,7 +1669,7 @@ bgl_phidget_encoder_get_input_count( CPh
- /*    bgl_phidget_encoder_get_encoder_count ...                        */
- /*---------------------------------------------------------------------*/
- int
--bgl_phidget_encoder_get_encoder_count( CPhidgetEncoderHandle phid, int i, obj_t o ) {
-+bgl_phidget_encoder_get_encoder_count( CPhidgetEncoderHandle phid, obj_t o ) {
-   int err, count;
- 
-   err = CPhidgetEncoder_getEncoderCount( phid, &count);
---- api/phidget/src/Clib/bglphidget.h.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/phidget/src/Clib/bglphidget.h	2020-10-14 15:27:33.537092500 -0600
-@@ -42,6 +42,8 @@
- 
- extern void bgl_phidget_init();
- 
-+extern obj_t bgl_phidget_error(char *, int, obj_t);
-+
- extern int bgl_phidget_manager_add_event_listener(
-    CPhidgetManagerHandle, char *, obj_t, obj_t );
- 
-@@ -51,6 +53,8 @@ extern int bgl_phidget_phidget_add_event
- extern int bgl_phidget_ifkit_add_event_listener(
-    CPhidgetInterfaceKitHandle, char *, obj_t, obj_t );
- 
-+extern void bgl_phidget_invoke_callbacks(void);
-+
- extern obj_t bgl_phidget_event_error_new( obj_t, int, char * );
- extern obj_t bgl_phidget_event_attach_new( obj_t, CPhidgetHandle );
- extern obj_t bgl_phidget_event_detach_new( obj_t, CPhidgetHandle );
-@@ -81,6 +85,25 @@ extern obj_t bgl_phidget_get_device_type
- extern obj_t bgl_phidget_get_device_id( CPhidgetHandle );
- extern obj_t bgl_phidget_get_server_id( CPhidgetHandle );
- extern int bgl_phidget_get_serial_number( CPhidgetHandle );
-+extern int bgl_phidget_get_device_version( CPhidgetHandle );
-+
-+extern int bgl_phidget_spatial_add_event_listener( CPhidgetSpatialHandle,
-+						   char *, obj_t, obj_t );
-+extern int bgl_phidget_spatial_get_datarate( CPhidgetSpatialHandle, obj_t );
-+extern int bgl_phidget_spatial_get_datarate_min( CPhidgetSpatialHandle, obj_t );
-+extern int bgl_phidget_spatial_get_datarate_max( CPhidgetSpatialHandle, obj_t );
-+
-+extern int bgl_phidget_servo_get_motor_count( CPhidgetServoHandle, obj_t );
-+
-+extern int bgl_phidget_motor_control_add_event_listener(
-+   CPhidgetMotorControlHandle, char *, obj_t, obj_t );
-+
-+extern int bgl_phidget_encoder_add_event_listener( CPhidgetEncoderHandle,
-+						   char *, obj_t, obj_t );
-+extern void bgl_phidget_encoder_enable( CPhidgetEncoderHandle, int );
-+extern void bgl_phidget_encoder_disable( CPhidgetEncoderHandle, int );
-+extern int bgl_phidget_encoder_get_input_count( CPhidgetEncoderHandle, obj_t );
-+extern int bgl_phidget_encoder_get_encoder_count( CPhidgetEncoderHandle, obj_t );
- 
- /*---------------------------------------------------------------------*/
- /*    Bigloo functions                                                 */
---- api/phidget/src/Llib/pdgencoder.scm.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/phidget/src/Llib/pdgencoder.scm	2020-10-11 16:21:05.335315539 -0600
-@@ -106,11 +106,13 @@
- 
- (define (phidget-encoder-enable! e::phidget-encoder i::int)
-    (with-access::phidget e ($builtin)
--      ($pdg-phidget-encoder-enable! ($pdg-phidget->encoder $builtin) i)))
-+      ($pdg-phidget-encoder-enable! ($pdg-phidget->encoder $builtin) i))
-+   #t)
- 
- (define (phidget-encoder-disable! e::phidget-encoder i::int)
-    (with-access::phidget e ($builtin)
--      ($pdg-phidget-encoder-disable! ($pdg-phidget->encoder $builtin) i)))
-+      ($pdg-phidget-encoder-disable! ($pdg-phidget->encoder $builtin) i))
-+   #t)
- 
- ;*---------------------------------------------------------------------*/
- ;*    phidget-encoder-input-count ...                                  */
---- api/pulseaudio/src/Clib/bglpulseaudio.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/pulseaudio/src/Clib/bglpulseaudio.c	2020-10-14 12:03:50.105583273 -0600
-@@ -16,7 +16,7 @@
- /*---------------------------------------------------------------------*/
- /*    import                                                           */
- /*---------------------------------------------------------------------*/
--extern obj_t bgl_pulseaudio_error();
-+extern int bgl_pulseaudio_error(char *, char*, obj_t);
- 
- /*---------------------------------------------------------------------*/
- /*    pa_simple *                                                      */
---- runtime/Clib/callcc.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/callcc.c	2020-10-11 08:54:25.021246175 -0600
-@@ -27,7 +27,7 @@ extern long glob_dummy;
- extern obj_t make_fx_procedure( obj_t (*)(), int, int );
- extern obj_t c_constant_string_to_string( char * );
- 
--static obj_t callcc_restore_stack();
-+static obj_t callcc_restore_stack( obj_t, obj_t, char ** );
- extern obj_t unwind_stack_until( obj_t, obj_t, obj_t, obj_t );
- extern bool_t unwind_stack_value_p( obj_t );
- extern void *bgl_get_top_of_stack();
---- runtime/Clib/cerror.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/cerror.c	2020-10-11 08:54:25.021246175 -0600
-@@ -23,9 +23,8 @@ extern int errno;
- /*    Les recuperations externes                                       */
- /*---------------------------------------------------------------------*/
- #ifndef _MSC_VER
--extern void perror();
--extern char *strerror( int );
--extern void exit( int );
-+#include <stdio.h>
-+#include <stdlib.h>
- #endif
- extern obj_t bgl_typeof( obj_t );
- 
---- runtime/Clib/cinit_obj.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/cinit_obj.c	2020-10-11 08:54:25.022246175 -0600
-@@ -43,7 +43,7 @@ BGL_RUNTIME_DEF union nanobj bigloo_nan,
- /*---------------------------------------------------------------------*/
- /*    Importations                                                     */
- /*---------------------------------------------------------------------*/
--extern obj_t string_to_obj();
-+extern obj_t string_to_obj(obj_t, obj_t, obj_t);
- extern void bgl_init_dynamic_env();
- extern void bgl_init_symbol_table();
- extern void bgl_init_socket();
---- runtime/Clib/cmain.c.orig	2020-10-11 08:54:14.174246089 -0600
-+++ runtime/Clib/cmain.c	2020-10-11 08:54:25.022246175 -0600
-@@ -36,8 +36,8 @@ BGL_RUNTIME_DEF long heap_size = DEFAULT
- /*---------------------------------------------------------------------*/
- /*    imports                                                          */
- /*---------------------------------------------------------------------*/
--extern void cref();
--extern void memshow();
-+extern obj_t cref(obj_t);
-+extern void memshow( char *, char *, long );
- extern void bgl_init_eval_cnst();
- extern obj_t c_constant_string_to_string( char * );
- extern void c_error( char *, char *, int ) __attribute__((noreturn));
-@@ -49,7 +49,7 @@ extern void GC_set_all_interior_pointers
- extern obj_t bgl_signal( int, obj_t );
- 
- #ifndef _MSC_VER
--extern char *getenv();
-+#include <stdlib.h>
- #endif
- 
- /*---------------------------------------------------------------------*/
---- runtime/Clib/cpcre.h.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/cpcre.h	2020-10-11 08:55:11.932246547 -0600
-@@ -10,7 +10,7 @@
- /*=====================================================================*/
- #include <pcre.h>
- 
--extern obj_t make_string( int, unsigned char );
-+extern obj_t make_string( long, unsigned char );
- 
- static obj_t utf8_symbol = BUNSPEC;
- static obj_t javascript_symbol = BUNSPEC;
---- runtime/Clib/cports.c.orig	2020-10-11 08:54:07.526246036 -0600
-+++ runtime/Clib/cports.c	2020-10-11 08:54:25.022246175 -0600
-@@ -113,7 +113,7 @@
- /*---------------------------------------------------------------------*/
- #if( BGL_HAVE_SENDFILE )
- #  if( BGL_SENDFILE_BRAND == BGL_SENDFILE_LINUX )
--extern ssize_t sendfile( int, int, off_t *, size_t );
-+#    include <sys/sendfile.h>
- #    define BGL_SENDFILE sendfile
- #  else
- #    if( BGL_SENDFILE_BRAND == BGL_SENDFILE_BSD )
---- runtime/Clib/cprocess.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/cprocess.c	2020-10-11 08:54:25.022246175 -0600
-@@ -57,7 +57,7 @@ extern obj_t bgl_close_input_port( obj_t
- extern long  bgl_list_length( obj_t );
- extern char *bgl_string_to_gc_cstring( obj_t );
- extern obj_t string_to_bstring( char * );
--extern ssize_t bgl_syswrite( obj_t, char *, size_t );
-+extern ssize_t bgl_syswrite( obj_t, const void *, size_t );
- extern obj_t make_string_sans_fill( long );
- 
- /*---------------------------------------------------------------------*/
---- runtime/Clib/csocket.c.orig	2020-10-11 08:54:18.550246123 -0600
-+++ runtime/Clib/csocket.c	2020-10-11 08:54:25.023246175 -0600
-@@ -149,12 +149,11 @@ extern unsigned char bgl_get_hash_number
- extern bool_t bigloo_strcmp( obj_t o1, obj_t o2 );
- extern bool_t bgl_dns_enable_cache();
- extern long bgl_dns_cache_validity_timeout();
--extern ssize_t bgl_syswrite( obj_t, char *, size_t );
-+extern ssize_t bgl_syswrite( obj_t, const void *, size_t );
- extern obj_t make_string_sans_fill( long );
- 
- #ifndef _BGL_WIN32_VER
--extern int dup( int );
--extern int close( int );
-+#include <unistd.h>
- #endif
- 
- /*---------------------------------------------------------------------*/
---- runtime/Clib/inline_alloc.c.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Clib/inline_alloc.c	2020-10-11 08:54:25.023246175 -0600
-@@ -38,7 +38,7 @@ gcollect_verbose( unsigned long heapsz,
- GC_API void
- bgl_gc_verbose_set( bool_t verbose ) {
- #if( (BGL_GC == BGL_BOEHM_GC) && BGL_GC_CUSTOM )
--   extern void GC_add_gc_hook();
-+   extern void GC_add_gc_hook( void (*f)() );
-    
-    if( verbose ) {
-       fprintf( stderr, "bgl_gc_verbose on...\n" );
---- runtime/Include/bigloo_pair.h.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Include/bigloo_pair.h	2020-10-13 17:39:33.656637491 -0600
-@@ -60,7 +60,7 @@ struct bgl_epair {
-    obj_t car;       
-    obj_t cdr;
-    /* extended header type */
--#if( (BGL_GC == BGL_BOEHM_GC) && TAG_PAIR )
-+#if( TAG_PAIR )
-    obj_t eheader;
- #endif   
-    /* extended slot */
diff --git a/bigloo-sigtrap.patch b/bigloo-sigtrap.patch
deleted file mode 100644
index 1ae6544..0000000
--- a/bigloo-sigtrap.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- runtime/Llib/error.scm.orig	2020-05-12 00:35:36.000000000 -0600
-+++ runtime/Llib/error.scm	2020-10-21 08:34:08.098722737 -0600
-@@ -44,6 +44,7 @@
- 	    (macro sigill::int "SIGILL")
- 	    (macro sigabrt::int "SIGABRT")
- 	    (macro sigfpe::int "SIGFPE")
-+	    (macro sigtrap::int "SIGTRAP")
- 	    (macro sigkill::int "SIGKILL")
- 	    (macro sigbus::int "SIGBUS")
- 	    (macro sigsegv::int "SIGSEGV")
-@@ -120,6 +121,7 @@
- 	       (field static sigill::int "SIGILL")
- 	       (field static sigabrt::int "SIGABRT")
- 	       (field static sigfpe::int "SIGFPE")
-+	       (field static sigtrap::int "SIGTRAP")
- 	       (field static sigsegv::int "SIGSEGV")
- 	       (field static sigalrm::int "SIGALRM")
- 	       (field static sigbus::int "SIGBUS")
-@@ -1356,6 +1358,7 @@
- ;*    On installe le ratrappage des exceptions                         */
- ;*---------------------------------------------------------------------*/
- (signal sigfpe sigfpe-error-handler)
-+(signal sigtrap sigfpe-error-handler)
- (signal sigill sigill-error-handler)
- (signal sigbus sigbus-error-handler)
- (signal sigsegv sigsegv-error-handler)
---- runtime/objs/obj_s/Llib/error.c.orig	2020-05-12 00:36:05.000000000 -0600
-+++ runtime/objs/obj_s/Llib/error.c	2020-10-21 09:12:17.692049608 -0600
-@@ -663,6 +663,7 @@ obj_t BGl_toplevelzd2initzd2zz__errorz00
- {
- { /* Llib/error.scm 18 */
- BGl_signalz00zz__osz00(SIGFPE, BGl_sigfpezd2errorzd2handlerzd2envzd2zz__errorz00); 
-+BGl_signalz00zz__osz00(SIGTRAP, BGl_sigfpezd2errorzd2handlerzd2envzd2zz__errorz00);
- BGl_signalz00zz__osz00(SIGILL, BGl_sigillzd2errorzd2handlerzd2envzd2zz__errorz00); 
- BGl_signalz00zz__osz00(SIGBUS, BGl_sigbuszd2errorzd2handlerzd2envzd2zz__errorz00); 
- return 
---- runtime/objs/obj_u/Llib/error.c.orig	2020-05-12 00:35:57.000000000 -0600
-+++ runtime/objs/obj_u/Llib/error.c	2020-10-21 09:13:15.301987498 -0600
-@@ -1012,6 +1012,8 @@ extern "C"
- 		{	/* Llib/error.scm 18 */
- 			BGl_signalz00zz__osz00(SIGFPE,
- 				BGl_sigfpezd2errorzd2handlerzd2envzd2zz__errorz00);
-+			BGl_signalz00zz__osz00(SIGTRAP,
-+				BGl_sigfpezd2errorzd2handlerzd2envzd2zz__errorz00);
- 			BGl_signalz00zz__osz00(SIGILL,
- 				BGl_sigillzd2errorzd2handlerzd2envzd2zz__errorz00);
- 			BGl_signalz00zz__osz00(SIGBUS,
diff --git a/bigloo-underlink.patch b/bigloo-underlink.patch
deleted file mode 100644
index 92a040d..0000000
--- a/bigloo-underlink.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- api/avahi/src/Makefile.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/avahi/src/Makefile	2020-05-14 11:32:56.828004978 -0600
-@@ -47,9 +47,9 @@ CEFLAGS		=
- 
- # Additional pthread lib for C
- ifeq "$(AVAHILIBS) " " "
--EXTRALIBS	= 
-+EXTRALIBS	= $(PTHREADLIBS)
- else
--EXTRALIBS	= $(AVAHILIBS) $(GCCLOSELIB)
-+EXTRALIBS	= $(AVAHILIBS) $(GCCLOSELIB) $(PTHREADLIBS)
- EXTRALIBS_S	= -lbigloopthread_s-$(RELEASE)
- EXTRALIBS_U	= -lbigloopthread_u-$(RELEASE)
- endif
---- api/pkglib/src/Makefile.orig	2020-05-12 00:35:36.000000000 -0600
-+++ api/pkglib/src/Makefile	2020-05-14 11:32:56.829004976 -0600
-@@ -45,8 +45,8 @@ SPIFLAGS	=
- BMISCFLAGS	= -I Llib
- 
- # Extra libs
--EXTRALIBS_S	= -lbigloosqlite_s-$(RELEASE)
--EXTRALIBS_U	= -lbigloosqlite_u-$(RELEASE)
-+EXTRALIBS_S	= -lbigloosqlite_s-$(RELEASE) $(SQLITELIBS)
-+EXTRALIBS_U	= -lbigloosqlite_u-$(RELEASE) $(SQLITELIBS)
- 
- #*---------------------------------------------------------------------*/
- #*    Scheme extended objects                                          */
---- Makefile.misc.orig	2020-05-12 00:35:36.000000000 -0600
-+++ Makefile.misc	2020-05-14 11:32:56.831004970 -0600
-@@ -89,8 +89,8 @@ shared-install-name:
-                  $(OBJECTS) \
-                  $(GCSTDOBJECTS) \
-                  $(LDFLAGS) $(EXTRA_LD_OPT) \
--                 $(EXTRALIBS) $(CLOSELIBS) \
--                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) && \
-+                 $(CLOSELIBS) \
-+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
-          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
-            mv $(notdir $(LIBDEST)) $(LIBDEST); \
-          fi
-@@ -102,8 +102,8 @@ MS-CARE-shared-install-name:
-                  $(OBJECTS) \
-                  $(GCSTDOBJECTS) \
-                  $(LDFLAGS) $(EXTRA_LD_OPT) \
--                 $(EXTRALIBS) $(CLOSELIBS) \
--                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) && \
-+                 $(CLOSELIBS) \
-+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
-          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
-            mv $(notdir $(LIBDEST)) $(LIBDEST); \
-          fi
-@@ -113,9 +113,9 @@ shared-sans-soname:
-                  $(LDRPATH) \
-                  $(OBJECTS) \
-                  $(GCSTDOBJECTS) \
--                 $(LDFLAGS) \
--                 $(EXTRALIBS) $(CLOSELIBS) \
--                 $(LDLIBS) $(LDOPTS) $(EXTRA_LD_OPT) $(LDEXTRA) && \
-+                 $(LDFLAGS) $(EXTRA_LD_OPT) \
-+                 $(CLOSELIBS) \
-+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
-          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
-            mv $(notdir $(LIBDEST)) $(LIBDEST); \
-          fi
-@@ -127,8 +127,8 @@ shared-soname:
-                  $(OBJECTS) \
-                  $(GCSTDOBJECTS) \
-                  $(LDOPTS) $(EXTRA_LD_OPT) \
--                 $(EXTRALIBS) $(CLOSELIBS) \
--                 $(LDLIBS) $(LDFLAGS) $(LDEXTRA) && \
-+                 $(CLOSELIBS) \
-+                 $(LDLIBS) $(LDFLAGS) $(LDEXTRA) $(EXTRALIBS) && \
-          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
-            mv $(notdir $(LIBDEST)) $(LIBDEST); \
-          fi
diff --git a/bigloo.spec b/bigloo.spec
index 96a885c..8a809ad 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -22,42 +22,34 @@
 %global         bundledgc 8.0.4
 
 Name:           bigloo
-Version:        4.3h
-Release:        8%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
+Version:        4.4a
+Release:        1%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
 Summary:        A compiler for the Scheme programming language
 
 License:        GPLv2+
 URL:            http://www-sop.inria.fr/mimosa/fp/Bigloo
-Source0:        ftp://ftp-sop.inria.fr/indes/fp/Bigloo/%{name}%{version}%{?patch_suffix}%{?ver_suffix}.tar.gz
+Source0:        ftp://ftp-sop.inria.fr/indes/fp/Bigloo/%{name}-%{version}%{?patch_suffix}%{?ver_suffix}.tar.gz
 # Not yet sent upstream: fix some bugs in the Emacs interface, and also
 # modernizes the code somewhat.
 Patch0:         %{name}-emacs.patch
 # Not yet sent upstream.  Support 64-bit stat on 32-bit platforms.
 Patch1:         %{name}-stat64.patch
-# Sent upstream 3 Feb 2017: fix format specifiers
-Patch2:         %{name}-format.patch
 # Not yet sent upstream: add some noreturn attributes
-Patch3:         %{name}-noreturn.patch
+Patch2:         %{name}-noreturn.patch
 # Fix reading past the limits of a stack buffer
-Patch4:         %{name}-memread.patch
-# Fix declarations of function parameters, causes problems on big endian arches
-Patch5:         %{name}-params.patch
+Patch3:         %{name}-memread.patch
+# Make type declarations match, silences LTO warning
+Patch4:         %{name}-lto-type.patch
 # Make the test suite fail if individual tests fail
-Patch6:         %{name}-test.patch
+Patch5:         %{name}-test.patch
 # Round top of stack to a multiple of 1024.  Fixes stack overflow on s390x.
-Patch7:         %{name}-callcc.patch
-# Additional linkage for underlinked plugins
-Patch8:         %{name}-underlink.patch
+Patch6:         %{name}-callcc.patch
 # Adapt to Java 11
-Patch9:         %{name}-javac.patch
+Patch7:         %{name}-javac.patch
 # Add some missing return statements
-Patch10:        %{name}-return.patch
+Patch8:         %{name}-return.patch
 # Fix signal numbers in the Java code
-Patch11:        %{name}-java-signum.patch
-# GCC can detect that certain operations are illegal and replace them with a
-# trap instruction.  However, this changes the signal from SIGFPE to SIGTRAP.
-# This patch catches SIGTRAP and runs the SIGFPE handler.
-Patch12:        %{name}-sigtrap.patch
+Patch9:         %{name}-java-signum.patch
 
 BuildRequires:  emacs
 BuildRequires:  xemacs
@@ -67,7 +59,8 @@ BuildRequires:  gcc-c++
 BuildRequires:  gmp-devel
 BuildRequires:  indent
 BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-tools
+BuildRequires:  libtool
 BuildRequires:  libunistring-devel
 BuildRequires:  make
 BuildRequires:  pkgconfig
@@ -145,29 +138,19 @@ environment.
 %autosetup -p0 -n %{name}-%{version}%{?patch_suffix}
 
 # encoding fixes
-for f in README.md examples/Socket/socket.scm manuals/bigloo*.html; do
+for f in README.md examples/Socket/socket.scm; do
   iconv -f ISO8859-1 -t UTF8 $f | sed 's/=ISO-8859-1/=UTF-8/' > $f.utf8
   touch -r $f $f.utf8
   mv -f $f.utf8 $f
 done
 
-# libraries need an SONAME of the form .so.0, not .so
-sed -i 's/sharedsuffix=so/sharedsuffix=so.0/g' configure
-sed -i 's/-Wl,\$soname/-Wl,-soname/' autoconf/ldsoname
-mkdir -p lib/bigloo/%{version}
-pushd lib/bigloo/%{version}
-# need these links, so that the linker finds the libraries
-ln -sf libbigloo_u-%{version}.so.0 libbigloo_u-%{version}.so
-ln -sf libbigloo_s-%{version}.so.0 libbigloo_s-%{version}.so
-popd
-
 # correct examples Makefiles for installation
 find examples -name Makefile -print0 | xargs -0 \
      sed -i 's|include.*Makefile.config|include %{_libdir}/bigloo/%{version}/Makefile.config|g'
 
 # fix missing linkage
 %if %{without customgc}
-sed -i 's/^extralibs="-lm"/extralibs="-lgc -lm"/' configure
+sed -i 's/^extralibs="-lm -lc"/extralibs="-lgc -lm -lc"/' configure
 sed -i 's/LDOPTS=\"/&-Wl,--as-needed -lgc /' Makefile.misc
 %endif
 
@@ -179,6 +162,16 @@ sed -i 's/fcfa-arithmetic/& -rm/' configure
 sed -i 's/no-hello/& -rm/' bdb/bdb/Makefile
 sed -i 's/-O2/& -rm/' cigloo/Makefile
 
+# The 4.4a release omits a Java definition of $date-is-gmt, leading to build
+# failure.  Patching date.scm leads to bigloo attempting to regenerate the C
+# files, with bigloo, before the bigloo binary is built, leading to build
+# failure.  Instead, we use sed to insert the missing definition, then
+# carefully put the timestamp back the way we found it.  We don't want the C
+# files to be regenerated, because this affects Java only.
+sed -i.orig 's/method.*ISDST.*/&\n\t       (method static $date-is-gmt::bool (::date) "BGL_DATE_ISGMT")/' runtime/Llib/date.scm
+touch -r runtime/Llib/date.scm.orig runtime/Llib/date.scm
+rm runtime/Llib/date.scm.orig
+
 %build
 %define inplace $PWD/inplace
 
@@ -238,32 +231,17 @@ chmod -R o+r .
 %install
 mkdir -p %{buildroot}%{_emacs_sitelispdir}/bigloo
 mkdir -p %{buildroot}%{_xemacs_sitelispdir}/bigloo
-env LD_LIBRARY_PATH=$PWD/lib/bigloo/%{version} \
-    make DESTDIR=%{buildroot} INSTALL="cp -a" install
+env LD_LIBRARY_PATH=$PWD/lib/bigloo/%{version} %make_install
 env LD_LIBRARY_PATH=$PWD/lib/bigloo/%{version} \
     make DESTDIR=%{buildroot} EMACSDIR=%{_emacs_sitelispdir}/bigloo install-bee
 make -C manuals DESTDIR=%{buildroot} install-bee
 
+# Remove empty directory
+rmdir %{buildroot}%{_libdir}/pkgconfig
+
 # fix permissions
 chmod 755 %{buildroot}%{_bindir}/*
-
-# move libraries to proper place
-# and rename them to conform to SONAME
-pushd %{buildroot}%{_libdir}
-chmod 755 bigloo/%{version}/*.so.0
-rm -f *.so.0
-mv bigloo/%{version}/*.so.0 .
-for f in *.so.0
-do
-    mv $f ${f%%.so.0}.so.0.0.0
-    ln -sf ${f%%.so.0}.so.0.0.0 $f
-    ln -sf $f ${f%%.so.0}.so
-done
-cd bigloo/%{version}
-ln -sf ../../*.so .
-ln -sf ../../*.so.0 .
-ln -sf ../../*.so.0.0.0 .
-popd
+find %{buildroot}%{_libdir} -name \*.so -exec chmod 755 {} \+
 
 # move jigloo to the proper place
 mkdir %{buildroot}%{_javadir}
@@ -280,8 +258,7 @@ sed -e 's|^BOOTDIR=.*|BOOTDIR=%{_prefix}|g' \
     -i %{buildroot}%{_libdir}/bigloo/%{version}/Makefile.config
 sed -e 's|%{buildroot}||g' -i %{buildroot}%{_bindir}/*.sh
 
-rm -fr %{buildroot}%{_infodir}/dir
-rm -fr %{buildroot}%{_datadir}/doc
+rm -fr %{buildroot}%{_infodir}/dir %{buildroot}%{_datadir}/doc
 
 # emacs
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
@@ -327,8 +304,6 @@ make test
 %files
 %{_bindir}/*
 %{_javadir}/jigloo.class
-%{_libdir}/bigloo
-%{_libdir}/lib*.so
 %{_infodir}/*
 %{_mandir}/man*/*
 %{_emacs_sitelispdir}/bigloo/
@@ -336,12 +311,12 @@ make test
 %{_xemacs_sitelispdir}/bigloo/
 %{_xemacs_sitestartdir}/bigloo.el
 %{_xemacs_sitepkgdir}/etc/bigloo/
-%doc Makefile.config examples
+%doc ChangeLog Makefile.config examples
 %doc README*
 
 
 %files libs
-%{_libdir}/lib*.so.0*
+%{_libdir}/bigloo/
 %license LICENSE COPYING
 
 
@@ -351,6 +326,12 @@ make test
 
 
 %changelog
+* Sat Jan 23 2021 Jerry James <loganjerry@gmail.com> - 4.4a-1
+- Version 4.4a
+- Drop upstreamed -format, -params, -sigtrap, and -underlink patches
+- Add -lto-type patch to silence LTO warnings
+- Install libraries with upstream's choice of names and places
+
 * Wed Oct 21 2020 Jerry James <loganjerry@gmail.com> - 4.3h-8
 - Re-enable LTO on aarch64 and ppc64le
 - Improve the -emacs patch
diff --git a/sources b/sources
index 28c2c40..e280560 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bigloo4.3h.tar.gz) = 0f2277c6c3e5d6acfad2d9651c6024d5cffdc2283eb6394ad2067cb8f5611f7ebf893c27cb1f1fe5f89beedb4952c897af12cc9dec5d9f641cdba97f76d34dbc
+SHA512 (bigloo-4.4a.tar.gz) = 7025dfb865a8cef182fb506accf42186df02232a3a94142f7fef5b01ecedbd5e8e48e80abc2dc0bcee215fb2bc961adde5930913ae41d557958f2403c0f9877f