Changeset 3f461ecf in mainline for uspace/lib/c/arch/ia64

Timestamp:

2011-04-30T13:23:34Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a41577e, f798178

Parents:

afdcc60e (diff), 28c4ca7 (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 loader / linker script improvements.

Location:

uspace/lib/c/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (1 diff)
• src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/ia64/ia64.s ) (1 diff)

uspace/lib/c/arch/ia64/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.S \

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

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
         text PT_LOAD FLAGS(5);
+#else
+        text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x800000000 + SIZEOF_HEADERS;
+#else
         . = 0x4000 + SIZEOF_HEADERS;
-        
+#endif
+        /*
+         * XXX This is just a work around. Problem: .init section does not
+         * have the proper alignment.
+         */
+        . = ALIGN(., 16);
+
         .init : {
                 *(.init);

uspace/lib/c/arch/ia64/src/entryjmp.s

@@ -28 +28 @@
 
 .text
-.globl program_run
+.globl entry_point_jmp
 
-## void program_run(void *entry_point, void *pcb);
+## void entry_point_jmp(void *entry_point, void *pcb);
 #
 # in0 (r32)     contains entry_point
 # in1 (r33)     contains pcb
 #
-# Jump to a program entry point
-program_run:
+# Jump to program entry point
+entry_point_jmp:
         # Pass pcb to the entry point in r2