Changeset f798178 in mainline for uspace/lib/c/arch/ia32

Timestamp:

2011-04-30T13:44:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4ddbea7

Parents:

a71d2630 (diff), 3f461ecf (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.

Location:

uspace/lib/c/arch/ia32

Files:

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

uspace/lib/c/arch/ia32/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/ia32/_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);
         debug PT_NOTE;
@@ -9 +14 @@
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);

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

@@ -27 +27 @@
 #
 
-.globl program_run
+.globl entry_point_jmp
 
-## void program_run(void *entry_point, void *pcb);
+## void entry_point_jmp(void *entry_point, void *pcb);
 #
-# Jump to a program entry point
-program_run:
+# Jump to program entry point
+entry_point_jmp:
         # Use standard ia32 prologue not to confuse anybody
         push %ebp