From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S265095AbUELOUA (ORCPT ); Wed, 12 May 2004 10:20:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265097AbUELOUA (ORCPT ); Wed, 12 May 2004 10:20:00 -0400 Received: from p060042.ppp.asahi-net.or.jp ([221.113.60.42]:21995 "EHLO mitou.ysato.dip.jp") by vger.kernel.org with ESMTP id S265095AbUELOT4 (ORCPT ); Wed, 12 May 2004 10:19:56 -0400 Date: Wed, 12 May 2004 23:19:46 +0900 Message-ID: From: Yoshinori Sato To: Andrew Morton Cc: torvalds@osdl.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH} H8/300 update (2/9) ldscripts fix In-Reply-To: <20040511175105.7d669535.akpm@osdl.org> References: <20040511175105.7d669535.akpm@osdl.org> User-Agent: Wanderlust/2.11.24 (Wonderwall) SEMI/1.14.6 (Maruoka) LIMIT/1.14.7 (Fujiidera) APEL/10.6 Emacs/21.3 (i386-pc-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org I corrected it. -- Yoshinori Sato diff -Nru linux-2.6.6/arch/h8300/kernel/vmlinux.lds.S linux-2.6.6-h8300/arch/h8300/kernel/vmlinux.lds.S --- linux-2.6.6/arch/h8300/kernel/vmlinux.lds.S 11 May 2004 02:16:05 -0000 +++ linux-2.6.6-h8300/arch/h8300/kernel/vmlinux.lds.S 12 May 2004 12:30:04 -0000 @@ -1,3 +1,6 @@ +#define VMLINUX_SYMBOL(_sym_) _##_sym_ +#include +#include #include #ifdef CONFIG_H8300H_GENERIC diff -Nru linux-2.6.6/arch/v850/kernel/vmlinux.lds.S linux-2.6.6-h8300/arch/v850/kernel/vmlinux.lds.S --- linux-2.6.6/arch/v850/kernel/vmlinux.lds.S 11 May 2004 02:16:06 -0000 +++ linux-2.6.6-h8300/arch/v850/kernel/vmlinux.lds.S 12 May 2004 12:30:15 -0000 @@ -12,6 +12,7 @@ */ #include +#define VMLINUX_SYMBOL(_sym_) _##_sym_ #include /* For most platforms, this will define useful things like RAM addr/size. */ diff -Nru linux-2.6.6/include/asm-generic/vmlinux.lds.h linux-2.6.6-h8300/include/asm-generic/vmlinux.lds.h --- linux-2.6.6/include/asm-generic/vmlinux.lds.h 11 May 2004 02:16:29 -0000 +++ linux-2.6.6-h8300/include/asm-generic/vmlinux.lds.h 12 May 2004 12:29:44 -0000 @@ -2,6 +2,10 @@ #define LOAD_OFFSET 0 #endif +#ifndef VMLINUX_SYMBOL +#define VMLINUX_SYMBOL(_sym_) _sym_ +#endif + #define RODATA \ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ *(.rodata) *(.rodata.*) \ @@ -14,30 +18,30 @@ \ /* Kernel symbol table: Normal symbols */ \ __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ - __start___ksymtab = .; \ + VMLINUX_SYMBOL(__start___ksymtab) = .; \ *(__ksymtab) \ - __stop___ksymtab = .; \ + VMLINUX_SYMBOL(__stop___ksymtab) = .; \ } \ \ /* Kernel symbol table: GPL-only symbols */ \ __ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) { \ - __start___ksymtab_gpl = .; \ + VMLINUX_SYMBOL(__start___ksymtab_gpl) = .; \ *(__ksymtab_gpl) \ - __stop___ksymtab_gpl = .; \ + VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \ } \ \ /* Kernel symbol table: Normal symbols */ \ __kcrctab : AT(ADDR(__kcrctab) - LOAD_OFFSET) { \ - __start___kcrctab = .; \ + VMLINUX_SYMBOL(__start___kcrctab) = .; \ *(__kcrctab) \ - __stop___kcrctab = .; \ + VMLINUX_SYMBOL(__stop___kcrctab) = .; \ } \ \ /* Kernel symbol table: GPL-only symbols */ \ __kcrctab_gpl : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) { \ - __start___kcrctab_gpl = .; \ + VMLINUX_SYMBOL(__start___kcrctab_gpl) = .; \ *(__kcrctab_gpl) \ - __stop___kcrctab_gpl = .; \ + VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .; \ } \ \ /* Kernel symbol table: strings */ \ @@ -47,12 +51,12 @@ #define SECURITY_INIT \ .security_initcall.init : { \ - __security_initcall_start = .; \ + VMLINUX_SYMBOL(__security_initcall_start) = .; \ *(.security_initcall.init) \ - __security_initcall_end = .; \ + VMLINUX_SYMBOL(__security_initcall_end) = .; \ } #define SCHED_TEXT \ - __sched_text_start = .; \ + VMLINUX_SYMBOL(__sched_text_start) = .; \ *(.sched.text) \ - __sched_text_end = .; + VMLINUX_SYMBOL(__sched_text_end) = .;