From owner-freebsd-stable@FreeBSD.ORG Thu Nov 8 23:28:11 2012 Return-Path: Delivered-To: stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 231A9D81; Thu, 8 Nov 2012 23:28:11 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id CB5D08FC13; Thu, 8 Nov 2012 23:28:10 +0000 (UTC) Received: from [192.168.0.6] (spaceball.home.andric.com [192.168.0.6]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 1FDD55C59; Fri, 9 Nov 2012 00:28:10 +0100 (CET) Message-ID: <509C400B.5080405@FreeBSD.org> Date: Fri, 09 Nov 2012 00:28:11 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Volodymyr Kostyrko Subject: Re: buildworld fails on recent stable References: <5097A5E0.2000502@gmail.com> <5097D27E.1050705@FreeBSD.org> <5097DE5E.6020405@FreeBSD.org> <5097E0BD.50909@gmail.com> <5097E2AF.2010000@FreeBSD.org> <5097E944.1000405@gmail.com> In-Reply-To: <5097E944.1000405@gmail.com> Content-Type: multipart/mixed; boundary="------------090503070007040309010107" Cc: stable@FreeBSD.org, Andriy Gapon X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2012 23:28:11 -0000 This is a multi-part message in MIME format. --------------090503070007040309010107 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 2012-11-05 17:28, Volodymyr Kostyrko wrote: > 05.11.2012 18:00, Andriy Gapon wrote: >>> I bet on clang 3.2. >> >> Thank you for checking. >> >> So how do we proceed from here? >> I could just revert the MFC-es, but the functionality could be desirable to some >> users. Are there any alternatives? > > Dunno, clang 3.2 is still pending so I guess it wouldn't be MFC'ed until > December 16th? Being a minor issue it can make some people shrug from > using clang for testing stable... While clang 3.2 will be branched for release soon, and hopefully will be released on the date you mention, it will probably not appear instantly in head. We need to test it rather thoroughly, to see if there are no unexpected side effects. Even then, I would not merge it to stable/9 after at least a month of settling in head. I have also looked at merging the snapshot of 3.2 we now have in head to stable/9, but it is also quite some work, so I found a better solution: I managed to shrink boot2 by enough bytes to make it fit again. I committed the change to head in r242804, and I will MFC it in 3 days, if there are no regressions reported. Meanwhile, please apply the attached patch. -Dimitry --------------090503070007040309010107 Content-Type: text/x-diff; name="shrink-boot2-1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="shrink-boot2-1.diff" Index: sys/boot/i386/boot2/sio.S =================================================================== --- sys/boot/i386/boot2/sio.S (revision 242667) +++ sys/boot/i386/boot2/sio.S (working copy) @@ -40,13 +40,11 @@ sio_init: pushl %eax movb $0x3,%al # Set RTS, outb %al,(%dx) # DTR incl %edx # Line status reg - call sio_flush - ret + # Fallthrough /* int sio_flush(void) */ -sio_flush: xorl %eax,%eax # Return value - xorl %ecx,%ecx # Timeout +sio_flush: xorl %ecx,%ecx # Timeout movb $0x80,%ch # counter sio_flush.1: call sio_ischar # Check for character jz sio_flush.2 # Till none --------------090503070007040309010107--