Changeset 544a2e4 in mainline for uspace/lib/c/arch/ia32/_link.ld.in

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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.

Message:

Merge mainline changes.

File:

• uspace/lib/c/arch/ia32/_link.ld.in (modified) (4 diffs)

uspace/lib/c/arch/ia32/_link.ld.in

@@ +1 @@
+#ifndef SHLIB
 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
+#endif
 
 PHDRS {
+#if defined(LOADER) || defined(DLEXE)
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
+#if defined(SHLIB) || defined(DLEXE)
+        dynamic PT_DYNAMIC;
+#endif
         debug PT_NOTE;
 }
 
 SECTIONS {
+#if defined(LOADER) || defined(DLEXE)
+        .interp : {
+                *(.interp);
+        } :interp
+#endif
+#ifdef LOADER
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);
@@ -19 +37 @@
                 *(.rodata .rodata.*);
         } :text
+
+#if defined(SHLIB) || defined(DLEXE)
+        .rel.plt : {
+                *(.rel.plt);
+        }
+        /* 
+         *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+         * without alignment gap or DT_REL will be broken
+         */
+        .rel.dyn : {
+                *(.rel.*);
+        } :text
         
+        .plt : {
+                *(.plt);
+        } :text
+        
+        .dynsym : {
+                *(.dynsym);
+        } :text
+        
+        .dynstr : {
+                *(.dynstr);
+        } :text
+        
+        .hash : {
+                *(.hash);
+        } :text
+#endif
         . = . + 0x1000;
+        
+#if defined(SHLIB) || defined(DLEXE)
+        .dynamic : {
+                *(.dynamic);
+        } :data :dynamic
+#endif
         
         .data : {
@@ -26 +78 @@
         } :data
         
+#if defined(SHLIB) || defined(DLEXE)
+        .data.rel : {
+                *(.data.rel .data.rel.*);
+        } :data
+
+        .got : {
+                *(.got);
+        } :data
+        .got.plt : {
+                *(.got.plt);
+        } :data
+#endif
+        
+#ifndef DLEXE
         .tdata : {
                 _tdata_start = .;
@@ -37 +103 @@
         
         _tls_alignment = ALIGNOF(.tdata);
+#endif
         
         .bss : {
+                *(.dynbss);
                 *(COMMON);
                 *(.bss);