Changeset ebb1489 in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

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);
 }