diff options
| author | Kanoj Sarcar <kanoj@engr.sgi.com> | 2000-06-05 21:04:19 +0000 |
|---|---|---|
| committer | Kanoj Sarcar <kanoj@engr.sgi.com> | 2000-06-05 21:04:19 +0000 |
| commit | 31089121b34cfdf997790243b5168dd2d4d261e5 (patch) | |
| tree | 47f02f121bb59cc9cdc829f43cb6154cd93d0009 | |
| parent | 4c5579dc87782155ea3ca81603ebdbf7e8c3e641 (diff) | |
Further cleanups to the ld script files not to do more than needed.
Replace uses of _ftext with the more generic _stext.
| -rw-r--r-- | arch/mips64/ld.script.elf32 | 4 | ||||
| -rw-r--r-- | arch/mips64/ld.script.elf64 | 4 | ||||
| -rw-r--r-- | arch/mips64/mm/init.c | 4 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-memory.c | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/arch/mips64/ld.script.elf32 b/arch/mips64/ld.script.elf32 index 7abc32bac..a330c639b 100644 --- a/arch/mips64/ld.script.elf32 +++ b/arch/mips64/ld.script.elf32 @@ -7,7 +7,6 @@ SECTIONS .init : { *(.init) } =0 .text : { - _ftext = . ; *(.text) *(.rodata) *(.rodata1) @@ -15,7 +14,6 @@ SECTIONS *(.gnu.warning) } =0 _etext = .; - PROVIDE (etext = .); . = ALIGN(16384); .data.init_task : { *(.data.init_task) } @@ -76,7 +74,6 @@ SECTIONS we can shorten the on-disk segment size. */ .sdata : { *(.sdata) } _edata = .; - PROVIDE (edata = .); .sbss : { *(.sbss) *(.scommon) } .bss : @@ -85,7 +82,6 @@ SECTIONS *(.bss) *(COMMON) _end = . ; - PROVIDE (end = .); } /* These are needed for ELF backends which have not yet been converted to the new style linker. */ diff --git a/arch/mips64/ld.script.elf64 b/arch/mips64/ld.script.elf64 index 19a2a8755..47f638b4a 100644 --- a/arch/mips64/ld.script.elf64 +++ b/arch/mips64/ld.script.elf64 @@ -16,7 +16,6 @@ SECTIONS /* . = 0xa800000000300000; */ . = 0xffffffff80300000; .text : { - _ftext = . ; *(.text) *(.rodata) *(.rodata1) @@ -24,7 +23,6 @@ SECTIONS *(.gnu.warning) } = 0 _etext = .; - PROVIDE (etext = .); . = ALIGN(16384); .data.init_task : { *(.data.init_task) } @@ -85,7 +83,6 @@ SECTIONS we can shorten the on-disk segment size. */ .sdata : { *(.sdata) } _edata = .; - PROVIDE (edata = .); .sbss : { *(.sbss) *(.scommon) } .bss : @@ -94,7 +91,6 @@ SECTIONS *(.bss) *(COMMON) _end = . ; - PROVIDE (end = .); } /* These are needed for ELF backends which have not yet been converted to the new style linker. */ diff --git a/arch/mips64/mm/init.c b/arch/mips64/mm/init.c index 42dece549..97c68c6cc 100644 --- a/arch/mips64/mm/init.c +++ b/arch/mips64/mm/init.c @@ -337,7 +337,7 @@ void show_mem(void) #ifndef CONFIG_DISCONTIGMEM /* References to section boundaries */ -extern char _ftext, _etext, _fdata, _edata; +extern char _stext, _etext, _fdata, _edata; extern char __init_begin, __init_end; void __init paging_init(void) @@ -384,7 +384,7 @@ void __init mem_init(void) reservedpages++; } - codesize = (unsigned long) &_etext - (unsigned long) &_ftext; + codesize = (unsigned long) &_etext - (unsigned long) &_stext; datasize = (unsigned long) &_edata - (unsigned long) &_fdata; initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; diff --git a/arch/mips64/sgi-ip27/ip27-memory.c b/arch/mips64/sgi-ip27/ip27-memory.c index 063fb5a41..6633f3099 100644 --- a/arch/mips64/sgi-ip27/ip27-memory.c +++ b/arch/mips64/sgi-ip27/ip27-memory.c @@ -287,7 +287,7 @@ void __init paging_init(void) void __init mem_init(void) { - extern char _ftext, _etext, _fdata, _edata; + extern char _stext, _etext, _fdata, _edata; extern char __init_begin, __init_end; extern unsigned long totalram_pages; extern unsigned long setup_zero_pages(void); @@ -367,7 +367,7 @@ void __init mem_init(void) } } - codesize = (unsigned long) &_etext - (unsigned long) &_ftext; + codesize = (unsigned long) &_etext - (unsigned long) &_stext; datasize = (unsigned long) &_edata - (unsigned long) &_fdata; initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; |