LD scripts subdir

djphoenix · Nov 3, 2016 · 0c9b192 · 0c9b192
1 parent bd98da3
commit 0c9b192
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/ld-mod.script → ld/module.ld b/ld-mod.script → ld/module.ld
@@ -16,6 +16,7 @@
 */
 
 OUTPUT_FORMAT(elf64-x86-64)
+ENTRY(module)
 SECTIONS
 {
     .text BLOCK(1) : ALIGN(1) {
@@ -24,9 +25,11 @@ SECTIONS
         *(.gnu.linkonce.t.*)
         *(.fini)
     }
-    .data BLOCK(1) : ALIGN(1) {
+    .rodata BLOCK(1) : ALIGN(1) {
         *(.init_array*)
         *(.rodata .rodata.* .rdata .rdata.*)
+    }
+    .data BLOCK(1) : ALIGN(1) {
         *(.data .data.*)
         *(.xdata .xdata.* .pdata .pdata.*)
     }

diff --git a/ld.script → ld/system.ld b/ld.script → ld/system.ld
diff --git a/makefiles/rules.mk b/makefiles/rules.mk
@@ -8,7 +8,7 @@ endif
 $(BIN).elf: $(OBJECTS) $(OOBJDIR)/modules-linked.o
 	@ mkdir -p $(dir $@)
 	$(QECHO) LD $(subst $(OIMGDIR)/,,$@)
-	$(Q) $(CC) $(CFLAGS) -Tld.script -o $@ -Wl,--start-group $^ -Wl,--end-group
+	$(Q) $(CC) $(CFLAGS) -Lld -Tsystem.ld -o $@ -Wl,--start-group $^ -Wl,--end-group
 
 $(BIN).elf.strip: $(BIN).elf
 	$(Q) $(STRIP) -o $@ $^
@@ -41,7 +41,7 @@ $(OOBJDIR)/%.o: $(SRCDIR)/%.s
 $(OMODDIR)/%.o: $(OOBJDIR)/mod_%.o
 	@ mkdir -p $(dir $@)
 	$(QECHO) MODLD $(@:$(OMODDIR)/%.o=%)
-	$(Q) $(CC) $(CFLAGS) -Tld-mod.script -r -o $@ -s $^
+	$(Q) $(CC) $(CFLAGS) -shared -Lld -Tmodule.ld -r -o $@ -s $^
 
 $(OOBJDIR)/modules-linked.o: $(MODOBJS)
 	@ mkdir -p $(dir $@)