| 1 |
Description: <short summary of the patch> |
| 2 |
TODO: Put a short summary on the line above and replace this paragraph |
| 3 |
with a longer explanation of this change. Complete the meta-information |
| 4 |
with other relevant fields (see below for details). To make it easier, the |
| 5 |
information below has been extracted from the changelog. Adjust it or drop |
| 6 |
it. |
| 7 |
. |
| 8 |
gcl (2.6.14-17) unstable; urgency=medium |
| 9 |
. |
| 10 |
* Version_2_6_15pre16 |
| 11 |
* Bug fix: "ftbfs with GCC-15", thanks to Matthias Klose (Closes: |
| 12 |
#1096684). |
| 13 |
* Bug fix: "outdated debconf version constraint; inhibits support for |
| 14 |
debconf-2.0/cdebconf", thanks to Gioele Barabucci (Closes: #1096165). |
| 15 |
Author: Camm Maguire <[email protected]> |
| 16 |
Bug-Debian: https://bugs.debian.org/1096165 |
| 17 |
Bug-Debian: https://bugs.debian.org/1096684 |
| 18 |
|
| 19 |
--- |
| 20 |
The information above should follow the Patch Tagging Guidelines, please |
| 21 |
checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here |
| 22 |
are templates for supplementary fields that you might want to add: |
| 23 |
|
| 24 |
Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>) |
| 25 |
Bug: <upstream-bugtracker-url> |
| 26 |
Bug-Debian: https://bugs.debian.org/<bugnumber> |
| 27 |
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> |
| 28 |
Forwarded: (no|not-needed|<patch-forwarded-url>) |
| 29 |
Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>) |
| 30 |
Reviewed-By: <name and email of someone who approved/reviewed the patch> |
| 31 |
Last-Update: 2025-03-07 |
| 32 |
|
| 33 |
--- gcl-2.6.14.orig/configure |
| 34 |
+++ gcl-2.6.14/configure |
| 35 |
@@ -4547,6 +4547,7 @@ printf "%s\n" "removing $1 from LDFLAGS" |
| 36 |
add_args_to_cflags -fsigned-char -pipe -fcommon \ |
| 37 |
-fno-builtin-malloc -fno-builtin-free \ |
| 38 |
-fno-PIE -fno-pie -fno-PIC -fno-pic \ |
| 39 |
+ -std=gnu17 \ |
| 40 |
-Wall \ |
| 41 |
-Wno-builtin-requires-header -Wno-empty-body -Wno-self-assign \ |
| 42 |
-Wno-unused-but-set-variable |
| 43 |
--- gcl-2.6.14.orig/configure.in |
| 44 |
+++ gcl-2.6.14/configure.in |
| 45 |
@@ -258,6 +258,7 @@ remove_arg_from_ldflags() { |
| 46 |
add_args_to_cflags -fsigned-char -pipe -fcommon \ |
| 47 |
-fno-builtin-malloc -fno-builtin-free \ |
| 48 |
-fno-PIE -fno-pie -fno-PIC -fno-pic \ |
| 49 |
+ -std=gnu17 \ |
| 50 |
-Wall \ |
| 51 |
-Wno-builtin-requires-header -Wno-empty-body -Wno-self-assign \ |
| 52 |
-Wno-unused-but-set-variable |
| 53 |
--- gcl-2.6.14.orig/git.tag |
| 54 |
+++ gcl-2.6.14/git.tag |
| 55 |
@@ -1 +1 @@ |
| 56 |
-"Version_2_6_15pre15" |
| 57 |
+"Version_2_6_15pre16" |
| 58 |
--- gcl-2.6.14.orig/h/386-gnu.h |
| 59 |
+++ gcl-2.6.14/h/386-gnu.h |
| 60 |
@@ -54,11 +54,15 @@ |
| 61 |
#endif |
| 62 |
#define PATH_MAX 4096 /*fixme dynamic*/ |
| 63 |
#define MAXPATHLEN 4096 /*fixme dynamic*/ |
| 64 |
-#define MAX_BRK 0x70000000 /*GNU Hurd fragmentation bug*/ |
| 65 |
+/* #define MAX_BRK 0x70000000 */ /*GNU Hurd fragmentation bug*/ |
| 66 |
|
| 67 |
#define RELOC_H "elf32_i386_reloc.h" |
| 68 |
|
| 69 |
#define NEED_STACK_CHK_GUARD |
| 70 |
|
| 71 |
#undef HAVE_D_TYPE /*FIXME defined, but not implemented in readdir*/ |
| 72 |
-#define NO_FILE_LOCKING /*FIXME*/ |
| 73 |
+/* #define NO_FILE_LOCKING */ /*FIXME*/ |
| 74 |
+ |
| 75 |
+#define INITIALIZE_BRK \ |
| 76 |
+ massert(!brk(gcl_alloc_initialized ? core_end : \ |
| 77 |
+ ({extern ufixnum _end;(void *)ROUNDUP((ufixnum)&_end,PAGESIZE);}))) |
| 78 |
--- gcl-2.6.14.orig/h/mach64_i386_reloc.h |
| 79 |
+++ gcl-2.6.14/h/mach64_i386_reloc.h |
| 80 |
@@ -6,7 +6,7 @@ |
| 81 |
case X86_64_RELOC_UNSIGNED: // for absolute addresses |
| 82 |
|
| 83 |
if (ri->r_extern || !ri->r_pcrel) |
| 84 |
- add_val(q,~0L,ri->r_pcrel ? a-rel : a); |
| 85 |
+ store_val(q,~0L,ri->r_pcrel ? a-rel : a); |
| 86 |
|
| 87 |
break; |
| 88 |
case X86_64_RELOC_GOT_LOAD: // a MOVQ load of a GOT entry |
| 89 |
--- gcl-2.6.14.orig/o/alloc.c |
| 90 |
+++ gcl-2.6.14/o/alloc.c |
| 91 |
@@ -1266,6 +1266,10 @@ gcl_init_alloc(void *cs_start) { |
| 92 |
|
| 93 |
#endif |
| 94 |
|
| 95 |
+#ifdef INITIALIZE_BRK |
| 96 |
+ INITIALIZE_BRK; |
| 97 |
+#endif |
| 98 |
+ |
| 99 |
update_real_maxpage(); |
| 100 |
|
| 101 |
if (gcl_alloc_initialized) { |
| 102 |
--- gcl-2.6.14.orig/o/gmp_big.c |
| 103 |
+++ gcl-2.6.14/o/gmp_big.c |
| 104 |
@@ -461,7 +461,7 @@ integer_quotient_remainder_1(object x, o |
| 105 |
|
| 106 |
if (type_of(x)==t_fixnum && type_of(y)==t_fixnum) { |
| 107 |
fixnum fx=fix(x),fy=fix(y); |
| 108 |
- if (fx!=-fx) {/*MOST_NEGATIVE_FIX*/ |
| 109 |
+ if (fx!=MOST_NEGATIVE_FIX) { |
| 110 |
if (qp) { |
| 111 |
fixnum z=fixnum_div(fx,fy,d); |
| 112 |
if (rp) *rp=make_fixnum(fx-fy*z); |
| 113 |
--- gcl-2.6.14.orig/o/sfaslmacho.c |
| 114 |
+++ gcl-2.6.14/o/sfaslmacho.c |
| 115 |
@@ -65,14 +65,6 @@ store_val(ul *w,ul m,ul v) { |
| 116 |
|
| 117 |
} |
| 118 |
|
| 119 |
-static int |
| 120 |
-add_val(ul *w,ul m,ul v) { |
| 121 |
- |
| 122 |
- return store_val(w,m,v+(*w&m)); |
| 123 |
- |
| 124 |
-} |
| 125 |
- |
| 126 |
- |
| 127 |
#ifndef _LP64 |
| 128 |
/*redirect trampolines gcc-4.0 gives no reloc for stub sections on x86 only*/ |
| 129 |
static int |