diff src/makefile-armgccbc @ 54:aa0095c4c2b0

fix cmake linker options
author anatofuz
date Thu, 06 Jun 2019 19:16:22 +0900
parents 36bd61f5c847
children
line wrap: on
line diff
--- a/src/makefile-armgccbc	Mon Jun 03 19:39:11 2019 +0900
+++ b/src/makefile-armgccbc	Thu Jun 06 19:16:22 2019 +0900
@@ -31,42 +31,44 @@
 # link the libgcc.a for __aeabi_idiv. ARM has no native support for div
 LIBS = $(LIBGCC)
 
+CMAKEDIR =  CMakeFiles/kernel.dir
+
 OBJS = \
-	lib/string.o \
+	$(CMAKEDIR)/lib/string.c.o \
+	$(CMAKEDIR)/c/kernel-context.c.o\
+	$(CMAKEDIR)/arm.c.o\
+	$(CMAKEDIR)/asm.S.o\
+	$(CMAKEDIR)/bio.c.o\
+	$(CMAKEDIR)/buddy.c.o\
+	$(CMAKEDIR)/c/console.c.o\
+	$(CMAKEDIR)/exec.c.o\
+	$(CMAKEDIR)/c/file.c.o\
+	$(CMAKEDIR)/fs.c.o\
+	$(CMAKEDIR)/log.c.o\
+	$(CMAKEDIR)/main.c.o\
+	$(CMAKEDIR)/memide.c.o\
+	$(CMAKEDIR)/c/pipe.c.o\
+	$(CMAKEDIR)/c/proc.c.o\
+	$(CMAKEDIR)/c/spinlock.c.o\
+	$(CMAKEDIR)/start.c.o\
+	$(CMAKEDIR)/swtch.S.o\
+	$(CMAKEDIR)/c/syscall.c.o\
+	$(CMAKEDIR)/c/sysfile.c.o\
+	$(CMAKEDIR)/sysproc.c.o\
+	$(CMAKEDIR)/trap_asm.c.o\
+	$(CMAKEDIR)/trap.c.o\
+	$(CMAKEDIR)/vm.c.o \
 	\
-	arm.o\
-	asm.o\
-	bio.o\
-	buddy.o\
-	console.o\
-	exec.o\
-	file.o\
-	fs.o\
-	log.o\
-	main.o\
-	memide.o\
-	pipe.o\
-	proc.o\
-	spinlock.o\
-	start.o\
-	swtch.o\
-	syscall.o\
-	sysfile.o\
-	sysproc.o\
-	trap_asm.o\
-	trap.o\
-	vm.o \
-	\
-	device/picirq.o \
-	device/timer.o \
-	device/uart.o
+	$(CMAKEDIR)/device/picirq.c.o \
+	$(CMAKEDIR)/device/timer.c.o \
+	$(CMAKEDIR)/device/uart.c.o
 
-KERN_OBJS = $(OBJS) entry.o
-kernel.elf: $(addprefix build/,$(KERN_OBJS)) kernel.ld build/initcode build/fs.img
+KERN_OBJS = $(OBJS) entry.S.o
+kernel.elf: $(KERN_OBJS) kernel.ld build/initcode build/fs.img
 	cp -f build/initcode initcode
 	cp -f build/fs.img fs.img
 	$(call LINK_BIN, kernel.ld, kernel.elf, \
-		$(addprefix build/,$(KERN_OBJS)), \
+		$(KERN_OBJS), \
 		initcode fs.img)
 	$(OBJDUMP) -S kernel.elf > kernel.asm
 	$(OBJDUMP) -t kernel.elf | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernel.sym