Makefile: remove unused variables and targets

Makefile

@@ -9,10 +9,10 @@ html:
 
 ## 1. Basic Setup and Checks
 
-### Default to create a bare-metal kernel image
+### Default to create all static libraries
 ifeq ($(MAKECMDGOALS),)
-  MAKECMDGOALS  = image
+  MAKECMDGOALS  = libs
-  .DEFAULT_GOAL = image
+  .DEFAULT_GOAL = libs
 endif
 
 ### Override checks when `make clean/clean-all/html`
@@ -37,7 +37,7 @@ PLATFORM   = $(word 2,$(ARCH_SPLIT))
 ### Checks end here
 endif
 
-## 2. General Compilation Targets
+## 2. Setup variables pointing to build and install directory
 
 ### Create the destination directory (`build/$ARCH`)
 WORK_DIR  ?= $(shell pwd)
@@ -47,7 +47,7 @@ INSTALLDIR ?= $(WORK_DIR)/build/install/$(ARCH)
 LIB_INSTALLDIR ?= $(INSTALLDIR)/lib
 INC_INSTALLDIR ?= $(INSTALLDIR)/include
 
-## 3. General Compilation Flags
+## 3. Toolchain setup
 
 ### (Cross) compilers, e.g., mips-linux-gnu-g++
 CC        ?= $(CROSS_COMPILE)gcc
@@ -59,17 +59,13 @@ OBJDUMP   ?= $(CROSS_COMPILE)objdump
 OBJCOPY   ?= $(CROSS_COMPILE)objcopy
 READELF   ?= $(CROSS_COMPILE)readelf
 
-CXXFLAGS +=  $(CFLAGS) -ffreestanding -fno-rtti -fno-exceptions
-LDFLAGS  += -z noexecstack
-INTERFACE_LDFLAGS  += -z noexecstack
-
 ## 4. Arch-Specific Configurations
 
-### Fall back to native gcc/binutils if there is no cross compiler
+# TODO: Removed CROSS_COMPILE toolchain setup as it's too complicated
-ifeq ($(wildcard $(shell which $(CC))),)
+# 		  for Makefile to do right. Force the user to provide a CROSS_COMPILE
-  $(info #  $(CC) not found; fall back to default gcc and binutils)
+# 		  prefix for now. They can also specify CFLAGS and LDFLAGS through
-  CROSS_COMPILE := riscv64-unknown-linux-gnu-
+# 		  environment variable.
-endif
+include $(AM_HOME)/scripts/$(ARCH).mk
 
 ## 5. Compilation Rules
 
@@ -77,16 +73,16 @@ 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
+INTERFACE_LDFLAGS += -z noexecstack
+INTERFACE_CFLAGS += -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)\" \
+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
@@ -114,22 +110,7 @@ LIBS := am klib
 libs: $(addsuffix -$(ARCH).a, $(addprefix $(LIB_BUILDDIR)/lib, $(ALL)))
 $(LIBS): %: $(addsuffix -$(ARCH).a, $(addprefix $(LIB_BUILDDIR)/lib, %))
 
-### Rule (link): objects (`*.o`) and libraries (`*.a`) -> `IMAGE.elf`, the final ELF binary to be packed into image (ld)
+## 6. Install rules
-$(IMAGE).elf: $(OBJS) $(LIBS)
-	@echo + LD "->" $(IMAGE_REL).elf
-	@$(LD) $(LDFLAGS) -o $(IMAGE).elf --start-group $(LINKAGE) --end-group
-
-## 6. Miscellaneous
-
-### Build order control
-image: image-dep
-archive: $(ARCHIVE)
-image-dep: $(OBJS) $(LIBS)
-	@echo \# Creating image [$(ARCH)]
-.PHONY: image image-dep archive run libs $(LIBS) install
-
-### Install rules
-
 INTERFACE_INCPATH += $(sort $(KLIB_INTERFACE_INCPATH) $(AM_INTERFACE_INCPATH))
 # TODO: Use sort here will cause error on seperated flags, such as: -e _start
 # but without sort, duplicated flags will not be removed.
@@ -173,6 +154,8 @@ install-headers: $(HEADERS)	# Headers needs to be reinstalled if they are change
 
 install: $(EXPORTS) install-libs install-headers $(LDSCRIPTS)
 
+.PHONY: libs $(LIBS) install
+
 ### Clean a single project (remove `build/`)
 clean:
 	rm -rf Makefile.html $(WORK_DIR)/build/

scripts/isa/riscv.mk

@@ -1,4 +1,3 @@
-CROSS_COMPILE := riscv64-linux-gnu-
 AM_CFLAGS        += -static -fno-pic -march=rv64g -mcmodel=medany  -mstrict-align
 AM_ASFLAGS       += -static -fno-pic -march=rv32g_zicsr -mcmodel=medany -O0
 AM_LDFLAGS       += -melf64lriscv -O2

scripts/platform/nemu.mk

@@ -10,21 +10,14 @@ AM_SRCS := am/src/platform/nemu/trm.c \
 AM_PUBLIC_CFLAGS := -fdata-sections -ffunction-sections
 AM_PUBLIC_LDFLAGS := --defsym=_pmem_start=0x80000000 --defsym=_entry_offset=0x0 \
                      --gc-sections --entry=_start
-AM_CFLAGS += $(AM_PUBLIC_CFLAGS)
+AM_CFLAGS += $(AM_PUBLIC_CFLAGS) -DMAINARGS=\"$(mainargs)\"
 AM_LDFLAGS += -T$(AM_HOME)/scripts/linker.ld $(AM_PUBLIC_LDFLAGS)
+AM_INCPATH += $(AM_HOME)/am/src/platform/nemu/include
 
 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
 .PHONY: $(AM_HOME)/am/src/platform/nemu/trm.c
 
-image: $(IMAGE).elf
-	@$(OBJDUMP) -d $(IMAGE).elf > $(IMAGE).txt
-	@echo + OBJCOPY "->" $(IMAGE_REL).bin
-	@$(OBJCOPY) -S --set-section-flags .bss=alloc,contents -O binary $(IMAGE).elf $(IMAGE).bin
-
 NEMUFLAGS += -b 
 #-l $(shell dirname $(IMAGE).elf)/nemu-log.txt 
 

scripts/riscv32-nemu.mk

@@ -1,7 +1,7 @@
 include $(AM_HOME)/scripts/isa/riscv.mk
 include $(AM_HOME)/scripts/platform/nemu.mk
-AM_CFLAGS  += -DISA_H=\"riscv/riscv.h\" -march=rv32im_zicsr -mabi=ilp32  # overwrite
+AM_CFLAGS  += -DISA_H=\"riscv/riscv.h\" -march=rv32im_zicsr -mabi=ilp32
-AM_LDFLAGS += -melf32lriscv                   # overwrite
+AM_LDFLAGS += -melf32lriscv
 
 AM_SRCS += am/src/riscv/nemu/start.S \
            am/src/riscv/nemu/cte.c \