From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Fabrice Popineau Newsgroups: gmane.emacs.bugs Subject: bug#17622: 24.4.50; bootstrap failure Date: Thu, 29 May 2014 16:24:12 +0200 Message-ID: References: <53872A40.3020000@cornell.edu> <53874183.4070003@cornell.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=047d7bd752660c93e504fa8ab077 X-Trace: ger.gmane.org 1401373526 28846 80.91.229.3 (29 May 2014 14:25:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 29 May 2014 14:25:26 +0000 (UTC) Cc: 17622 <17622@debbugs.gnu.org>, Katsumi Yamaoka To: Ken Brown Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 29 16:25:17 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Wq1Ge-00062r-LH for geb-bug-gnu-emacs@m.gmane.org; Thu, 29 May 2014 16:25:16 +0200 Original-Received: from localhost ([::1]:48488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wq1Ge-0002AN-7W for geb-bug-gnu-emacs@m.gmane.org; Thu, 29 May 2014 10:25:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wq1GW-000200-Dx for bug-gnu-emacs@gnu.org; Thu, 29 May 2014 10:25:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wq1GQ-0000tq-Qv for bug-gnu-emacs@gnu.org; Thu, 29 May 2014 10:25:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wq1GQ-0000sj-Na for bug-gnu-emacs@gnu.org; Thu, 29 May 2014 10:25:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Wq1GP-0008O0-JO for bug-gnu-emacs@gnu.org; Thu, 29 May 2014 10:25:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Fabrice Popineau Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 29 May 2014 14:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17622 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17622-submit@debbugs.gnu.org id=B17622.140137348932215 (code B ref 17622); Thu, 29 May 2014 14:25:01 +0000 Original-Received: (at 17622) by debbugs.gnu.org; 29 May 2014 14:24:49 +0000 Original-Received: from localhost ([127.0.0.1]:36151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wq1G9-0008NR-6t for submit@debbugs.gnu.org; Thu, 29 May 2014 10:24:49 -0400 Original-Received: from mail-ie0-f172.google.com ([209.85.223.172]:65166) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wq1G3-0008N4-4i for 17622@debbugs.gnu.org; Thu, 29 May 2014 10:24:43 -0400 Original-Received: by mail-ie0-f172.google.com with SMTP id tp5so345294ieb.31 for <17622@debbugs.gnu.org>; Thu, 29 May 2014 07:24:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=mJgQe5HIWOmNAcFWQ7qrbXKmuIKO2rvnO6+B1wA6lB4=; b=okZxnUARxnqTn0dNhhH61CeffzeXBLPb5hFihv/bnV2hEzPbUgufBVW5ZVU8juscCd GoQKscJIM/mDgyV7NvHcvs8KuB2eYoYuWvVf46rZQtEilugGxnTQaA+YTHUcPNwOajD2 4X0UVQvpdAhEhjXzo6688o1D5llVTn0csiWrAKquMlOXVavOthzC6IP5cGR0dvXuCWhn i3i1wnMavt5onG3nOG9Yi1CUl5Jrb1Sy37afJCBA+x+A0ulk872BGhMkurgWcdywXAF2 9mypEm2Yr4Cfh772cSQx96nCDDZoVPFU9uPKEbw6nSUNd5dLE3fsb7utWogyp0mlibWA WBsw== X-Received: by 10.50.20.8 with SMTP id j8mr10846427ige.17.1401373472885; Thu, 29 May 2014 07:24:32 -0700 (PDT) Original-Received: by 10.64.10.202 with HTTP; Thu, 29 May 2014 07:24:12 -0700 (PDT) In-Reply-To: <53874183.4070003@cornell.edu> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:89676 Archived-At: --047d7bd752660c93e504fa8ab077 Content-Type: text/plain; charset=UTF-8 Thanks, albeit I missed the obvious. === modified file 'src/buffer.c' --- src/buffer.c 2014-05-27 17:31:17 +0000 +++ src/buffer.c 2014-05-29 14:22:37 +0000 @@ -4703,11 +4703,6 @@ static int mmap_fd; -/* Temporary storage for mmap_set_vars, see there. */ - -static struct mmap_region *mmap_regions_1; -static int mmap_fd_1; - /* Page size on this system. */ static int mmap_page_size; @@ -5282,6 +5277,10 @@ { struct buffer *b; +#ifndef WINDOWSNT + mmap_regions = NULL; + mmap_fd = -1; +#endif /* We cannot dump buffers with meaningful addresses that can be used by the dumped Emacs. We map new memory for them here. */ FOR_EACH_BUFFER (b) Fabrice 2014-05-29 16:17 GMT+02:00 Ken Brown : > On 5/29/2014 9:54 AM, Fabrice Popineau wrote: > >> This should fix the problem: >> >> --- ../trunk/src/buffer.c 2014-05-29 15:51:11.632003900 +0200 >> +++ src/buffer.c 2014-05-29 15:50:54.192190300 +0200 >> @@ -4703,11 +4703,6 @@ >> >> static int mmap_fd; >> >> -/* Temporary storage for mmap_set_vars, see there. */ >> - >> -static struct mmap_region *mmap_regions_1; >> -static int mmap_fd_1; >> - >> /* Page size on this system. */ >> >> static int mmap_page_size; >> @@ -5282,6 +5277,9 @@ >> { >> struct buffer *b; >> >> + mmap_regions = NULL; >> + mmap_fd = -1; >> + >> /* We cannot dump buffers with meaningful addresses that can be >> used by the dumped Emacs. We map new memory for them here. */ >> FOR_EACH_BUFFER (b) >> >> by initializing explicitly variables that need it. We can also remove >> unsused variables. >> Waiting for confirmation (or failure!). >> > > Confirmed. Thanks. > > Ken > > --047d7bd752660c93e504fa8ab077 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Thanks, albeit I missed the obvious.

=3D=3D=3D modified file 'src/buffer.c'
--- src/buffer.= c =C2=A0 =C2=A0 =C2=A0 =C2=A02014-05-27 17:31:17 +0000
+++ src/bu= ffer.c =C2=A0 =C2=A0 =C2=A0 =C2=A02014-05-29 14:22:37 +0000
@@ -4703,11 +4703,6 @@

=C2=A0static int mmap_= fd;

-/* Temporary storage for mmap_set_vars, see t= here. =C2=A0*/
-
-static struct mmap_region *mmap_regio= ns_1;
-static int mmap_fd_1;
-
=C2=A0/* Page size on thi= s system. =C2=A0*/

=C2=A0static int mmap_page_size= ;
@@ -5282,6 +5277,10 @@
=C2=A0 =C2=A0{
=C2= =A0 =C2=A0 =C2=A0struct buffer *b;

+#ifndef WINDOWSNT
+ =C2=A0 =C2=A0mmap_region= s =3D NULL;
+ =C2=A0 =C2=A0mmap_fd =3D -1;
+#endif
=C2=A0 =C2=A0 =C2=A0/* We cannot dump buffers with meaningful address= es that can be
=C2=A0 =C2=A0 =C2=A0 =C2=A0 used by the dumped Ema= cs. =C2=A0We map new memory for them here. =C2=A0*/
=C2=A0 =C2=A0 =C2=A0FOR_EACH_BUFFER (b)

Fabrice


2014-05-29 16:17 GMT+02:00 Ken Brown <kbrown@cornell.edu>= :
On 5/29/2014 9:54 AM, Fabric= e Popineau wrote:
This should fix the problem:

--- ../trunk/src/buffer.c =C2=A0 =C2=A0 =C2=A0 2014-05-29 15:51:11.63200390= 0 +0200
+++ src/buffer.c =C2=A0 =C2=A0 =C2=A0 =C2=A02014-05-29 15:50:54.192190300 += 0200
@@ -4703,11 +4703,6 @@

=C2=A0 static int mmap_fd;

-/* Temporary storage for mmap_set_vars, see there. =C2=A0*/
-
-static struct mmap_region *mmap_regions_1;
-static int mmap_fd_1;
-
=C2=A0 /* Page size on this system. =C2=A0*/

=C2=A0 static int mmap_page_size;
@@ -5282,6 +5277,9 @@
=C2=A0 =C2=A0 {
=C2=A0 =C2=A0 =C2=A0 struct buffer *b;

+ =C2=A0 =C2=A0mmap_regions =3D NULL;
+ =C2=A0 =C2=A0mmap_fd =3D -1;
+
=C2=A0 =C2=A0 =C2=A0 /* We cannot dump buffers with meaningful addresses th= at can be
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0used by the dumped Emacs. =C2=A0We map ne= w memory for them here. =C2=A0*/
=C2=A0 =C2=A0 =C2=A0 FOR_EACH_BUFFER (b)

by initializing explicitly variables that need it. We can also remove
unsused variables.
Waiting for confirmation (or failure!).

Confirmed. =C2=A0Thanks.

Ken


--047d7bd752660c93e504fa8ab077--