<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.12-50) unstable; urgency=medium

  * list_order.6

Gbp-Pq: Name defined_real_maxpage

diff --git a/h/386-gnu.h b/h/386-gnu.h
index 7c23da6d5dca524223a8fbd601bd7f1fac486eb8..da78e8335b54bcd58976b3b36878e692b36d7141 100755 (executable)
--- a/h/386-gnu.h
+++ b/h/386-gnu.h
@@ -59,3 +59,5 @@
 #define RELOC_H "elf32_i386_reloc.h"
 
 #define NEED_STACK_CHK_GUARD
+
+#define DEFINED_REAL_MAXPAGE (1UL<<18) /*FIXME brk probe broken*/

diff --git a/h/m68k-linux.h b/h/m68k-linux.h
index 79af62a39a6c743e3bcbad8f17b30204c4e7c932..5d115ccf8f4c56f2ef2b569b9d269bca69a08223 100755 (executable)
--- a/h/m68k-linux.h
+++ b/h/m68k-linux.h
@@ -78,3 +78,5 @@ int cacheflush(void *,int,int,int);
 #define RELOC_H "elf32_m68k_reloc.h"
 
 #define NEED_STACK_CHK_GUARD
+
+#define DEFINED_REAL_MAXPAGE (1UL<<18) /*FIXME brk probe broken*/

diff --git a/h/sh4-linux.h b/h/sh4-linux.h
index 4ee9a042ac09f58c2cbca69a177f66a9d8455ea6..70fc83b2deb0e22187383ee061488949c0adc981 100755 (executable)
--- a/h/sh4-linux.h
+++ b/h/sh4-linux.h
@@ -56,3 +56,5 @@
 #define RELOC_H "elf32_sh4_reloc.h"
 
 #define NEED_STACK_CHK_GUARD
+
+#define DEFINED_REAL_MAXPAGE (1UL<<18) /*FIXME brk probe broken*/

diff --git a/o/main.c b/o/main.c
index 9b10de42f370b52297a0761d5b2e6070dbb350d9..995d31f38ede3461b3994602f5622ddbd9380b08 100755 (executable)
--- a/o/main.c
+++ b/o/main.c
@@ -302,6 +302,9 @@ update_real_maxpage(void) {
   }
 #endif
 
+#ifdef DEFINED_REAL_MAXPAGE
+  real_maxpage=DEFINED_REAL_MAXPAGE;
+#else
   massert(cur=sbrk(0));
   beg=data_start ? data_start : cur;
   for (i=0,j=(1L<<log_maxpage_bound);j>PAGESIZE;j>>=1)
@@ -311,7 +314,8 @@ update_real_maxpage(void) {
        i+=j;
       }
   massert(!mbrk(cur));
-
+#endif
+  
   phys_pages=ufmin(get_phys_pages1(0)+page(beg),real_maxpage)-page(beg);
 
   get_gc_environ();