Changes in uspace/lib/c/generic/rtld/module.c [ffccdff0:b27ae65a] in mainline

File:

• uspace/lib/c/generic/rtld/module.c (modified) (3 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);
 }
 
@@ -386 +398 @@
          * be correct, "zero" offset (i.e. the total size) must be aligned
          * to the strictest alignment present.
-         * Note that the padding is actually in front of the TLS data,
-         * not after it.
          */
         rtld->tls_size = ALIGN_UP(rtld->tls_size, rtld->tls_align);
 
-        /* Space for the TCB. */
+        /*
+         * Space for the TCB.
+         * Later, the TLS zero offset is equal to the pointer to tcb_t, so
+         * adding the sizeof(tcb_t) block AFTER we calculated the alignment
+         * of the remainder above is correct.
+         */
         rtld->tls_size += sizeof(tcb_t);
 #endif