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

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/amd64

Files:

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

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

@@ -57 +57 @@
 
         .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/amd64/src/entry.S

@@ -29 +29 @@
 #include <abi/asmtool.h>
 
-.section .init, "ax"
+.text
 
 .org 0
@@ -46 +46 @@
 
         # %rdi was deliberately chosen as the first argument is also in %rdi
-        # Pass PCB pointer to __libc_main (no operation)
-        call __libc_main
+        # Pass PCB pointer to __c_start (no operation)
+        call __c_start