Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755048AbZJOGju (ORCPT ); Thu, 15 Oct 2009 02:39:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754026AbZJOGju (ORCPT ); Thu, 15 Oct 2009 02:39:50 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:47880 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753829AbZJOGjt (ORCPT ); Thu, 15 Oct 2009 02:39:49 -0400 Date: Thu, 15 Oct 2009 08:38:37 +0200 From: Ingo Molnar To: Sam Ravnborg Cc: Roland McGrath , Thomas Gleixner , hpa@zytor.com, Ian Lance Taylor , x86@kernel.org, linux-kernel@vger.kernel.org, Andrew Morton , Linus Torvalds Subject: Re: [PATCH] x86: linker script syntax nits Message-ID: <20091015063837.GA11645@elte.hu> References: <20091014221024.EFA79E2F@magilla.sf.frob.com> <20091015033010.GB10068@merkur.ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091015033010.GB10068@merkur.ravnborg.org> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2630 Lines: 72 * Sam Ravnborg wrote: > On Wed, Oct 14, 2009 at 03:10:24PM -0700, Roland McGrath wrote: > > The following changes since commit 80f506918fdaaca6b574ba931536a58ce015c7be: > > Linus Torvalds (1): > > Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland.git topic/x86-lds-nits > > > > Roland McGrath (1): > > x86: linker script syntax nits > > > > arch/x86/kernel/acpi/realmode/wakeup.lds.S | 4 ++-- > > arch/x86/kernel/vmlinux.lds.S | 17 ++++++++--------- > > 2 files changed, 10 insertions(+), 11 deletions(-) > > --- > > [PATCH] x86: linker script syntax nits > > > > The linker scripts grew some use of weirdly wrong linker script syntax. > > It happens to work, but it's not what the syntax is documented to be. > > Clean it up to use the official syntax. > > > > Signed-off-by: Roland McGrath > > CC: Ian Lance Taylor > > --- > > arch/x86/kernel/acpi/realmode/wakeup.lds.S | 4 ++-- > > arch/x86/kernel/vmlinux.lds.S | 17 ++++++++--------- > > 2 files changed, 10 insertions(+), 11 deletions(-) > > > > diff --git a/arch/x86/kernel/acpi/realmode/wakeup.lds.S b/arch/x86/kernel/acpi/realmode/wakeup.lds.S > > index 7da00b7..0e50e1e 100644 > > --- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S > > +++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S > > @@ -56,6 +56,6 @@ SECTIONS > > /DISCARD/ : { > > *(.note*) > > } > > - > > - . = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!"); > > } > > + > > +ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!"); > > This breaks with older binutils. See > d2ba8b211bb8abc29aa627dbd4dce08cfbc8082b for reference. > > Same goes for the other cahnges in this post. > > Yup - it looks ugly :-( We could introduce a COMPAT_ASSERT() wrapper perhaps, to move it more in line with the 'official' syntax. Or we could wrap ASSERT() itself (this runs through the preprocessor before going to the linker) - although that would be a pretty obfuscated move. At minimum we should add a comment to the first use of ASSERT() here that we assign the current address due to compatibility reasons. (same goes for arch/x86/boot/setup.ld) Anyway - any such cleanup would be .33 material. Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/