Makefile: sort out CFLAGS and LDFLAGS

Makefile

@@ -74,22 +74,27 @@ endif
 ## 5. Compilation Rules
 
 BUILDDIR := $(DST_DIR)
+COMMON_CFLAGS := $(CFLAGS) -g -O3 -MMD -Wall \
+                 -fno-asynchronous-unwind-tables -fno-builtin -fno-stack-protector \
+                 -Wno-main -U_FORTIFY_SOURCE -fvisibility=hidden
 ### Build libam
-
 #### Include archetecture specific build flags
 include $(AM_HOME)/scripts/$(ARCH).mk
+COMMON_CFLAGS += -D__ARCH_$(shell echo $(ARCH) | tr a-z A-Z | tr - _) \
+                 -D__ISA_$(shell echo $(ISA) | tr a-z A-Z)__ \
+                 -DARCH_H=\"$(ARCH_H)\"
+INTERFACE_CFLAGS += -DARCH_H=\"$(ARCH_H)\" \
+                    -fno-asynchronous-unwind-tables \
+                    -fno-builtin -fno-stack-protector \
+                    -Wno-main -U_FORTIFY_SOURCE -fvisibility=hidden
 
 #### Generating build rules with ADD_LIBRARY call. Target specific build flags can be tuned via changing prefixed variables (AM_ here)
 AM_INCPATH += $(AM_HOME)/am/include $(AM_HOME)/am/src $(AM_HOME)/klib/include
-AM_CFLAGS  += -lm -g -O3 -MMD -Wall $(addprefix -I, $(AM_INCPATH)) \
+AM_CFLAGS += $(COMMON_CFLAGS) $(addprefix -I, $(AM_INCPATH))
-              -D__ISA__=\"$(ISA)\" -D__ISA_$(shell echo $(ISA) | tr a-z A-Z)__ \
-              -D__ARCH__=$(ARCH) -D__ARCH_$(shell echo $(ARCH) | tr a-z A-Z | tr - _) \
-              -D__PLATFORM__=$(PLATFORM) -D__PLATFORM_$(shell echo $(PLATFORM) | tr a-z A-Z | tr - _) \
-              -DARCH_H=\"$(ARCH_H)\"
 AM_INTERFACE_INCPATH += $(AM_HOME)/am/include $(AM_HOME)/klib/include
-AM_INTERFACE_CFLAGS += $(addprefix -I, $(AM_INTERFACE_INCPATH:%=$(INC_INSTALLDIR))) \
+AM_INTERFACE_CFLAGS += 
-                       -lm -DARCH_H=\"$(ARCH_H)\" -fno-asynchronous-unwind-tables -fno-builtin -fno-stack-protector \
+                       
-                       -Wno-main -U_FORTIFY_SOURCE -fvisibility=hidden
+AM_INTERFACE_LDFLAGS += -lm -lam-$(ARCH)
 
 $(eval $(call ADD_LIBRARY,$(LIB_BUILDDIR)/libam-$(ARCH).a,AM_))
 
@@ -98,10 +103,10 @@ $(eval $(call ADD_LIBRARY,$(LIB_BUILDDIR)/libam-$(ARCH).a,AM_))
 KLIB_SRCS := $(shell find klib/src/ -name "*.c")
 
 KLIB_INCPATH += $(AM_HOME)/am/include $(AM_HOME)/klib/include
-KLIB_CFLAGS += -MMD -Wall $(addprefix -I, $(KLIB_INCPATH)) \
+KLIB_CFLAGS += $(COMMON_CFLAGS) $(addprefix -I, $(KLIB_INCPATH))
-               -DARCH_H=\"$(ARCH_H)\"
 KLIB_INTERFACE_INCPATH += $(AM_HOME)/am/include $(AM_HOME)/klib/include
-KLIB_INTERFACE_CFLAGS += -DARCH_H=\"$(ARCH_H)\" $(addprefix -I, $(KLIB_INTERFACE_INCPATH:%=$(INC_INSTALLDIR)))
+KLIB_INTERFACE_CFLAGS +=
+KLIB_INTERFACE_LDFLAGS += -lklib-$(ARCH)
 
 $(eval $(call ADD_LIBRARY,$(LIB_BUILDDIR)/libklib-$(ARCH).a,KLIB_))
 
@@ -126,8 +131,10 @@ image-dep: $(OBJS) $(LIBS)
 ### Install rules
 
 INTERFACE_INCPATH += $(sort $(KLIB_INTERFACE_INCPATH) $(AM_INTERFACE_INCPATH))
-INTERFACE_CFLAGS += $(sort $(KLIB_INTERFACE_CFLAGS) $(AM_INTERFACE_CFLAGS))
+# TODO: Use sort here will cause error on seperated flags, such as: -e _start
-INTERFACE_LDFLAGS += $(sort $(KLIB_LDFLAGS) $(AM_LDFLAGS))
+# but without sort, duplicated flags will not be removed.
+INTERFACE_CFLAGS += $(addprefix -I, $(INTERFACE_INCPATH:%=$(INC_INSTALLDIR))) $(sort $(KLIB_INTERFACE_CFLAGS) $(AM_INTERFACE_CFLAGS))
+INTERFACE_LDFLAGS += -L$(LIB_INSTALLDIR) $(sort $(KLIB_INTERFACE_LDFLAGS) $(AM_INTERFACE_LDFLAGS))
 
 EXPORT_FLAGS_FILE := $(LIB_INSTALLDIR)/make/flags-$(ARCH).mk
 EXPORT_FLAGS_TEMPLATE := $(file < $(AM_HOME)/scripts/templates/flags.tmpl)
@@ -146,6 +153,13 @@ $(EXPORT_FLAGS_FILE):
 	@echo + INSTALL $(patsubst $(INSTALLDIR)/%,%,$@)
 	@install -Dm644 <(printf $(EXPORT_FLAGS_TEMPLATE)) $(EXPORT_FLAGS_FILE)
 
+LDSCRIPTS := $(patsubst $(AM_HOME)/scripts/%, $(LIB_INSTALLDIR)/ldscripts/%, $(shell find $(AM_HOME)/scripts -name "*.ld"))
+
+$(LDSCRIPTS): $(LIB_INSTALLDIR)/ldscripts/%: $(AM_HOME)/scripts/%
+	@echo + INSTALL $(patsubst $(INSTALLDIR)/%,%,$@)
+	@mkdir -p $(LIB_INSTALLDIR)/ldscripts
+	@install -Dm644 $< $(dir $@)
+
 install-libs: $(LIBS)
 	@echo + INSTALL LIBS: $(LIBS) 
 	@install -dm755 $(LIB_INSTALLDIR)
@@ -157,7 +171,7 @@ install-headers: $(HEADERS)	# Headers needs to be reinstalled if they are change
 	@install -dm755 $(INC_INSTALLDIR)
 	@cp -r $(addsuffix /*, $(INTERFACE_INCPATH)) $(INC_INSTALLDIR)
 
-install: $(EXPORTS) install-libs install-headers
+install: $(EXPORTS) install-libs install-headers $(LDSCRIPTS)
 
 ### Clean a single project (remove `build/`)
 clean:

am/src/platform/nemu/ioe/ioe.c

@@ -59,3 +59,4 @@ bool ioe_init() {
 
 void ioe_read(int reg, void *buf) { ((handler_t)lut[reg])(buf); }
 void ioe_write(int reg, void *buf) { ((handler_t)lut[reg])(buf); }
+

scripts/helpers/rules.mk

@@ -56,7 +56,7 @@ $(eval $(call COMPILE_RULES,$(2)))
 $(1).elf: $$($(2)OBJS) 
 	@mkdir -p $$(dir $$@)
 	@echo + LD "->" $$(patsubst $$(CURDIR)/%,%,$(1).elf)
-	@$$(LD) $$($(2)_LDFLAGS) -o $$@ --start-group $$($(2)OBJS) --end-group
+	@$$(LD) $$($(2)LDFLAGS) -o $$@ --start-group $$($(2)OBJS) --end-group
 $(1).bin: $(1).elf
 	@echo + OBJCOPY "->" $$(patsubst $$(CURDIR)/%,%,$(1))
 	@$$(OBJCOPY) -S --set-section-flags .bss=alloc,contents -O binary $(1).elf $(1).bin

scripts/platform/nemu.mk

@@ -7,10 +7,14 @@ AM_SRCS := am/src/platform/nemu/trm.c \
            am/src/platform/nemu/ioe/disk.c \
            am/src/platform/nemu/mpe.c
 
-AM_CFLAGS    += -fdata-sections -ffunction-sections
+AM_PUBLIC_CFLAGS := -fdata-sections -ffunction-sections
-AM_LDFLAGS   += -T $(AM_HOME)/scripts/linker.ld \
+AM_PUBLIC_LDFLAGS := --defsym=_pmem_start=0x80000000 --defsym=_entry_offset=0x0 \
-             --defsym=_pmem_start=0x80000000 --defsym=_entry_offset=0x0
+                     --gc-sections --entry=_start
-AM_LDFLAGS   += --gc-sections -e _start
+AM_CFLAGS += $(AM_PUBLIC_CFLAGS)
+AM_LDFLAGS += -T$(AM_HOME)/scripts/linker.ld $(AM_PUBLIC_LDFLAGS)
+
+AM_INTERFACE_CFLAGS += $(AM_PUBLIC_CFLAGS)
+AM_INTERFACE_LDFLAGS += -T$(LIB_INSTALLDIR)/ldscripts/linker.ld $(AM_PUBLIC_LDFLAGS)
 
 AM_CFLAGS += -DMAINARGS=\"$(mainargs)\"
 AM_INCPATH += $(AM_HOME)/am/src/platform/nemu/include