Build: Adapt Terapines Zcc(>=4.1.2) compiler options to match STDCLIB makefile variable. (#63)

* [terapines.mk] Use different --config options for each STDCLIB (Require after zcc 4.1.2).

* [zcc] Remove the -fuse-size-lib compile flag
This option is no longer effective in zcc version 4.1.2 and later.
This option searches for C libraries under the size directory and is now being deprecated.

* Build: Update the built-in basic library link option of ZCC Toolchain

* docs: Add the version description of zcc toolchain to prevent users from making mistakes during use

Author: kaishaoshao

Build/toolchain/terapines.mk

@@ -1,3 +1,5 @@
+# Required Version: ZCC Toolchain Version >= 4.1.2
+# If the zcc toolchain version is less than 4.1.2, use nuclei-sdk v0.8.0
 CC      := zcc
 CXX     := z++
 OBJDUMP := llvm-objdump
@@ -18,18 +20,18 @@ ifneq ($(findstring newlib,$(STDCLIB)),)
 ifeq ($(STDCLIB),newlib_full)
 LDLIBS += -lc -lclang_rt.builtins
 else ifeq ($(STDCLIB),newlib_fast)
-LDLIBS += -lc_nano -lclang_rt.builtins
+LDLIBS += -lc_small -lclang_rt.builtins_small
 STDCLIB_LDFLAGS += -u _printf_float -u _scanf_float
 else ifeq ($(STDCLIB),newlib_small)
-LDLIBS += -lc_nano -lclang_rt.builtins
+LDLIBS += -lc_small -lclang_rt.builtins_small
 STDCLIB_LDFLAGS += -u _printf_float
 else ifeq ($(STDCLIB),newlib_nano)
-LDLIBS += -lc_nano -lclang_rt.builtins
+LDLIBS += -lc_nano -lclang_rt.builtins_nano
 # work around for relocation R_RISCV_PCREL_HI20 out of range: -524289 is not in [-524288, 524287]; references _printf_float when compile with rv64
 # If it report above error, you can add -u _printf_float
 STDCLIB_LDFLAGS += #-u _printf_float
 else
-LDLIBS += -lc_nano -lclang_rt.builtins
+LDLIBS +=  -lc_small -lclang_rt.builtins_small
 STDCLIB_LDFLAGS += #-u _printf_float
 endif
 ###
@@ -47,7 +49,7 @@ else ifeq ($(STDCLIB),nospec)
 COMMON_FLAGS +=
 ###
 else
-LDLIBS += -lc_nano -lclang_rt.builtins
+LDLIBS += -lc_small -lclang_rt.builtins_small
 STDCLIB_LDFLAGS += -u _printf_float
 ###
 endif

SoC/evalsoc/Common/npk.yml

@@ -572,7 +572,7 @@ buildconfig:
         condition: $( startswith(${stdclib}, "newlib") && ${semihost} == 1 )
 
   - type: zcc
-    description: Terapines ZCC Toolchain
+    description: Terapines ZCC Toolchain  # Required Version: ZCC Toolchain Version >= 4.1.2
     toolchain_name: Terapines ZCC
     common_flags: # flags need to be combined together across all packages
       # Enable experimental extensions for zcc
@@ -586,16 +586,16 @@ buildconfig:
         condition: $( startswith(${stdclib}, "newlib") )
       - flags: -lc -lclang_rt.builtins
         condition: $( ${stdclib} == "newlib_full" )
-      - flags: -lc_nano -lclang_rt.builtins -u _printf_float -u _scanf_float
+      - flags: -lc_small -lclang_rt.builtins_small
         condition: $( ${stdclib} == "newlib_fast" )
-      - flags: -lc_nano -lclang_rt.builtins -u _printf_float
+      - flags: -lc_small -lclang_rt.builtins_small
         condition: $( ${stdclib} == "newlib_small" )
-      - flags: -lc_nano -lclang_rt.builtins -u _printf_float
+      - flags: -lc_small -lclang_rt.builtins_small
         condition: $( startswith(${stdclib}, "libncrt") )
       - flags: -fuse-ld=lld
       - flags: -u __on_exit_args
         condition: $( startswith(${stdclib}, "newlib") )
-      - flags: -lc_nano -lclang_rt.builtins
+      - flags: -lc_nano -lclang_rt.builtins_nano
         condition: $( ${stdclib} == "newlib_nano" )
       - flags: -lsemihost
         condition: $( ${semihost} == 1 )

application/baremetal/benchmark/coremark/npk.yml

@@ -104,5 +104,5 @@ buildconfig:
     common_flags: # flags need to be combined together across all packages
       - flags: -O3 -flto -falign-functions=4 -falign-loops=4 -flate-loop-unroll -malign-branch
     ldflags:
-      - flags: -Wl,-mllvm,--align-all-nofallthru-blocks=2 -fuse-size-lib
+      - flags: -Wl,-mllvm,--align-all-nofallthru-blocks=2
 

application/baremetal/benchmark/coremark/toolchain_terapines.mk

@@ -1,2 +1,2 @@
 BENCH_FLAGS ?= -O3 -flto -falign-functions=4 -falign-loops=4 -flate-loop-unroll -malign-branch
-LDFLAGS += -Wl,-mllvm,--align-all-nofallthru-blocks=2 -fuse-size-lib
+LDFLAGS += -Wl,-mllvm,--align-all-nofallthru-blocks=2

application/baremetal/benchmark/dhrystone/npk.yml

@@ -96,4 +96,4 @@ buildconfig:
 
         condition: $( ${dhry_mode} == 'best' )
     ldflags:
-      - flags: -Wl,-mllvm,--align-all-nofallthru-blocks=2 -fuse-size-lib
+      - flags: -Wl,-mllvm,--align-all-nofallthru-blocks=2

application/baremetal/benchmark/dhrystone/toolchain_terapines.mk

@@ -5,4 +5,4 @@ BENCH_FLAGS ?= -O3 -ffast-math -flto -finline -fno-builtin-printf -funroll-loops
 else ifeq ($(DHRY_MODE),inline)
 BENCH_FLAGS ?= -O3 -flto -finline -fno-builtin-printf -funroll-loops -falign-functions=4 -falign-loops=4 -finline-functions -flate-loop-unroll -malign-branch
 endif
-LDFLAGS += -Wl,-mllvm,--align-all-nofallthru-blocks=2 -fuse-size-lib
+LDFLAGS += -Wl,-mllvm,--align-all-nofallthru-blocks=2

application/baremetal/benchmark/dhrystone_v2.2/npk.yml

@@ -45,4 +45,4 @@ buildconfig:
     common_flags: # flags need to be combined together across all packages
       - flags: -O3 -Wno-implicit-int -Wno-implicit-function-declaration
     ldflags:
-      - flags: -Wl,-mllvm,--align-all-nofallthru-blocks=2 -fuse-size-lib
+      - flags: -Wl,-mllvm,--align-all-nofallthru-blocks=2

application/baremetal/benchmark/dhrystone_v2.2/toolchain_terapines.mk

@@ -1,2 +1,2 @@
 BENCH_FLAGS ?= -O3
-LDFLAGS += -Wl,-mllvm,--align-all-nofallthru-blocks=2 -fuse-size-lib
+LDFLAGS += -Wl,-mllvm,--align-all-nofallthru-blocks=2

doc/source/changelog.rst

@@ -112,6 +112,11 @@ This is release version of ``0.8.1`` of Nuclei SDK.
 
   - Fix build system :ref:`develop_buildsystem_var_core` support table format error
 
+* Build System
+
+  - Update to support Zcc version 4.1.2 and above as well as the new C library configuration
+
+
 V0.8.0
 ------