Changeset 2eadda9 in mainline for uspace/lib/c/arch/mips32

Timestamp:

2018-07-11T17:45:30Z (8 years ago)

Author:

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

Branches:

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

Children:

99d3123

Parents:

c2c4127

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-11 17:08:12)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-11 17:45:30)

Message:

Remove undefined references to main program from shared libc.

Location:

uspace/lib/c/arch/mips32

Files:

• _link.ld.in (modified) (1 diff)
• src/entry.S (modified) (2 diffs)

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

@@ -62 +62 @@
 
         .init_array : {
+#ifndef SHLIB
                 PROVIDE_HIDDEN (__init_array_start = .);
+#endif
                 KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
                 KEEP (*(.init_array .ctors))
+#ifndef SHLIB
                 PROVIDE_HIDDEN (__init_array_end = .);
+#endif
         }
 
         .fini_array : {
+#ifndef SHLIB
                 PROVIDE_HIDDEN (__fini_array_start = .);
+#endif
                 KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
                 KEEP (*(.fini_array .dtors))
+#ifndef SHLIB
                 PROVIDE_HIDDEN (__fini_array_end = .);
+#endif
         }
 

uspace/lib/c/arch/mips32/src/entry.S

@@ -31 +31 @@
 
 .text
-.section .init, "ax"
 
 .set noreorder
@@ -51 +50 @@
         .cprestore 16
 
-        # Pass pcb_ptr to __libc_main() as the first argument. It is already
+        # Pass pcb_ptr to __c_start() as the first argument. It is already
         # in $a0. As the first argument is passed in $a0, no operation
         # is needed.
 
-        jal __libc_main
+        jal __c_start
         nop