| 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-18) unstable; urgency=medium |
| 9 |
. |
| 10 |
* Version_2_6_15pre17 |
| 11 |
Author: Camm Maguire <[email protected]> |
| 12 |
|
| 13 |
--- |
| 14 |
The information above should follow the Patch Tagging Guidelines, please |
| 15 |
checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here |
| 16 |
are templates for supplementary fields that you might want to add: |
| 17 |
|
| 18 |
Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>) |
| 19 |
Bug: <upstream-bugtracker-url> |
| 20 |
Bug-Debian: https://bugs.debian.org/<bugnumber> |
| 21 |
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> |
| 22 |
Forwarded: (no|not-needed|<patch-forwarded-url>) |
| 23 |
Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>) |
| 24 |
Reviewed-By: <name and email of someone who approved/reviewed the patch> |
| 25 |
Last-Update: 2025-03-07 |
| 26 |
|
| 27 |
--- gcl-2.6.14.orig/git.tag |
| 28 |
+++ gcl-2.6.14/git.tag |
| 29 |
@@ -1 +1 @@ |
| 30 |
-"Version_2_6_15pre16" |
| 31 |
+"Version_2_6_15pre17" |
| 32 |
--- gcl-2.6.14.orig/o/big.c |
| 33 |
+++ gcl-2.6.14/o/big.c |
| 34 |
@@ -47,6 +47,7 @@ read.d: normalize_big_to_object |
| 35 |
#include <stdlib.h> |
| 36 |
#include <string.h> |
| 37 |
#include "include.h" |
| 38 |
+#include "num_include.h" |
| 39 |
|
| 40 |
#ifdef STATIC_FUNCTION_POINTERS |
| 41 |
static void* alloc_relblock_static (size_t n) {return alloc_relblock (n);} |
| 42 |
--- gcl-2.6.14.orig/o/gprof.c |
| 43 |
+++ gcl-2.6.14/o/gprof.c |
| 44 |
@@ -7,10 +7,6 @@ |
| 45 |
|
| 46 |
static unsigned long gprof_on; |
| 47 |
|
| 48 |
-#ifdef DARWIN |
| 49 |
-void _mcleanup() {} |
| 50 |
-#endif |
| 51 |
- |
| 52 |
DEFUN_NEW("MCLEANUP",object,fSmcleanup,SI,0,0,NONE,OO,OO,OO,OO,(void),"") { |
| 53 |
|
| 54 |
extern void _mcleanup(void); |
| 55 |
@@ -25,6 +21,10 @@ DEFUN_NEW("MCLEANUP",object,fSmcleanup,S |
| 56 |
|
| 57 |
} |
| 58 |
|
| 59 |
+#ifdef DARWIN |
| 60 |
+void _mcleanup() {} |
| 61 |
+#endif |
| 62 |
+ |
| 63 |
static inline int |
| 64 |
my_monstartup(unsigned long start,unsigned long end) { |
| 65 |
|
| 66 |
--- gcl-2.6.14.orig/o/main.c |
| 67 |
+++ gcl-2.6.14/o/main.c |
| 68 |
@@ -516,7 +516,9 @@ which(const char *n,char *o) { |
| 69 |
static int ARGC; |
| 70 |
static char **ARGV; |
| 71 |
|
| 72 |
+#ifdef CAN_UNRANDOMIZE_SBRK |
| 73 |
#include "unrandomize_headers.h" |
| 74 |
+#endif |
| 75 |
|
| 76 |
int |
| 77 |
main(int argc, char **argv, char **envp) { |
| 78 |
@@ -942,7 +944,7 @@ FFN(siLcatch_fatal)(int i) { |
| 79 |
|
| 80 |
LFD(siLreset_stack_limits)(void) |
| 81 |
{ |
| 82 |
- long i=0; |
| 83 |
+ volatile long i=0; |
| 84 |
|
| 85 |
check_arg(0); |
| 86 |
if(catch_fatal <0) catch_fatal=1; |
| 87 |
@@ -965,8 +967,10 @@ LFD(siLreset_stack_limits)(void) |
| 88 |
ihs_limit = ihs_org + stack_multiple * IHSSIZE; |
| 89 |
else |
| 90 |
error("can't reset ihs_limit"); |
| 91 |
- if (cs_base==cs_org) |
| 92 |
- cs_org=(void *)&i; |
| 93 |
+ if (cs_base==cs_org) { |
| 94 |
+ i=(long)&i; |
| 95 |
+ cs_org=(void *)i; |
| 96 |
+ } |
| 97 |
#ifdef __ia64__ |
| 98 |
{ |
| 99 |
extern void * GC_save_regs_in_stack(); |