Changeset 2eadda9 in mainline for uspace/lib/c/generic/private/libc.h

Timestamp:

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

File:

• uspace/lib/c/generic/private/libc.h (modified) (2 diffs)

uspace/lib/c/generic/private/libc.h

@@ -36 +36 @@
 #define LIBC_PRIVATE_LIBC_H_
 
+#include <types/common.h>
+
+/* Type of the main C function. */
+typedef int (*main_fn_t)(int, char **);
+
 /**
  * Used for C++ constructors/destructors
@@ -43 +48 @@
 typedef void (*fini_array_entry_t)();
 
-extern init_array_entry_t __init_array_start[];
-extern init_array_entry_t __init_array_end[];
-extern fini_array_entry_t __fini_array_start[];
-extern fini_array_entry_t __fini_array_end[];
+typedef struct {
+        main_fn_t main;
+        const void *elfstart;
+        const void *end;
+        init_array_entry_t *preinit_array;
+        int preinit_array_len;
+        init_array_entry_t *init_array;
+        int init_array_len;
+        fini_array_entry_t *fini_array;
+        int fini_array_len;
+} progsymbols_t;
 
-extern unsigned char _end[];
+extern progsymbols_t __progsymbols;
 extern void __libc_main(void *) __attribute__((noreturn));
 extern void __libc_exit(int) __attribute__((noreturn));
 extern void __libc_abort(void) __attribute__((noreturn));
-extern int main(int, char *[]);
 
 #endif