From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: astro951 Newsgroups: gmane.emacs.bugs Subject: Re: make for emacs fails under OS X 10.5 Date: Tue, 30 Oct 2007 21:13:54 -0700 (PDT) Message-ID: <13502507.post@talk.nabble.com> References: <93DF8565-CAA3-4D03-949D-2B8BF6C5B812@mac.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1193816577 4238 80.91.229.12 (31 Oct 2007 07:42:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 31 Oct 2007 07:42:57 +0000 (UTC) To: Bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 31 08:43:00 2007 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1In8E7-0004FC-Nj for geb-bug-gnu-emacs@m.gmane.org; Wed, 31 Oct 2007 08:43:00 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1In8Dy-0007LD-7Z for geb-bug-gnu-emacs@m.gmane.org; Wed, 31 Oct 2007 03:42:50 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1In4xr-0003ou-Fa for bug-gnu-emacs@gnu.org; Wed, 31 Oct 2007 00:13:59 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1In4xq-0003iF-93 for Bug-gnu-emacs@gnu.org; Wed, 31 Oct 2007 00:13:58 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1In4xo-0003hb-MU for Bug-gnu-emacs@gnu.org; Wed, 31 Oct 2007 00:13:56 -0400 Original-Received: from kuber.nabble.com ([216.139.236.158]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1In4xo-0004UG-6s for Bug-gnu-emacs@gnu.org; Wed, 31 Oct 2007 00:13:56 -0400 Original-Received: from isper.nabble.com ([192.168.236.156]) by kuber.nabble.com with esmtp (Exim 4.63) (envelope-from ) id 1In4xm-0000bJ-SI for Bug-gnu-emacs@gnu.org; Tue, 30 Oct 2007 21:13:54 -0700 In-Reply-To: X-Nabble-From: brian.stalder@gmail.com X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) X-Mailman-Approved-At: Wed, 31 Oct 2007 03:42:44 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:16878 This patch works for me running Leopard on a mini Core Duo, Macbook Pro C2D, and Mac Pro. YAMAMOTO Mitsuharu 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 > 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 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 "); > } > > > > -- View this message in context: http://www.nabble.com/make-for-emacs-fails-under-OS-X-10.5-tf4705159.html#a13502507 Sent from the Emacs - Bugs mailing list archive at Nabble.com.