From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from biscayne-one-station.mit.edu (BISCAYNE-ONE-STATION.MIT.EDU [18.7.7.80]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E9B04DDDB2 for ; Fri, 1 May 2009 11:56:46 +1000 (EST) Date: Thu, 30 Apr 2009 21:56:20 -0400 (EDT) From: Tim Abbott To: Michael Ellerman Subject: Re: [PATCH 2/8] powerpc: share .data output section definition between 32 and 64 bits. In-Reply-To: <1241142402.6928.7.camel@concordia> Message-ID: References: <1241135777-9462-1-git-send-email-tabbott@mit.edu> <1241135777-9462-2-git-send-email-tabbott@mit.edu> <1241135777-9462-3-git-send-email-tabbott@mit.edu> <1241142402.6928.7.camel@concordia> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Denys Vlasenko , Jeff Arnold , Linux kernel mailing list , Anders Kaseorg , linuxppc-dev@ozlabs.org, Paul Mackerras , Sam Ravnborg , Waseem Daher List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Fri, 1 May 2009, Michael Ellerman wrote: > On Thu, 2009-04-30 at 19:56 -0400, Tim Abbott wrote: > > +#ifndef CONFIG_PPC32 > > This would be clearer in the positive, as in #ifdef CONFIG_PPC64. Good point. New version below. -Tim Abbott powerpc: share .data output section definition between 32 and 64 bits. Since upcoming changes will add several more common pieces of code between the 32-bit and 64-bit powerpc architectures, it seems best to unify these two blocks. Signed-off-by: Tim Abbott Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: linuxppc-dev@ozlabs.org --- arch/powerpc/kernel/vmlinux.lds.S | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index b9ef164..de80f89 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -219,20 +219,19 @@ SECTIONS . = ALIGN(PAGE_SIZE); _sdata = .; -#ifdef CONFIG_PPC32 .data : AT(ADDR(.data) - LOAD_OFFSET) { DATA_DATA +#ifdef CONFIG_PPC32 *(.sdata) *(.got.plt) *(.got) - } #else - .data : AT(ADDR(.data) - LOAD_OFFSET) { - DATA_DATA *(.data.rel*) *(.toc1) *(.branch_lt) +#endif } +#ifdef CONFIG_PPC64 .opd : AT(ADDR(.opd) - LOAD_OFFSET) { *(.opd) } -- 1.6.2.1