Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751461AbZIGHHS (ORCPT ); Mon, 7 Sep 2009 03:07:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751339AbZIGHHR (ORCPT ); Mon, 7 Sep 2009 03:07:17 -0400 Received: from rex.securecomputing.com ([203.24.151.4]:37084 "EHLO cyberguard.com.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751284AbZIGHHQ (ORCPT ); Mon, 7 Sep 2009 03:07:16 -0400 Message-ID: <4AA4B104.7040507@snapgear.com> Date: Mon, 07 Sep 2009 17:06:44 +1000 From: Greg Ungerer User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Tim Abbott CC: Linux Kernel Mailing List , Sam Ravnborg , Greg Ungerer Subject: Re: [PATCH] m68knommu: Clean up linker script using new linker script macros. References: <1252293044-13102-1-git-send-email-tabbott@ksplice.com> <4AA49946.2000804@snapgear.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2337 Lines: 78 Hi Tim, Tim Abbott wrote: > On Mon, 7 Sep 2009, Greg Ungerer wrote: > >> This fails for me with: >> >> LD vmlinux >> /usr/local/bin/m68k-uclinux-ld:arch/m68knommu/kernel/vmlinux.lds:287: syntax >> error >> >> due to PAGE_SIZE evaluating to: >> >> . = ALIGN((1UL << (12))); >> >> The linker doesn't like the 'UL' suffix. > > Yeah, sorry, I didn't have a cross-compiler for this one to test. The fix > is to use _AC(1,UL), like most of the other architectures (including m68k > with an mmu) do. Yep, that fixes that. I'll push this patch into the for-linus branch of the m68knommu git tree. Now, back to the original patch. Now fails with another syntax error at the last line in this: .init : { . = ALIGN((1 << (12))); __init_begin = .; . = ALIGN((1 << (12))); .init.text : AT(ADDR(.init.text) - 0) { _sinittext = .; *(.init.text) *(.devinit.text) *(.cpuinit.text) *(.meminit.text) _einittext = .; } Regards Greg > -Tim Abbott > > m68knommu: Make PAGE_SIZE available to assembly files. > > Signed-off-by: Tim Abbott > --- > arch/m68k/include/asm/page_no.h | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h > index 9aa3f90..1f31b06 100644 > --- a/arch/m68k/include/asm/page_no.h > +++ b/arch/m68k/include/asm/page_no.h > @@ -1,10 +1,12 @@ > #ifndef _M68KNOMMU_PAGE_H > #define _M68KNOMMU_PAGE_H > > +#include > + > /* PAGE_SHIFT determines the page size */ > > #define PAGE_SHIFT (12) > -#define PAGE_SIZE (1UL << PAGE_SHIFT) > +#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) > #define PAGE_MASK (~(PAGE_SIZE-1)) > > #include -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 825 Stanley St, FAX: +61 7 3891 3630 Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com -- 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/