diff --git a/components/libc/compilers/armlibc/stubs.c b/components/libc/compilers/armlibc/stubs.c
index 83306a258d..dbb60c8a44 100644
--- a/components/libc/compilers/armlibc/stubs.c
+++ b/components/libc/compilers/armlibc/stubs.c
@@ -315,7 +315,7 @@ int fputc(int c, FILE *f)
 {
     char ch[2] = {0};
 
-    ch[1] = c;
+    ch[0] = c;
     rt_kprintf(&ch[0]);
     return 1;
 }
diff --git a/libcpu/arm/cortex-m4/context_rvds.S b/libcpu/arm/cortex-m4/context_rvds.S
index 6d20ab8e3e..f6d2447c5e 100644
--- a/libcpu/arm/cortex-m4/context_rvds.S
+++ b/libcpu/arm/cortex-m4/context_rvds.S
@@ -1,12 +1,8 @@
 ;/*
-; * File      : context_rvds.S
-; * This file is part of RT-Thread RTOS
-; * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team
-; *
-; * The license and distribution terms for this file may be
-; * found in the file LICENSE in this distribution or at
-; * http://www.rt-thread.org/license/LICENSE
-; *
+;* Copyright (c) 2006-2018, RT-Thread Development Team
+;*
+;* SPDX-License-Identifier: Apache-2.0
+;*
 ; * Change Logs:
 ; * Date           Author       Notes
 ; * 2009-01-17     Bernard      first version.
diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c
index 1d2184c2d7..18f027895b 100644
--- a/libcpu/arm/cortex-m4/cpuport.c
+++ b/libcpu/arm/cortex-m4/cpuport.c
@@ -1,11 +1,7 @@
 /*
- * File      : cpuport.c
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team
+ * Copyright (c) 2006-2018, RT-Thread Development Team
  *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
@@ -23,7 +19,7 @@
 #include <rtthread.h>
 
 #if               /* ARMCC */ (  (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP ))    \
-                  /* Clang */ || (defined ( __CLANG_ARM ) && defined ( __TARGET_FPU_VFP )) \
+                  /* Clang */ || (defined ( __CLANG_ARM ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
                   /* IAR */   || (defined ( __ICCARM__ ) && defined ( __ARMVFP__ ))        \
                   /* GNU */   || (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
 #define USE_FPU   1
diff --git a/libcpu/arm/cortex-m7/cpuport.c b/libcpu/arm/cortex-m7/cpuport.c
index 1d2184c2d7..18f027895b 100644
--- a/libcpu/arm/cortex-m7/cpuport.c
+++ b/libcpu/arm/cortex-m7/cpuport.c
@@ -1,11 +1,7 @@
 /*
- * File      : cpuport.c
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team
+ * Copyright (c) 2006-2018, RT-Thread Development Team
  *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
@@ -23,7 +19,7 @@
 #include <rtthread.h>
 
 #if               /* ARMCC */ (  (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP ))    \
-                  /* Clang */ || (defined ( __CLANG_ARM ) && defined ( __TARGET_FPU_VFP )) \
+                  /* Clang */ || (defined ( __CLANG_ARM ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
                   /* IAR */   || (defined ( __ICCARM__ ) && defined ( __ARMVFP__ ))        \
                   /* GNU */   || (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
 #define USE_FPU   1
diff --git a/src/clock.c b/src/clock.c
index 9834f0f95c..651465e0a8 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -3,11 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- */
-
-/*
- * File      : clock.c
- *
  * Change Logs:
  * Date           Author       Notes
  * 2006-03-12     Bernard      first version
diff --git a/src/components.c b/src/components.c
index 09f0680b55..679a88ef11 100644
--- a/src/components.c
+++ b/src/components.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : init.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/device.c b/src/device.c
index 94f550d682..51fc6176a6 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : device.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/idle.c b/src/idle.c
index 8a4734ab49..ec7d6bea6e 100644
--- a/src/idle.c
+++ b/src/idle.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : idle.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/ipc.c b/src/ipc.c
index d2a3ba766c..56045911a8 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : ipc.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/irq.c b/src/irq.c
index 98a6fd3a04..72d220bd92 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : irq.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/kservice.c b/src/kservice.c
index e10c093c70..dbc4a2fb0e 100644
--- a/src/kservice.c
+++ b/src/kservice.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : kservice.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/mem.c b/src/mem.c
index 03e6f34eb4..cb96ab9ee0 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : mem.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/mempool.c b/src/mempool.c
index e1af7d9e42..2184586aba 100644
--- a/src/mempool.c
+++ b/src/mempool.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : mempool.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/object.c b/src/object.c
index 8dcfb2e57e..70b9a5c04e 100644
--- a/src/object.c
+++ b/src/object.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : object.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/scheduler.c b/src/scheduler.c
index 8b5ffc9f4c..95b5d487df 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : scheduler.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/signal.c b/src/signal.c
index 6499d05a97..c783420514 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : signal.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/thread.c b/src/thread.c
index 249219b8aa..6d79ece54b 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : thread.c
  *
  * Change Logs:
  * Date           Author       Notes
diff --git a/src/timer.c b/src/timer.c
index 01e6211e04..dc489a2d0d 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -2,10 +2,6 @@
  * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * File      : timer.c
  *
  * Change Logs:
  * Date           Author       Notes