Changeset 92574f4 in mainline for uspace/srv/loader/arch/ia64/_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/srv/loader/arch/ia64/_link.ld.in (modified) (5 diffs)

uspace/srv/loader/arch/ia64/_link.ld.in

@@ -12 +12 @@
                 *(.interp);
         } :interp
-
+        
         /* On Itanium code sections must be aligned to 16 bytes. */
         . = ALIGN(0x800000000 + SIZEOF_HEADERS, 16);
-
+        
         .init : {
                 *(.init);
-        } : text
+        } :text
+        
         .text : {
                 *(.text);
                 *(.rodata*);
         } :text
-
+        
         . = . + 0x4000;
-
+        
         .got : {
                 _gp = .;
                 *(.got*);
-        } :data 
+        } :data
+        
         .data : {
                 *(.opd);
@@ -35 +37 @@
                 *(.sdata);
         } :data
+        
         .tdata : {
                 _tdata_start = .;
@@ -40 +43 @@
                 _tdata_end = .;
         } :data
+        
         .tbss : {
                 _tbss_start = .;
@@ -45 +49 @@
                 _tbss_end = .;
         } :data
+        
         _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+        
         .bss : {
                 *(.sbss);
@@ -52 +58 @@
                 *(.bss);
         } :data
-
-        . = ALIGN(0x4000);
-        _heap = .;
- 
+        
         /DISCARD/ : {
                 *(*);
-        }
+        }
 }