Merge branch 'develop' into risc-v
authorZhang Xianyi <traits.zhang@gmail.com>
Fri, 16 Oct 2020 15:27:38 +0000 (23:27 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Fri, 16 Oct 2020 15:27:38 +0000 (23:27 +0800)
1  2 
Makefile.system
TargetList.txt
c_check
common.h
ctest.c
getarch.c
kernel/Makefile.L3
param.h

diff --cc Makefile.system
Simple merge
diff --cc TargetList.txt
Simple merge
diff --cc c_check
Simple merge
diff --cc common.h
Simple merge
diff --cc ctest.c
+++ b/ctest.c
@@@ -153,7 -153,6 +153,11 @@@ ARCH_AR
  ARCH_ARM64
  #endif
  
 +#if defined(__riscv)
 +ARCH_RISCV64
 +#endif
 +
+ #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
+ HAVE_C11
+ #endif
++
diff --cc getarch.c
Simple merge
Simple merge
diff --cc param.h
Simple merge