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

Timestamp:

2018-07-11T17:45:30Z (7 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/riscv64

Files:

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

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

@@ -54 +54 @@
 
         .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/riscv64/src/entry.c

@@ -30 +30 @@
  */
 
-#include "../../../generic/private/libc.h"
-
 extern void _start(void);
+extern void __c_start(void *);
 
 // FIXME: Implement properly.
@@ -38 +37 @@
 void _start(void)
 {
-        __libc_main((void *) 0);
+        __c_start(0);
 }