Changeset 1564c4b in mainline for uspace/lib/c/arch/ia64

Timestamp:

2011-06-08T19:39:52Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

2af29ed

Parents:

e686889c (diff), 0eff68e (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

Location:

uspace/lib/c/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (2 diffs)
• src/entry.s (modified) (1 diff)
• src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/ia64/ia64.s ) (1 diff)
• src/thread_entry.s (modified) (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);
@@ -22 +40 @@
         
         .got : {
-                _gp = .;
+                /* Tell the linker where we expect GP to point. */
+                __gp = .;
                 *(.got .got.*);
         } :data

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

@@ -39 +39 @@
 __entry:
         alloc loc0 = ar.pfs, 0, 1, 2, 0
-        movl gp = _gp
+        movl gp = __gp
         
         # Pass PCB pointer as the first argument to __main

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
 

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

@@ -37 +37 @@
         alloc loc0 = ar.pfs, 0, 1, 1, 0
 
-        movl gp = _gp
+        movl gp = __gp
         
         #