Fix paging table .data section copy

thu-cs-lab · Nov 12, 2020 · 6b0ff5a · 6b0ff5a
1 parent 3aab532
commit 6b0ff5a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/kernel/Makefile b/kernel/Makefile
@@ -67,7 +67,7 @@ $(OBJ): $(OBJDIR)/%.o : $(SRCDIR)/%.S $(CONFIG_FILE) $(HEADER)
 	$(CC) -o $@ $< -c -I$(INCLUDE) $(ASFLAGS)
 
 kernel.bin: $(TARGET)
-	@$(GCCPREFIX)objcopy -j .text -j .text.* -j .rodata -O binary -v $< $@
+	@$(GCCPREFIX)objcopy -j .text -j .text.* -j .rodata -j .data -O binary -v $< $@
 
 kernel.asm: $(TARGET)
 	@$(GCCPREFIX)objdump -d -S $< > $@

diff --git a/kernel/kern/kernel32.ld b/kernel/kern/kernel32.ld
@@ -26,4 +26,7 @@ SECTIONS
     .rodata : {
         *(.rodata)
     }
+    .data : {
+        *(.data)
+    }
 }
diff --git a/kernel/kern/kernel64.ld b/kernel/kern/kernel64.ld
@@ -26,4 +26,7 @@ SECTIONS
     .rodata : {
         *(.rodata)
     }
+    .data : {
+        *(.data)
+    }
 }