Changeset 16 for Whitix/trunk/user/linker/load_lib.c

Timestamp:

03/12/08 21:07:23 (8 months ago)

Author:

mwhitworth

Message:

Fix linker problem.

Files:

• Whitix/trunk/user/linker/load_lib.c (modified) (3 diffs)

Whitix/trunk/user/linker/load_lib.c

@@ -115 +115 @@
                                 elfProt|=2;
 
-                        if (loadAddr || !picLib)
+                        if (*loadAddr || !picLib)
                                 mmapFlags|=_SYS_MMAP_FIXED;
 
@@ -153 +153 @@
                                 /* Zero out the bss. */
                                 if (PAGE_OFFSET(elfBss) > 0)
-                                {
-                                        DWORD partSize=PAGE_OFFSET(pHeaders[i].memSize-pHeaders[i].fileSize);
-                                        link_memset((void*)(pHeaders[i].vAddr+pHeaders[i].fileSize), 0, partSize);
-                                }
+                                        link_memset((void*)(pHeaders[i].vAddr+pHeaders[i].fileSize), 0, PAGE_OFFSET(pHeaders[i].memSize-pHeaders[i].fileSize));
                         }
                 }
@@ -251 +248 @@
         }
 
-        DlCreateResolveEntry(name, pHeaders, fileHeader.phEntries, loadAddr, dynamicAddr, dynEntries);
+        entry=DlCreateResolveEntry(name, pHeaders, fileHeader.phEntries, loadAddr, dynamicAddr, dynEntries);
 
         /* Initialize the global offset table (GOT) */