Changeset 8aa2b3b in mainline for uspace/srv/loader

Timestamp:

2011-04-03T15:41:33Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e2098dd7

Parents:

3a3d4ca (diff), b2a081ae (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/srv/loader

Files:

• arch/abs32le/_link.ld.in (modified) (1 diff)
• arch/amd64/_link.ld.in (modified) (1 diff)
• arch/arm32/_link.ld.in (modified) (1 diff)
• arch/ia32/_link.ld.in (modified) (1 diff)
• arch/ia64/_link.ld.in (modified) (2 diffs)
• arch/mips32/_link.ld.in (modified) (1 diff)
• arch/ppc32/_link.ld.in (modified) (1 diff)
• arch/sparc64/_link.ld.in (modified) (1 diff)
• main.c (modified) (1 diff)

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

@@ -21 +21 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

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

@@ -27 +27 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

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

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

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

@@ -26 +26 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

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

@@ -21 +21 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         
@@ -29 +29 @@
         .got : {
                 _gp = .;
-                *(.got*);
+                *(.got .got.*);
         } :data
         

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

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

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

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

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

@@ -20 +20 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/main.c

@@ -415 +415 @@
                         /* Not reached */
                 default:
-                        retval = ENOENT;
+                        retval = EINVAL;
                         break;
                 }
-                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) {
-                        DPRINTF("Responding EINVAL to method %d.\n",
-                            IPC_GET_IMETHOD(call));
-                        async_answer_0(callid, EINVAL);
-                }
+                
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
+                        async_answer_0(callid, retval);
         }
 }