Changeset 3375bd4 in mainline for uspace/lib/c/arch/arm32/_link.ld.in

Timestamp:

2011-05-17T07:44:17Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (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

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

File:

• uspace/lib/c/arch/arm32/_link.ld.in (modified) (1 diff)

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

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);