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

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.

File:

• uspace/lib/c/generic/libc.c (modified) (6 diffs)

uspace/lib/c/generic/libc.c

@@ -61 +61 @@
 #endif
 
+progsymbols_t __progsymbols;
+
 static bool env_setup = false;
 
@@ -116 +118 @@
          * C++ Static constructor calls.
          */
-        ptrdiff_t init_array_entries = (__init_array_end - __init_array_start);
 
-        for (int i = init_array_entries - 1; i >= 0; --i)
-                __init_array_start[i]();
+        if (__progsymbols.preinit_array) {
+                for (int i = __progsymbols.preinit_array_len - 1; i >= 0; --i)
+                        __progsymbols.preinit_array[i]();
+        }
+
+        if (__progsymbols.init_array) {
+                for (int i = __progsymbols.init_array_len - 1; i >= 0; --i)
+                        __progsymbols.init_array[i]();
+        }
 
         /*
@@ -125 +133 @@
          * according the result
          */
-        int retval = main(argc, argv);
+        int retval = __progsymbols.main(argc, argv);
         exit(retval);
 }
@@ -136 +144 @@
          * when the respective constructor is called.
          */
-        ptrdiff_t fini_array_entries = (__fini_array_end - __fini_array_start);
 
-        for (int i = 0; i < fini_array_entries; ++i)
-                __fini_array_start[i]();
+        for (int i = 0; i < __progsymbols.fini_array_len; ++i)
+                __progsymbols.fini_array[i]();
 
         if (env_setup) {
@@ -148 +155 @@
 
         __SYSCALL1(SYS_TASK_EXIT, false);
-
-        /* Unreachable */
-        while (true)
-                ;
+        __builtin_unreachable();
 }
 
@@ -157 +161 @@
 {
         __SYSCALL1(SYS_TASK_EXIT, true);
-
-        /* Unreachable */
-        while (true)
-                ;
+        __builtin_unreachable();
 }