From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steffen Heise Newsgroups: gmane.emacs.bugs Subject: Re: make for emacs fails under OS X 10.5 Date: Tue, 30 Oct 2007 20:37:53 -0400 Message-ID: References: <93DF8565-CAA3-4D03-949D-2B8BF6C5B812@mac.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v912) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1193791101 15725 80.91.229.12 (31 Oct 2007 00:38:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 31 Oct 2007 00:38:21 +0000 (UTC) Cc: bug-gnu-emacs@gnu.org To: YAMAMOTO Mitsuharu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 31 01:38:23 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 1In1bC-0008NZ-Sk for geb-bug-gnu-emacs@m.gmane.org; Wed, 31 Oct 2007 01:38:23 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1In1b1-0003No-38 for geb-bug-gnu-emacs@m.gmane.org; Tue, 30 Oct 2007 20:38:11 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1In1au-0003K2-VQ for bug-gnu-emacs@gnu.org; Tue, 30 Oct 2007 20:38:05 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1In1as-0003CV-2l for bug-gnu-emacs@gnu.org; Tue, 30 Oct 2007 20:38:04 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1In1ar-0003C8-SW for bug-gnu-emacs@gnu.org; Tue, 30 Oct 2007 20:38:01 -0400 Original-Received: from smtpoutm.mac.com ([17.148.16.69]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1In1aq-0007ls-Tr for bug-gnu-emacs@gnu.org; Tue, 30 Oct 2007 20:38:01 -0400 Original-Received: from mac.com (asmtp002-s [10.150.69.65]) by smtpoutm.mac.com (Xserve/smtpout006/MantshX 4.0) with ESMTP id l9V0bwJm008867; Tue, 30 Oct 2007 17:37:58 -0700 (PDT) Original-Received: from [10.0.1.200] (c-68-40-198-201.hsd1.mi.comcast.net [68.40.198.201]) (authenticated bits=0) by mac.com (Xserve/asmtp002/MantshX 4.0) with ESMTP id l9V0bst2001368 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 30 Oct 2007 17:37:55 -0700 (PDT) In-Reply-To: X-Mailer: Apple Mail (2.912) X-detected-kernel: by monty-python.gnu.org: FreeBSD 4.8-5.1 (or MacOS X 10.2-10.3) 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:16876 Archived-At: Everything seems to be working fine. Thanks, Steffen On Oct 29, 2007, at 7:17 PM, 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 "); > }