Ignore:
Timestamp:
2011-02-03T05:11:01Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ba38f72c
Parents:
22027b6e (diff), 86d7bfa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/loader/arch/ia32/_link.ld.in

    r22027b6e r8b5690f  
    33 * is the base address and the special interp section.
    44 */
     5
    56STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    67ENTRY(__entry)
     
    1011        text PT_LOAD FILEHDR PHDRS FLAGS(5);
    1112        data PT_LOAD FLAGS(6);
     13        debug PT_NOTE;
    1214}
    1315
     
    5355       
    5456        . = ALIGN(0x1000);
     57        _heap = .;
    5558       
    56         _heap = .;
     59#ifdef CONFIG_LINE_DEBUG
     60        .comment 0 : { *(.comment); } :debug
     61        .debug_abbrev 0 : { *(.debug_abbrev); } :debug
     62        .debug_aranges 0 : { *(.debug_aranges); } :debug
     63        .debug_info 0 : { *(.debug_info); } :debug
     64        .debug_line 0 : { *(.debug_line); } :debug
     65        .debug_loc 0 : { *(.debug_loc); } :debug
     66        .debug_pubnames 0 : { *(.debug_pubnames); } :debug
     67        .debug_pubtypes 0 : { *(.debug_pubtypes); } :debug
     68        .debug_ranges 0 : { *(.debug_ranges); } :debug
     69        .debug_str 0 : { *(.debug_str); } :debug
     70#endif
    5771       
    5872        /DISCARD/ : {
Note: See TracChangeset for help on using the changeset viewer.