Changeset c576800 in mainline

Timestamp:

2024-05-29T18:16:31Z (5 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

69c376b5

Parents:

b192915a

Message:

The main program's relocation must be processed after the shared libs

File:

• uspace/lib/c/generic/rtld/module.c (modified) (2 diffs)

uspace/lib/c/generic/rtld/module.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -343 +343 @@
 {
         list_foreach(rtld->modules, modules_link, module_t, m) {
-                /* Skip rtld module, since it has already been processed */
-                if (m != &rtld->rtld) {
+                /*
+                 * Skip rtld module, since it has already been processed.
+                 * Skip start / main program -- leave it for later
+                 */
+                if (m != &rtld->rtld && m != start) {
                         module_process_relocs(m);
                 }
         }
+
+        /*
+         * Now that shared libraries have been processed and their variables
+         * are thus initialized, we can process the main program,
+         * which may contain COPY relocations that copy value from shared
+         * library variables to instances of those variables defined
+         * in the main program.
+         */
+        module_process_relocs(start);
 }