<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-18) unstable; urgency=medium

  * Version_2_6_15pre17

Gbp-Pq: Name Version_2_6_15pre17

diff --git a/git.tag b/git.tag
index 43276fcbe5590bac37c2f97984a6ee1b8e8012b7..e61f2690e3dcd08ace97c02843693bbb83eac791 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_6_15pre16"
+"Version_2_6_15pre17"

diff --git a/o/big.c b/o/big.c
index 0d1b4b968c0c5f881e46b498cd722dc5e15b191f..1364c78acdb6297cb4bb519ba341df6e9c16f911 100755 (executable)
--- a/o/big.c
+++ b/o/big.c
@@ -47,6 +47,7 @@ read.d: normalize_big_to_object
 #include <stdlib.h>
 #include <string.h>
 #include "include.h"
+#include "num_include.h"
 
 #ifdef STATIC_FUNCTION_POINTERS
 static void* alloc_relblock_static (size_t n) {return alloc_relblock (n);}

diff --git a/o/gprof.c b/o/gprof.c
index 9c2960f789250f0b287a012ca9526581399554db..3126c7e5592837df7aeaf7df4377c5be5ad737fd 100644 (file)
--- a/o/gprof.c
+++ b/o/gprof.c
@@ -7,10 +7,6 @@
 
 static unsigned long gprof_on;
 
-#ifdef DARWIN
-void _mcleanup() {}
-#endif
-
 DEFUN_NEW("MCLEANUP",object,fSmcleanup,SI,0,0,NONE,OO,OO,OO,OO,(void),"") {
 
   extern void _mcleanup(void);
@@ -25,6 +21,10 @@ DEFUN_NEW("MCLEANUP",object,fSmcleanup,SI,0,0,NONE,OO,OO,OO,OO,(void),"") {
 
 }
 
+#ifdef DARWIN
+void _mcleanup() {}
+#endif
+
 static inline int
 my_monstartup(unsigned long start,unsigned long end) {
 

diff --git a/o/main.c b/o/main.c
index 3dca37f569384f5eeda873933174c3513f32f4e7..2b76fd0e2b19420149d9ca70f331e84124045962 100755 (executable)
--- a/o/main.c
+++ b/o/main.c
@@ -516,7 +516,9 @@ which(const char *n,char *o) {
 static int ARGC;
 static char **ARGV;
 
+#ifdef CAN_UNRANDOMIZE_SBRK
 #include "unrandomize_headers.h"
+#endif
 
 int
 main(int argc, char **argv, char **envp) {
@@ -942,7 +944,7 @@ FFN(siLcatch_fatal)(int i) {
 
 LFD(siLreset_stack_limits)(void)
 {
-  long i=0;
+  volatile long i=0;
 
   check_arg(0);
   if(catch_fatal <0) catch_fatal=1;
@@ -965,8 +967,10 @@ LFD(siLreset_stack_limits)(void)
     ihs_limit = ihs_org + stack_multiple *  IHSSIZE;
   else
     error("can't reset ihs_limit");
-  if (cs_base==cs_org)
-    cs_org=(void *)&i;
+  if (cs_base==cs_org) {
+    i=(long)&i;
+    cs_org=(void *)i;
+  }
 #ifdef __ia64__
  {
    extern void * GC_save_regs_in_stack();