cleaned up ld scripts

git-svn-id: http://moon:8086/svn/mips@114 a8ebac50-d88d-4704-bea3-6648445a41b3

src/link/link.ld

@@ -33,94 +33,22 @@ SECTIONS
     } >ram
     .text           :
     {
-        _ftext = . ;
+        *(.text)
-        *(.text .stub .text.* .gnu.linkonce.t.*)
-        *(.gnu.warning)
-        *(.mips16.fn.*) *(.mips16.call.*)
     } >ram
     .fini           :
     {
       KEEP (*(.fini))
     } >ram
-    PROVIDE (__etext = .);
+    .rodata         : { *(.rodata .rodata.*) } >ram
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-    .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >ram
     .rodata1        : { *(.rodata1) } >ram
     .sdata2         :
     {
-        *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+        *(.sdata2 .sdata2.*)
     } >ram
-    .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >ram
+    .sbss2          : { *(.sbss2 .sbss2.*) } >ram
-    .eh_frame_hdr : { *(.eh_frame_hdr) } >ram
-    .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) } >ram
-    .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-    /* Adjust the address for the data segment.  We want to adjust up to
-       the same address within the page on the next page up.  */
-    . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
-    /* Exception handling  */
-    .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) } >ram
-    .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) } >ram
-    /* Thread Local Storage sections  */
-    .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) } >ram
-    .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >ram
-    .preinit_array     :
-    {
-        PROVIDE_HIDDEN (__preinit_array_start = .);
-        KEEP (*(.preinit_array))
-        PROVIDE_HIDDEN (__preinit_array_end = .);
-    } >ram
-    .init_array     :
-    {
-        PROVIDE_HIDDEN (__init_array_start = .);
-        KEEP (*(SORT(.init_array.*)))
-        KEEP (*(.init_array))
-        PROVIDE_HIDDEN (__init_array_end = .);
-    } >ram
-    .fini_array     :
-    {
-        PROVIDE_HIDDEN (__fini_array_start = .);
-        KEEP (*(.fini_array))
-        KEEP (*(SORT(.fini_array.*)))
-        PROVIDE_HIDDEN (__fini_array_end = .);
-    } >ram
-    .ctors          :
-    {
-        /* gcc uses crtbegin.o to find the start of
-           the constructors, so we make sure it is
-           first.  Because this is a wildcard, it
-           doesn't matter if the user does not
-           actually link against crtbegin.o; the
-           linker won't look for a file to match a
-           wildcard.  The wildcard also means that it
-           doesn't matter which directory crtbegin.o
-           is in.  */
-        KEEP (*crtbegin.o(.ctors))
-        KEEP (*crtbegin?.o(.ctors))
-        /* We don't want to include the .ctor section from
-           the crtend.o file until after the sorted ctors.
-           The .ctor section from the crtend file contains the
-           end of ctors marker and it must be last */
-        KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-        KEEP (*(SORT(.ctors.*)))
-        KEEP (*(.ctors))
-    } >ram
-    .dtors          :
-    {
-        KEEP (*crtbegin.o(.dtors))
-        KEEP (*crtbegin?.o(.dtors))
-        KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-        KEEP (*(SORT(.dtors.*)))
-        KEEP (*(.dtors))
-    } >ram
-    .jcr            : { KEEP (*(.jcr)) } >ram
-    .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) } >ram
-    . = DATA_SEGMENT_RELRO_END (0, .);
     .data           :
     {
-        _fdata = . ;
+        *(.data .data.*)
-        *(.data .data.* .gnu.linkonce.d.*)
-        SORT(CONSTRUCTORS)
     } >ram
     .data1          : { *(.data1) } >ram
     .got.plt        : { *(.got.plt) } >ram
@@ -132,23 +60,17 @@ SECTIONS
        we can shorten the on-disk segment size.  */
     .sdata          :
     {
-        *(.sdata .sdata.* .gnu.linkonce.s.*)
+        *(.sdata .sdata.*)
     } >ram
-    .lit8           : { *(.lit8) } >ram
-    .lit4           : { *(.lit4) } >ram
-    _edata = .; PROVIDE (edata = .);
     __bss_start = .;
-    _fbss = .;
     .sbss           :
     {
-        *(.dynsbss)
+        *(.sbss .sbss.*)
-        *(.sbss .sbss.* .gnu.linkonce.sb.*)
         *(.scommon)
     } >ram
     .bss            :
     {
-        *(.dynbss)
+        *(.bss .bss.*)
-        *(.bss .bss.* .gnu.linkonce.b.*)
         *(COMMON)
         /* Align here to ensure that the .bss section occupies space up to
            _end.  Align after .bss to ensure correct alignment even if the
@@ -160,53 +82,4 @@ SECTIONS
     . = ALIGN(32 / 8);
     . = ALIGN(32 / 8);
     _end = .; PROVIDE (end = .);
-    . = DATA_SEGMENT_END (.);
-    /* Stabs debugging sections.  */
-    .stab          0 : { *(.stab) }
-    .stabstr       0 : { *(.stabstr) }
-    .stab.excl     0 : { *(.stab.excl) }
-    .stab.exclstr  0 : { *(.stab.exclstr) }
-    .stab.index    0 : { *(.stab.index) }
-    .stab.indexstr 0 : { *(.stab.indexstr) }
-    .comment       0 : { *(.comment) }
-    /* DWARF debug sections.
-       Symbols in the DWARF debugging sections are relative to the beginning
-       of the section so we begin them at 0.  */
-    /* DWARF 1 */
-    .debug          0 : { *(.debug) }
-    .line           0 : { *(.line) }
-    /* GNU DWARF 1 extensions */
-    .debug_srcinfo  0 : { *(.debug_srcinfo) }
-    .debug_sfnames  0 : { *(.debug_sfnames) }
-    /* DWARF 1.1 and DWARF 2 */
-    .debug_aranges  0 : { *(.debug_aranges) }
-    .debug_pubnames 0 : { *(.debug_pubnames) }
-    /* DWARF 2 */
-    .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-    .debug_abbrev   0 : { *(.debug_abbrev) }
-    .debug_line     0 : { *(.debug_line) }
-    .debug_frame    0 : { *(.debug_frame) }
-    .debug_str      0 : { *(.debug_str) }
-    .debug_loc      0 : { *(.debug_loc) }
-    .debug_macinfo  0 : { *(.debug_macinfo) }
-    /* SGI/MIPS DWARF 2 extensions */
-    .debug_weaknames 0 : { *(.debug_weaknames) }
-    .debug_funcnames 0 : { *(.debug_funcnames) }
-    .debug_typenames 0 : { *(.debug_typenames) }
-    .debug_varnames  0 : { *(.debug_varnames) }
-    /* DWARF 3 */
-    .debug_pubtypes 0 : { *(.debug_pubtypes) }
-    .debug_ranges   0 : { *(.debug_ranges) }
-    .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-    .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
-    .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
-    .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
-    .mdebug.abiN32 : { KEEP(*(.mdebug.abiN32)) }
-    .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
-    .mdebug.abiO64 : { KEEP(*(.mdebug.abiO64)) }
-    .mdebug.eabi32 : { KEEP(*(.mdebug.eabi32)) }
-    .mdebug.eabi64 : { KEEP(*(.mdebug.eabi64)) }
-    .gcc_compiled_long32 : { KEEP(*(.gcc_compiled_long32)) }
-    .gcc_compiled_long64 : { KEEP(*(.gcc_compiled_long64)) }
-    /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
 }

src/link/link_tlb.ld

@@ -1,3 +1,12 @@
+/* Specify the memory areas */
+MEMORY
+{
+  rom          : ORIGIN = 0xBFC00000, LENGTH = 0x00002000  /*   8K    */
+  ram          : ORIGIN = 0x80000000, LENGTH = 0x04000000  /*  64M    */
+  flash        : ORIGIN = 0x00000000, LENGTH = 0x00800000  /*   8M    */
+  io           : ORIGIN = 0xA0000000, LENGTH = 0x00800000  /*   8M    */
+}
+
 stack_ptr = 0x83FFEFF0;
 
 STARTUP(startup.o)
@@ -5,122 +14,44 @@ INPUT(kernel.o)
 
 SECTIONS
 {
-  /* Read-only sections, merged into text segment: */
+    .start  : 
-  PROVIDE (__executable_start = 0x80000000); . = 0x80000000;
-   .start __executable_start : 
     {
         start = ALIGN(2);
         entry = ALIGN(2);
         _entry = ALIGN(2);
         __entry = ALIGN(2);
         *(.start)
-   }
+    } >ram
-   /* Kernel text with low-level exception handler */
+
-   .exc_vector __executable_start + 0x080 :
+    .exc_vector ORIGIN(ram) + 0x80 :
     {
-      _exc_vect_start = .;
         *(.exc_vect)
-      _exc_vect_end = .;
+    } >ram
-   }
     .init           :
     {
        KEEP (*(.init))
-  } =0
+    } >ram
-  .plt            : { *(.plt) }
     .text           :
     {
-    _ftext = . ;
+        *(.text)
-    *(.text .stub .text.* .gnu.linkonce.t.*)
+    } >ram
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.mips16.fn.*) *(.mips16.call.*)
-  } =0
     .fini           :
     {
       KEEP (*(.fini))
-  } =0
+    } >ram
-  PROVIDE (__etext = .);
+    .rodata         : { *(.rodata .rodata.*) } >ram
-  PROVIDE (_etext = .);
+    .rodata1        : { *(.rodata1) } >ram
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
     .sdata2         :
     {
-    *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+        *(.sdata2 .sdata2.*)
-  }
+    } >ram
-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
+    .sbss2          : { *(.sbss2 .sbss2.*) } >ram
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  . = DATA_SEGMENT_RELRO_END (0, .);
     .data           :
     {
-    _fdata = . ;
+        *(.data .data.*)
-    *(.data .data.* .gnu.linkonce.d.*)
+    } >ram
-    SORT(CONSTRUCTORS)
+    .data1          : { *(.data1) } >ram
-  }
+    .got.plt        : { *(.got.plt) } >ram
-  .data1          : { *(.data1) }
-  .got.plt        : { *(.got.plt) }
     . = .;
     _gp = ALIGN(16) + 0x7ff0;
     .got            : { *(.got) }
@@ -129,23 +60,17 @@ SECTIONS
        we can shorten the on-disk segment size.  */
     .sdata          :
     {
-    *(.sdata .sdata.* .gnu.linkonce.s.*)
+        *(.sdata .sdata.*)
-  }
+    } >ram
-  .lit8           : { *(.lit8) }
-  .lit4           : { *(.lit4) }
-  _edata = .; PROVIDE (edata = .);
     __bss_start = .;
-  _fbss = .;
     .sbss           :
     {
-    *(.dynsbss)
+        *(.sbss .sbss.*)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
         *(.scommon)
-  }
+    } >ram
     .bss            :
     {
-   *(.dynbss)
+        *(.bss .bss.*)
-   *(.bss .bss.* .gnu.linkonce.b.*)
         *(COMMON)
         /* Align here to ensure that the .bss section occupies space up to
            _end.  Align after .bss to ensure correct alignment even if the
@@ -153,57 +78,9 @@ SECTIONS
            FIXME: Why do we need it? When there is no .bss section, we don't
            pad the .data section.  */
         . = ALIGN(. != 0 ? 32 / 8 : 1);
-  }
+    } >ram
     . = ALIGN(32 / 8);
     . = ALIGN(32 / 8);
     _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* DWARF 3 */
-  .debug_pubtypes 0 : { *(.debug_pubtypes) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-  .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
-  .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
-  .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
-  .mdebug.abiN32 : { KEEP(*(.mdebug.abiN32)) }
-  .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
-  .mdebug.abiO64 : { KEEP(*(.mdebug.abiO64)) }
-  .mdebug.eabi32 : { KEEP(*(.mdebug.eabi32)) }
-  .mdebug.eabi64 : { KEEP(*(.mdebug.eabi64)) }
-  .gcc_compiled_long32 : { KEEP(*(.gcc_compiled_long32)) }
-  .gcc_compiled_long64 : { KEEP(*(.gcc_compiled_long64)) }
-  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
 }
+