From: naan <kazuho@gmail.com>
To: bug-gnu-emacs@gnu.org
Subject: Re: make for emacs fails under OS X 10.5
Date: Tue, 30 Oct 2007 08:04:28 -0000 [thread overview]
Message-ID: <1193731468.773433.34810@q5g2000prf.googlegroups.com> (raw)
In-Reply-To: <mailman.2736.1193699874.18990.bug-gnu-emacs@gnu.org>
I tried this patch with my Intel Mac and it works well so far.
Thanks,
On Oct 29, 4:17 pm, YAMAMOTO Mitsuharu <mituh...@math.s.chiba-u.ac.jp>
wrote:
> This patch seems to work. I've tested it only on PPC as I don't have
> multiple licenses for Leopard. Could you report the result if you
> have Leopard on Intel Mac?
>
> YAMAMOTO Mitsuharu
> mituh...@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 29 Oct 2007 23:09:00 -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;
> *************** unexec_regions_merge ()
> *** 503,513 ****
> --- 501,519 ----
> {
> int i, n;
> unexec_region_info r;
> + vm_size_t padsize;
>
> qsort (unexec_regions, num_unexec_regions, sizeof (unexec_regions[0]),
> &unexec_regions_sort_compare);
> n = 0;
> r = unexec_regions[0];
> + padsize = r.range.address & (pagesize - 1);
> + if (padsize)
> + {
> + r.range.address -= padsize;
> + r.range.size += padsize;
> + r.filesize += padsize;
> + }
> for (i = 1; i < num_unexec_regions; i++)
> {
> if (r.range.address + r.range.size == unexec_regions[i].range.address
> *************** unexec_regions_merge ()
> *** 520,525 ****
> --- 526,542 ----
> {
> unexec_regions[n++] = r;
> r = unexec_regions[i];
> + padsize = r.range.address & (pagesize - 1);
> + if (padsize)
> + {
> + if ((unexec_regions[n-1].range.address
> + + unexec_regions[n-1].range.size) == r.range.address)
> + unexec_regions[n-1].range.size -= padsize;
> +
> + r.range.address -= padsize;
> + r.range.size += padsize;
> + r.filesize += padsize;
> + }
> }
> }
> unexec_regions[n++] = r;
> *************** print_load_command_name (int lc)
> *** 562,567 ****
> --- 579,589 ----
> case LC_TWOLEVEL_HINTS:
> printf ("LC_TWOLEVEL_HINTS");
> break;
> + #ifdef LC_UUID
> + case LC_UUID:
> + printf ("LC_UUID ");
> + break;
> + #endif
> default:
> printf ("unknown ");
> }
next prev parent reply other threads:[~2007-10-30 8:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-27 22:10 make for emacs fails under OS X 10.5 Steffen Heise
2007-10-28 23:26 ` YAMAMOTO Mitsuharu
2007-10-29 0:25 ` Steffen Heise
2007-10-29 0:35 ` Steffen Heise
2007-10-29 12:11 ` YAMAMOTO Mitsuharu
2007-10-29 23:17 ` YAMAMOTO Mitsuharu
2007-10-31 0:37 ` Steffen Heise
2007-10-31 4:13 ` astro951
[not found] ` <mailman.2736.1193699874.18990.bug-gnu-emacs@gnu.org>
2007-10-30 8:04 ` naan [this message]
2007-11-01 11:49 ` slewsys
2007-11-02 8:09 ` William Xu
[not found] ` <mailman.2874.1193991012.18990.bug-gnu-emacs@gnu.org>
2007-11-02 15:42 ` Ted Zlatanov
2007-11-03 4:46 ` William Xu
[not found] ` <mailman.2922.1194065238.18990.bug-gnu-emacs@gnu.org>
2007-11-05 19:14 ` Ted Zlatanov
2007-11-05 21:09 ` Ted Zlatanov
2007-11-06 8:27 ` William Xu
2007-11-06 8:37 ` Richard Stallman
[not found] ` <mailman.3031.1194338257.18990.bug-gnu-emacs@gnu.org>
2007-11-06 19:18 ` Ted Zlatanov
2007-11-06 23:26 ` Glenn Morris
[not found] ` <mailman.3062.1194391599.18990.bug-gnu-emacs@gnu.org>
2007-11-07 5:28 ` Ted Zlatanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1193731468.773433.34810@q5g2000prf.googlegroups.com \
--to=kazuho@gmail.com \
--cc=bug-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.