build changes

2 files changed, 15 insertions, 14 deletions

diff --git a/kc/core/Makefile b/kc/core/Makefile
index 7abf20b..f56fc7c 100644
--- a/kc/core/Makefile
+++ b/kc/core/Makefile
@@ -7,23 +7,19 @@ TARGET := kernel.os
 .DEFAULT: $(TARGET)
 
 CPPFLAGS += -I../../api -I../api -I../../lib -I.
-CFLAGS += -Wno-unused-const-variable -Wno-unused-function -fvisibility=hidden -g
+CFLAGS += -mcmodel=small -Wno-unused-const-variable -Wno-unused-function -fvisibility=hidden -g
 
-SOBJS := 
-GOBJS := entry_x86_64.o reloc_x86_64.o dynamic_x86_64.o \
-	 kprintf.o serial.o port.o mmu.o kc_main.o memory.o memset.o memcpy.o \
-	 memmove.o memcmp.o cpu.o vm_tree.o exceptions.o panic.o msr.o task.o \
-	 cpu_task.o irq.o kcc_memory.o string.o pic8259.o pic8259_isr.o \
-	 pit8253.o page_early.o page_stack.o kstdio.o video.o i8042.o
-IOBJS :=
+AOBJS := entry_x86_64.o reloc_x86_64.o dynamic_x86_64.o
+COBJS := mmu.o cpu_task.o irq.o exceptions.o cpu.o msr.o mmu.o port.o
+POBJS := pic8259.o pic8259_isr.o pit8253.o i8042.o
+GOBJS := serial.o kc_main.o memory.o vm_tree.o panic.o task.o \
+	     kcc_memory.o page_early.o page_stack.o video.o
+LOBJS := kprintf.o memset.o memcpy.o memmove.o memcmp.o kstdio.o string.o
 
-# __attribute__((interrupt)) requires -mgeneral-regs-only
-$(GOBJS): CFLAGS += -mgeneral-regs-only
-$(GOBJS): CFLAGS += -mcmodel=small
-
-OBJS := $(SOBJS) $(GOBJS) $(IOBJS)
+OBJS := $(AOBJS) $(COBJS) $(POBJS) $(GOBJS) $(LOBJS)
 DEPS := $(patsubst %.o,%.d,$(OBJS))
 
+
 $(TARGET): $(LDSCRIPT) $(MAKEFILE_LIST)
 $(TARGET): $(OBJS)
 
diff --git a/kc/kc.ld b/kc/kc.ld
index 97d6a2a..82c0eba 100644
--- a/kc/kc.ld
+++ b/kc/kc.ld
@@ -31,6 +31,12 @@ SECTIONS
         *(.dynstr)
     }
 
+    .rodata :
+    {
+        *(.rodata)
+        *(.rodata.*)
+    }
+
     .text : ALIGN(4K)
     {
         PROVIDE_HIDDEN(kc_text_begin = .);
@@ -63,7 +69,6 @@ SECTIONS
 
     .data :
     {
-        *(.rodata)
         *(.data)
     }