<short summary of the patch>

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.14-19) unstable; urgency=medium

  * Version_2_6_15pre18

Gbp-Pq: Name Version_2_6_15pre18

diff --git a/configure b/configure
index ce6fb3875d9b7b06b0e8cc8c1c58d3f01dbfad1a..224d2b05a68c2b5744afe23141d35b2054c26733 100755 (executable)
--- a/configure
+++ b/configure
@@ -4550,7 +4550,7 @@ add_args_to_cflags  -fsigned-char -pipe -fcommon \
                    -std=gnu17 \
                    -Wall \
                    -Wno-builtin-requires-header -Wno-empty-body -Wno-self-assign \
-                   -Wno-unused-but-set-variable
+                   -Wno-unused-but-set-variable -Wno-tautological-compare
 
 add_args_to_ldflags -no-pie # -Wl,-z,lazy
 
@@ -6571,7 +6571,7 @@ printf "%s\n" "$ac_cv_sizeof_time_t" >&6; }
 printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h
 
 
-if test "$use" != "mingw" ; then
+if test "$use" != "mingw" && test "$use" != "386-gnu" ; then
    if test "$ac_cv_sizeof_time_t" != "8" ; then
       as_fn_error $? "Cannot define a 64 bit time_t" "$LINENO" 5
    fi
@@ -6941,9 +6941,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
-if test "$use" = "386-macosx" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: emulating sbrk for mac" >&5
-printf "%s\n" "emulating sbrk for mac" >&6; };
+if test "$use" = "386-macosx" || test "$use" = "386-gnu" || test "$use" = "gnuwin95" || test "$use" = "mingw" ; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: special sbrk handling" >&5
+printf "%s\n" "special sbrk handling" >&6; };
     HAVE_SBRK=0
 fi
 

diff --git a/configure.in b/configure.in
index 2eca41067a75acd4de073f583658bc8d2821ae74..2cc8264fae4fbcb55ed2787c9a66a358d378f8dd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -261,7 +261,7 @@ add_args_to_cflags  -fsigned-char -pipe -fcommon \
                    -std=gnu17 \
                    -Wall \
                    -Wno-builtin-requires-header -Wno-empty-body -Wno-self-assign \
-                   -Wno-unused-but-set-variable
+                   -Wno-unused-but-set-variable -Wno-tautological-compare
 
 add_args_to_ldflags -no-pie # -Wl,-z,lazy
 
@@ -959,7 +959,7 @@ fi
 AC_CHECK_HEADERS([time.h sys/time.h])
 
 AC_CHECK_SIZEOF(time_t,[0],[#include <time.h>])
-if test "$use" != "mingw" ; then
+if test "$use" != "mingw" && test "$use" != "386-gnu" ; then
    if test "$ac_cv_sizeof_time_t" != "8" ; then
       AC_MSG_ERROR([Cannot define a 64 bit time_t])
    fi
@@ -1121,8 +1121,8 @@ AC_RUN_IFELSE(
     AC_MSG_RESULT([no: WARNING you must be able to emulate sbrk: as on mingw or macosx]),
     AC_MSG_RESULT([no: WARNING you must be able to emulate sbrk: as on mingw or macosx]))
 
-if test "$use" = "386-macosx" ; then
-    AC_MSG_RESULT([emulating sbrk for mac]);
+if test "$use" = "386-macosx" || test "$use" = "386-gnu" || test "$use" = "gnuwin95" || test "$use" = "mingw" ; then
+    AC_MSG_RESULT([special sbrk handling]);
     HAVE_SBRK=0
 fi
 

diff --git a/git.tag b/git.tag
index e61f2690e3dcd08ace97c02843693bbb83eac791..ae0d68f31080810f3a09bf8a138099f4f0373258 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_6_15pre17"
+"Version_2_6_15pre18"

diff --git a/h/386-gnu.h b/h/386-gnu.h
index 522ee5b5dd62eda02a2d254202ef2ce47b96b50a..98ea038325e57514370cb83d154f9440717155d7 100755 (executable)
--- a/h/386-gnu.h
+++ b/h/386-gnu.h
@@ -62,7 +62,7 @@
 
 #undef HAVE_D_TYPE /*FIXME defined, but not implemented in readdir*/
 /* #define NO_FILE_LOCKING */ /*FIXME*/
-
+#define ROUNDUP(x_,y_) (((unsigned long)(x_)+(y_ -1)) & ~(y_ -1))/*FIXME double eval*/
 #define INITIALIZE_BRK                                                 \
   massert(!brk(gcl_alloc_initialized ? core_end :                      \
               ({extern ufixnum _end;(void *)ROUNDUP((ufixnum)&_end,PAGESIZE);})))

diff --git a/o/alloc.c b/o/alloc.c
index 2f76ad1f4aac86d6995728255b3903a3b2770f11..df097fc9cc9acc1902d67bddbd624c2fac041e73 100644 (file)
--- a/o/alloc.c
+++ b/o/alloc.c
@@ -120,8 +120,12 @@ expand_contblock_array(void) {
 static void
 contblock_array_push(void *p) {
 
+  ufixnum f=contblock_array==Cnil ? 0 : contblock_array->v.v_fillp;/*FIXME*/
+
   expand_contblock_array();
-  contblock_array->v.v_self[contblock_array->v.v_fillp]=p;
+  memmove(contblock_array->v.v_self+f+1,contblock_array->v.v_self+f,
+         (contblock_array->v.v_fillp-f)*sizeof(*contblock_array->v.v_self));
+  contblock_array->v.v_self[f]=p;
   contblock_array->v.v_fillp++;
 
 }

diff --git a/o/main.c b/o/main.c
index 2b76fd0e2b19420149d9ca70f331e84124045962..a6f767de5f4a27979468cd2bbbed2242eebe1349 100755 (executable)
--- a/o/main.c
+++ b/o/main.c
@@ -1251,7 +1251,7 @@ init_main(void) {
   
 }
 
-#ifdef HAVE_DIS_ASM_H
+#if defined(HAVE_DIS_ASM_H) && defined(OUTPUT_ARCH)
 
 #include "dis-asm.h"