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

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

@@ -3 +3 @@
  * is the base address.
  */
+
 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
@@ -16 +17 @@
                 *(.interp);
         } :interp
-
+        
         . = 0x70001000;
-
+        
         .init ALIGN(0x1000) : SUBALIGN(0x1000) {
                 *(.init);
         } :text
+        
         .text : {
                 *(.text);
@@ -31 +33 @@
                 *(.sdata);
         } :data
+        
         .tdata : {
                 _tdata_start = .;
@@ -36 +39 @@
                 _tdata_end = .;
         } :data
+        
         .tbss : {
                 _tbss_start = .;
@@ -41 +45 @@
                 _tbss_end = .;
         } :data
+        
         _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+        
         .bss : {
                 *(.sbss);
@@ -47 +53 @@
                 *(.bss);
         } :data
-
-        . = ALIGN(0x1000);
-        _heap = .;
         
         /DISCARD/ : {
                 *(*);
         }
-
 }