Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762502AbZD1RDc (ORCPT ); Tue, 28 Apr 2009 13:03:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932574AbZD1RBY (ORCPT ); Tue, 28 Apr 2009 13:01:24 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:54189 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932516AbZD1RBW (ORCPT ); Tue, 28 Apr 2009 13:01:22 -0400 From: Tim Abbott To: Sam Ravnborg Cc: Linus Torvalds , Linux kernel mailing list , Anders Kaseorg , Waseem Daher , Denys Vlasenko , Jeff Arnold , Paul Mundt , David Howells , Tim Abbott , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@ozlabs.org Subject: [PATCH v2 11/15] powerpc: share .data output section definition between 32 and 64 bits. Date: Tue, 28 Apr 2009 13:00:58 -0400 Message-Id: <1240938062-3264-12-git-send-email-tabbott@mit.edu> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1240938062-3264-11-git-send-email-tabbott@mit.edu> References: <1240938062-3264-1-git-send-email-tabbott@mit.edu> <1240938062-3264-2-git-send-email-tabbott@mit.edu> <1240938062-3264-3-git-send-email-tabbott@mit.edu> <1240938062-3264-4-git-send-email-tabbott@mit.edu> <1240938062-3264-5-git-send-email-tabbott@mit.edu> <1240938062-3264-6-git-send-email-tabbott@mit.edu> <1240938062-3264-7-git-send-email-tabbott@mit.edu> <1240938062-3264-8-git-send-email-tabbott@mit.edu> <1240938062-3264-9-git-send-email-tabbott@mit.edu> <1240938062-3264-10-git-send-email-tabbott@mit.edu> <1240938062-3264-11-git-send-email-tabbott@mit.edu> X-Spam-Flag: NO X-Spam-Score: 0.00 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1289 Lines: 48 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 a047a6c..47899b0 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -220,20 +220,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 } +#ifndef CONFIG_PPC32 .opd : AT(ADDR(.opd) - LOAD_OFFSET) { *(.opd) } -- 1.6.2.1 -- 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/