Commit dce97c8c authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Move the unified linker script in place, kill off old _64 one. 



Just forcefully rename the _32 variant overtop, and kill off the now
unused _64 version.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c3e2586b

arch/sh/kernel/vmlinux.lds.S

+179 −3
Original line number Diff line number Diff line 
#ifdef CONFIG_SUPERH32

# include "vmlinux_32.lds.S"

/*

 * ld script to make SuperH Linux kernel

 * Written by Niibe Yutaka and Paul Mundt

 */

#ifdef CONFIG_SUPERH64

#define LOAD_OFFSET	CONFIG_PAGE_OFFSET

OUTPUT_ARCH(sh:sh5)

#else

# include "vmlinux_64.lds.S"

OUTPUT_ARCH(sh)

#ifdef CONFIG_CPU_LITTLE_ENDIAN

OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")

#else

OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-shbig-linux")

#endif

#endif



#include <asm/thread_info.h>

#include <asm/cache.h>

#include <asm-generic/vmlinux.lds.h>



ENTRY(_start)

SECTIONS

{

#ifdef CONFIG_PMB_FIXED

	. = CONFIG_PAGE_OFFSET + (CONFIG_MEMORY_START & 0x1fffffff) +

	    CONFIG_ZERO_PAGE_OFFSET;

#elif defined(CONFIG_32BIT)

	. = CONFIG_PAGE_OFFSET + CONFIG_ZERO_PAGE_OFFSET;

#else

	. = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;

#endif



	.empty_zero_page : AT(ADDR(.empty_zero_page) - LOAD_OFFSET) {

		*(.empty_zero_page)

	} = 0



	.text : AT(ADDR(.text) - LOAD_OFFSET) {

		_text = .;		/* Text and read-only data */

		HEAD_TEXT

		TEXT_TEXT



#ifdef CONFIG_SUPERH64

		*(.text64)

		*(.text..SHmedia32)

#endif



		SCHED_TEXT

		LOCK_TEXT

		KPROBES_TEXT

		IRQENTRY_TEXT

		*(.fixup)

		*(.gnu.warning)

		_etext = .;		/* End of text section */

	} = 0x0009



	. = ALIGN(16);		/* Exception table */

	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {

		__start___ex_table = .;

		*(__ex_table)

		__stop___ex_table = .;

	}



	NOTES

	RO_DATA(PAGE_SIZE)



	/*

	 * Code which must be executed uncached and the associated data

	 */

	. = ALIGN(PAGE_SIZE);

	.uncached : AT(ADDR(.uncached) - LOAD_OFFSET) {

		__uncached_start = .;

		*(.uncached.text)

		*(.uncached.data)

		__uncached_end = .;

	}



	. = ALIGN(THREAD_SIZE);

	.data : AT(ADDR(.data) - LOAD_OFFSET) {		/* Data */

		*(.data.init_task)



		. = ALIGN(L1_CACHE_BYTES);

		*(.data.cacheline_aligned)



		. = ALIGN(L1_CACHE_BYTES);

		*(.data.read_mostly)



		. = ALIGN(PAGE_SIZE);

		*(.data.page_aligned)



		__nosave_begin = .;

		*(.data.nosave)

		. = ALIGN(PAGE_SIZE);

		__nosave_end = .;



		DATA_DATA

		CONSTRUCTORS

	}



	_edata = .;			/* End of data section */



	. = ALIGN(PAGE_SIZE);		/* Init code and data */

	.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {

		__init_begin = .;

		_sinittext = .;

		INIT_TEXT

		_einittext = .;

	}



	.init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { INIT_DATA }



	. = ALIGN(16);

	.init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {

		__setup_start = .;

		*(.init.setup)

		__setup_end = .;

	}



	.initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {

		__initcall_start = .;

		INITCALLS

		__initcall_end = .;

	}



	.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {

		__con_initcall_start = .;

		*(.con_initcall.init)

		__con_initcall_end = .;

	}



	SECURITY_INIT



#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(PAGE_SIZE);

	.init.ramfs : AT(ADDR(.init_ramfs) - LOAD_OFFSET) {

		__initramfs_start = .;

		*(.init.ramfs)

		__initramfs_end = .;

	}

#endif



	. = ALIGN(4);

	.machvec.init : AT(ADDR(.machvec.init) - LOAD_OFFSET) {

		__machvec_start = .;

		*(.machvec.init)

		__machvec_end = .;

	}



	PERCPU(PAGE_SIZE)



	/*

	 * .exit.text is discarded at runtime, not link time, to deal with

	 * references from __bug_table

	 */

	.exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { EXIT_TEXT }

	.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { EXIT_DATA }



	. = ALIGN(PAGE_SIZE);

	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {

		__init_end = .;

		__bss_start = .;		/* BSS */

		*(.bss.page_aligned)

		*(.bss)

		*(COMMON)

		. = ALIGN(4);

		_ebss = .;			/* uClinux MTD sucks */

		_end = . ;

	}



	/*

	 * When something in the kernel is NOT compiled as a module, the

	 * module cleanup code and data are put into these segments. Both

	 * can then be thrown away, as cleanup code is never called unless

	 * it's a module.

	 */

	/DISCARD/ : {

		*(.exitcall.exit)

	}



	STABS_DEBUG

	DWARF_DEBUG

}

arch/sh/kernel/vmlinux_32.lds.S

deleted100644 → 0
+0 −181
Original line number Diff line number Diff line 
/*

 * ld script to make SuperH Linux kernel

 * Written by Niibe Yutaka and Paul Mundt

 */

#ifdef CONFIG_SUPERH64

#define LOAD_OFFSET	CONFIG_PAGE_OFFSET

OUTPUT_ARCH(sh:sh5)

#else

OUTPUT_ARCH(sh)

#ifdef CONFIG_CPU_LITTLE_ENDIAN

OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")

#else

OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-shbig-linux")

#endif

#endif



#include <asm/thread_info.h>

#include <asm/cache.h>

#include <asm-generic/vmlinux.lds.h>



ENTRY(_start)

SECTIONS

{

#ifdef CONFIG_PMB_FIXED

	. = CONFIG_PAGE_OFFSET + (CONFIG_MEMORY_START & 0x1fffffff) +

	    CONFIG_ZERO_PAGE_OFFSET;

#elif defined(CONFIG_32BIT)

	. = CONFIG_PAGE_OFFSET + CONFIG_ZERO_PAGE_OFFSET;

#else

	. = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;

#endif



	.empty_zero_page : AT(ADDR(.empty_zero_page) - LOAD_OFFSET) {

		*(.empty_zero_page)

	} = 0



	.text : AT(ADDR(.text) - LOAD_OFFSET) {

		_text = .;		/* Text and read-only data */

		HEAD_TEXT

		TEXT_TEXT



#ifdef CONFIG_SUPERH64

		*(.text64)

		*(.text..SHmedia32)

#endif



		SCHED_TEXT

		LOCK_TEXT

		KPROBES_TEXT

		IRQENTRY_TEXT

		*(.fixup)

		*(.gnu.warning)

		_etext = .;		/* End of text section */

	} = 0x0009



	. = ALIGN(16);		/* Exception table */

	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {

		__start___ex_table = .;

		*(__ex_table)

		__stop___ex_table = .;

	}



	NOTES

	RO_DATA(PAGE_SIZE)



	/*

	 * Code which must be executed uncached and the associated data

	 */

	. = ALIGN(PAGE_SIZE);

	.uncached : AT(ADDR(.uncached) - LOAD_OFFSET) {

		__uncached_start = .;

		*(.uncached.text)

		*(.uncached.data)

		__uncached_end = .;

	}



	. = ALIGN(THREAD_SIZE);

	.data : AT(ADDR(.data) - LOAD_OFFSET) {		/* Data */

		*(.data.init_task)



		. = ALIGN(L1_CACHE_BYTES);

		*(.data.cacheline_aligned)



		. = ALIGN(L1_CACHE_BYTES);

		*(.data.read_mostly)



		. = ALIGN(PAGE_SIZE);

		*(.data.page_aligned)



		__nosave_begin = .;

		*(.data.nosave)

		. = ALIGN(PAGE_SIZE);

		__nosave_end = .;



		DATA_DATA

		CONSTRUCTORS

	}



	_edata = .;			/* End of data section */



	. = ALIGN(PAGE_SIZE);		/* Init code and data */

	.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {

		__init_begin = .;

		_sinittext = .;

		INIT_TEXT

		_einittext = .;

	}



	.init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { INIT_DATA }



	. = ALIGN(16);

	.init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {

		__setup_start = .;

		*(.init.setup)

		__setup_end = .;

	}



	.initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {

		__initcall_start = .;

		INITCALLS

		__initcall_end = .;

	}



	.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {

		__con_initcall_start = .;

		*(.con_initcall.init)

		__con_initcall_end = .;

	}



	SECURITY_INIT



#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(PAGE_SIZE);

	.init.ramfs : AT(ADDR(.init_ramfs) - LOAD_OFFSET) {

		__initramfs_start = .;

		*(.init.ramfs)

		__initramfs_end = .;

	}

#endif



	. = ALIGN(4);

	.machvec.init : AT(ADDR(.machvec.init) - LOAD_OFFSET) {

		__machvec_start = .;

		*(.machvec.init)

		__machvec_end = .;

	}



	PERCPU(PAGE_SIZE)



	/*

	 * .exit.text is discarded at runtime, not link time, to deal with

	 * references from __bug_table

	 */

	.exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { EXIT_TEXT }

	.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { EXIT_DATA }



	. = ALIGN(PAGE_SIZE);

	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {

		__init_end = .;

		__bss_start = .;		/* BSS */

		*(.bss.page_aligned)

		*(.bss)

		*(COMMON)

		. = ALIGN(4);

		_ebss = .;			/* uClinux MTD sucks */

		_end = . ;

	}



	/*

	 * When something in the kernel is NOT compiled as a module, the

	 * module cleanup code and data are put into these segments. Both

	 * can then be thrown away, as cleanup code is never called unless

	 * it's a module.

	 */

	/DISCARD/ : {

		*(.exitcall.exit)

	}



	STABS_DEBUG

	DWARF_DEBUG

}

arch/sh/kernel/vmlinux_64.lds.S

deleted100644 → 0
+0 −163
Original line number Diff line number Diff line 
/*

 * ld script to make SH64 Linux kernel

 *

 * Copyright (C) 2000, 2001  Paolo Alberelli

 *

 * benedict.gaster@superh.com:	 2nd May 2002

 *    Add definition of empty_zero_page to be the first page of kernel image.

 *

 * benedict.gaster@superh.com:	 3rd May 2002

 *    Added support for ramdisk, removing statically linked romfs at the

 *    same time.

 *

 * lethal@linux-sh.org:          9th May 2003

 *    Kill off GLOBAL_NAME() usage and other CDC-isms.

 *

 * lethal@linux-sh.org:         19th May 2003

 *    Remove support for ancient toolchains.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <asm/page.h>

#include <asm/cache.h>

#include <asm/thread_info.h>



#define LOAD_OFFSET	CONFIG_PAGE_OFFSET

#include <asm-generic/vmlinux.lds.h>



OUTPUT_ARCH(sh:sh5)



#define C_PHYS(x) AT (ADDR(x) - LOAD_OFFSET)



ENTRY(__start)

SECTIONS

{

	. = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + PAGE_SIZE;

	_text = .;			/* Text and read-only data */



	.empty_zero_page : C_PHYS(.empty_zero_page) {

		*(.empty_zero_page)

	} = 0



	.text : C_PHYS(.text) {

		HEAD_TEXT

		TEXT_TEXT

		*(.text64)

		*(.text..SHmedia32)

		SCHED_TEXT

		LOCK_TEXT

		KPROBES_TEXT

		*(.fixup)

		*(.gnu.warning)

#ifdef CONFIG_CPU_LITTLE_ENDIAN

	} = 0x6ff0fff0

#else

	} = 0xf0fff06f

#endif



	/* We likely want __ex_table to be Cache Line aligned */

	. = ALIGN(L1_CACHE_BYTES);		/* Exception table */

	__start___ex_table = .;

	__ex_table : C_PHYS(__ex_table) { *(__ex_table) }

	__stop___ex_table = .;



	_etext = .;			/* End of text section */



	NOTES 

	RO_DATA(PAGE_SIZE)



	. = ALIGN(THREAD_SIZE);

	.data : C_PHYS(.data) {			/* Data */

		*(.data.init_task)



		. = ALIGN(L1_CACHE_BYTES);

		*(.data.cacheline_aligned)



		. = ALIGN(L1_CACHE_BYTES);

		*(.data.read_mostly)



		. = ALIGN(PAGE_SIZE);

		*(.data.page_aligned)



		__nosave_begin = .;

		*(.data.nosave)

		. = ALIGN(PAGE_SIZE);

		__nosave_end = .;



		DATA_DATA

		CONSTRUCTORS

	}



	_edata = .;			/* End of data section */



	. = ALIGN(PAGE_SIZE);		/* Init code and data */

	__init_begin = .;

	_sinittext = .;

	.init.text : C_PHYS(.init.text) { INIT_TEXT }

	_einittext = .;

	.init.data : C_PHYS(.init.data) { INIT_DATA }

	. = ALIGN(L1_CACHE_BYTES);	/* Better if Cache Line aligned */

	__setup_start = .;

	.init.setup : C_PHYS(.init.setup) { *(.init.setup) }

	__setup_end = .;

	__initcall_start = .;

	.initcall.init : C_PHYS(.initcall.init) {

		INITCALLS

	}

	__initcall_end = .;

	__con_initcall_start = .;

	.con_initcall.init : C_PHYS(.con_initcall.init) {

		*(.con_initcall.init)

	}

	__con_initcall_end = .;



	SECURITY_INIT



#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(PAGE_SIZE);

	__initramfs_start = .;

	.init.ramfs : C_PHYS(.init.ramfs) { *(.init.ramfs) }

	__initramfs_end = .;

#endif



	. = ALIGN(8);

	__machvec_start = .;

	.machvec.init : C_PHYS(.machvec.init) { *(.machvec.init) }

	__machvec_end = .;



	PERCPU(PAGE_SIZE)



	/*

	 * .exit.text is discarded at runtime, not link time, to deal with

	 * references from __bug_table

	 */

	.exit.text : C_PHYS(.exit.text) { EXIT_TEXT }

	.exit.data : C_PHYS(.exit.data) { EXIT_DATA }



	. = ALIGN(PAGE_SIZE);

	.bss : C_PHYS(.bss) {

		__init_end = .;

		__bss_start = .;		/* BSS */

		*(.bss.page_aligned)

		*(.bss)

		*(COMMON)

		. = ALIGN(4);

		_ebss = .;			/* uClinux MTD sucks */

		_end = . ;

	}



	/*

	 * When something in the kernel is NOT compiled as a module, the

	 * module cleanup code and data are put into these segments. Both

	 * can then be thrown away, as cleanup code is never called unless

	 * it's a module.

	 */

	/DISCARD/ : {

		*(.exitcall.exit)

	}



	STABS_DEBUG

	DWARF_DEBUG

}