Changeset 92574f4 in mainline for uspace/lib/c/arch/sparc64/_link.ld.in

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/c/arch/sparc64/_link.ld.in (modified) (3 diffs)

uspace/lib/c/arch/sparc64/_link.ld.in

@@ -9 +9 @@
 SECTIONS {
         . = 0x4000 + SIZEOF_HEADERS;
-
+        
         .init : {
                 *(.init);
         } :text
+        
         .text : {
                 *(.text);
                 *(.rodata*);
         } :text
-
+        
         . = . + 0x4000;
-
+        
         .got : {
                  _gp = .;
                  *(.got*);
         } :data
+        
         .data : {
                 *(.data);
                 *(.sdata);
         } :data
+        
         .tdata : {
                 _tdata_start = .;
@@ -36 +39 @@
                 _tbss_end = .;
         } :data
+        
         _tls_alignment = ALIGNOF(.tdata);
+        
         .bss : {
                 *(.sbss);
@@ -42 +47 @@
                 *(.bss);
         } :data
-
-        . = ALIGN(0x4000);
-        _heap = .;
         
         /DISCARD/ : {
                 *(*);
         }
-
 }