lucic71
/
lucicos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use linker instead of archiver in modules

This commit is contained in:
lucic71 2022-06-28 19:40:51 +03:00
parent f5ee945402
commit 8afd4661b5
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/Makefile
View File

@ -21,7 +21,7 @@ INCLUDEDIR?=$(PREFIX)/include
# Updated compiler flags # Updated compiler flags
CFLAGS:=$(CFLAGS) -ffreestanding -D__is_kernel -Iinclude -Wall -Wextra -Werror CFLAGS:=$(CFLAGS) -ffreestanding -D__is_kernel -Iinclude -Wall -Wextra -Werror
CPPFLAGS:=$(CPPFLAGS) CPPFLAGS:=$(CPPFLAGS)
LDFLAGS:=$(LDFLAGS) LDFLAGS:=$(LDFLAGS)
LIB_INCLUDE_FLAGS=-L./lib/so LIB_INCLUDE_FLAGS=-L./lib/so
@ -114,7 +114,7 @@ library_clean:
os.kernel: library_all module_all $(OBJS) $(ARCHDIR)/linker.ld os.kernel: library_all module_all $(OBJS) $(ARCHDIR)/linker.ld
$(CC) -T $(ARCHDIR)/linker.ld -o $@ $(CFLAGS) $(LINK_LIST) $(MODULE_OBJS) \ $(CC) -T $(ARCHDIR)/linker.ld -o $@ $(CFLAGS) $(LINK_LIST) $(MODULE_OBJS) \
$(LIB_INCLUDE_FLAGS) $(LIBS) $(LIB_INCLUDE_FLAGS) $(LIBS)
grub-file --is-x86-multiboot os.kernel grub-file --is-x86-multiboot os.kernel
$(ARCHDIR)/crtbegin.o $(ARCHDIR)/crtend.o: $(ARCHDIR)/crtbegin.o $(ARCHDIR)/crtend.o:

12
kernel/Makefile.Module
View File

@ -28,6 +28,10 @@ OBJ += $(ASM:$(ASM_DIR)/%.S=$(OBJ_DIR)/%.o)
HFLAGS = -MMD HFLAGS = -MMD
CFLAGS+=-c CFLAGS+=-c
# Linker settings.
LDFLAGS = -r -nostdlib -ffreestanding -lgcc
# Include directories # Include directories
INCFLAGS = $(foreach TMP, $(LIB_INCLUDE_DIRS), -I$(TMP)) INCFLAGS = $(foreach TMP, $(LIB_INCLUDE_DIRS), -I$(TMP))
@ -37,8 +41,8 @@ INCFLAGS += $(foreach TMP, $(INCLUDE_DIRS), -I$(TMP))
all: $(MOD_OBJ) all: $(MOD_OBJ)
$(MOD_OBJ): $(OBJ) | $(MOBJ_DIR) $(MOD_OBJ): $(OBJ)
$(AR) rcs $@ $(OBJ) $(CC) $(OBJ) -o $@ $(LDFLAGS)
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c | $(OBJ_DIR) $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c | $(OBJ_DIR)
$(CC) $< -o $@ $(CFLAGS) $(HFLAGS) $(INCFLAGS) $(CC) $< -o $@ $(CFLAGS) $(HFLAGS) $(INCFLAGS)
@ -46,10 +50,10 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c | $(OBJ_DIR)
$(OBJ_DIR)/%.o: $(ASM_DIR)/%.S | $(OBJ_DIR) $(OBJ_DIR)/%.o: $(ASM_DIR)/%.S | $(OBJ_DIR)
$(CC) $< -o $@ $(CFLAGS) $(HFLAGS) $(INCFLAGS) $(CC) $< -o $@ $(CFLAGS) $(HFLAGS) $(INCFLAGS)
$(OBJ_DIR) $(MOBJ_DIR): $(OBJ_DIR):
mkdir -p $@ mkdir -p $@
clean: clean:
@$(RM) -rv $(OBJ_DIR) $(MOBJ_DIR) @$(RM) -rv $(OBJ_DIR)
-include $(OBJ:.o=.d) -include $(OBJ:.o=.d)