From b28fd7d9121c63ae6a1737d890414ef8cce177e0 Mon Sep 17 00:00:00 2001
From: Kimplul <kimi.h.kuparinen@gmail.com>
Date: Mon, 23 May 2022 22:05:16 +0300
Subject: modify file gen

---
 arch/riscv64/gen/source.mk       | 10 +++++++---
 arch/riscv64/kernel/entry.S      |  2 +-
 arch/riscv64/kernel/gen/.gitkeep |  0
 arch/riscv64/source.mk           |  2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 arch/riscv64/kernel/gen/.gitkeep

(limited to 'arch/riscv64')

diff --git a/arch/riscv64/gen/source.mk b/arch/riscv64/gen/source.mk
index c1b68f9..fda9651 100644
--- a/arch/riscv64/gen/source.mk
+++ b/arch/riscv64/gen/source.mk
@@ -1,11 +1,15 @@
-OFFSET_HEADER	:= $(ARCH_SOURCE)/gen/asm-offsets.h
+OFFSET_HEADER	:= $(ARCH_SOURCE)/kernel/gen/asm-offsets.h
 OFFSET_SOURCE	:= $(ARCH_SOURCE)/gen/asm-offsets.c
 
 $(OFFSET_HEADER): $(OFFSET_SOURCE)
 	echo "#ifndef APOS_ASM_OFFSETS_H" > $(OFFSET_HEADER)
 	echo "#define APOS_ASM_OFFSETS_H" >> $(OFFSET_HEADER)
-	$(COMPILER) $(DEPFLAGS) $(INCLUDE_FLAGS) -S $(OFFSET_SOURCE) -o - |\
+	echo "/**" >> $(OFFSET_HEADER)
+	echo " * @file asm-offsets.h" >> $(OFFSET_HEADER)
+	echo " * This comment is to shut up warnings." >> $(OFFSET_HEADER)
+	echo " */" >> $(OFFSET_HEADER)
+	$(COMPILER) $(INCLUDE_FLAGS) -S $(OFFSET_SOURCE) -o - |\
 		awk '($$1 == "#->") { print "#define " $$2 " " $$3 }' >> $(OFFSET_HEADER)
 	echo "#endif /* APOS_ASM_OFFSETS_H */" >> $(OFFSET_HEADER)
 
-CLEANUP	+= $(ARCH_SOURCE)/gen/asm-offsets.h
+CLEANUP	+= $(ARCH_SOURCE)/kernel/gen/asm-offsets.h
diff --git a/arch/riscv64/kernel/entry.S b/arch/riscv64/kernel/entry.S
index ab4ed5c..a5427a7 100644
--- a/arch/riscv64/kernel/entry.S
+++ b/arch/riscv64/kernel/entry.S
@@ -1,4 +1,4 @@
-#include "../gen/asm-offsets.h"
+#include "../kernel/gen/asm-offsets.h"
 #include "../kernel/csr.h"
 
 #if __riscv_xlen == 64
diff --git a/arch/riscv64/kernel/gen/.gitkeep b/arch/riscv64/kernel/gen/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/arch/riscv64/source.mk b/arch/riscv64/source.mk
index 2768e88..a1ef1d3 100644
--- a/arch/riscv64/source.mk
+++ b/arch/riscv64/source.mk
@@ -21,7 +21,7 @@ run:
 include $(ARCH_SOURCE)/gen/source.mk
 
 # dependecy generation
-$(ARCH_BUILD)/kernel/entry.o: $(ARCH_SOURCE)/gen/asm-offsets.h
+$(ARCH_BUILD)/kernel/entry.o: $(ARCH_SOURCE)/kernel/gen/asm-offsets.h
 
 # full cleanup
 CLEANUP_CMD	:= $(ARCH_SOURCE)/conf/rmimage.sh
-- 
cgit v1.3