[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: make for emacs fails under OS X 10.5
From: |
YAMAMOTO Mitsuharu |
Subject: |
Re: make for emacs fails under OS X 10.5 |
Date: |
Mon, 29 Oct 2007 08:26:29 +0900 |
User-agent: |
Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.8 (Shijō) APEL/10.6 Emacs/23.0.50 (sparc-sun-solaris2.8) MULE/5.0 (SAKAKI) |
>>>>> On Sat, 27 Oct 2007 18:10:11 -0400, Steffen Heise <steffen_heise@mac.com>
>>>>> said:
> make fails with the following error message:
> Assertion failed: (filesize <= ranges->size), function
> unexec_regions_recorder, file unexmacosx.c, line 454.
> make[1]: *** [emacs] Abort trap
> make[1]: *** Deleting file `emacs'
> make: *** [src] Error 2
Could you try the following patch? I can't test it myself as I don't
have Leopard yet.
YAMAMOTO Mitsuharu
mituharu@math.s.chiba-u.ac.jp
Index: src/unexmacosx.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/unexmacosx.c,v
retrieving revision 1.22.2.1
diff -c -p -r1.22.2.1 unexmacosx.c
*** src/unexmacosx.c 25 Jul 2007 05:15:30 -0000 1.22.2.1
--- src/unexmacosx.c 28 Oct 2007 23:16:01 -0000
*************** unexec_regions_recorder (task_t task, vo
*** 443,457 ****
while (num && num_unexec_regions < MAX_UNEXEC_REGIONS)
{
! /* Subtract the size of trailing null pages from filesize. It
can be smaller than vmsize in segment commands. In such a
! case, trailing pages are initialized with zeros. */
! for (p = ranges->address + ranges->size; p > ranges->address;
! p -= sizeof (int))
! if (*(((int *) p)-1))
break;
! filesize = ROUNDUP_TO_PAGE_BOUNDARY (p - ranges->address);
! assert (filesize <= ranges->size);
unexec_regions[num_unexec_regions].filesize = filesize;
unexec_regions[num_unexec_regions++].range = *ranges;
--- 443,455 ----
while (num && num_unexec_regions < MAX_UNEXEC_REGIONS)
{
! /* Subtract the size of trailing null bytes from filesize. It
can be smaller than vmsize in segment commands. In such a
! case, trailing bytes are initialized with zeros. */
! for (p = ranges->address + ranges->size; p > ranges->address; p--)
! if (*(((char *) p)-1))
break;
! filesize = p - ranges->address;
unexec_regions[num_unexec_regions].filesize = filesize;
unexec_regions[num_unexec_regions++].range = *ranges;