diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff5da13254bb7714d12d8afe1e9dd63f8e85e17d..9a3a406cc32e4ce0d3c314e2e4a5d43e17f0762b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,12 +38,16 @@ IF (NOT DEFINED TD_CLUSTER)
   # Set macro definitions according to os platform
   SET(TD_LINUX_64 FALSE)
   SET(TD_LINUX_32 FALSE)
-  SET(_TD_ARM_ FALSE)
-  SET(_TD_ARM_64 FALSE)
-  SET(_TD_ARM_32 FALSE)
+  SET(TD_ARM FALSE)
+  SET(TD_ARM_64 FALSE)
+  SET(TD_ARM_32 FALSE)
   SET(TD_MIPS_64 FALSE)
   SET(TD_DARWIN_64 FALSE)
   SET(TD_WINDOWS_64 FALSE)
+  
+  IF (TD_ARM)
+    ADD_DEFINITIONS(-D_TD_ARM_)
+  ENDIF ()
 
   IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
@@ -52,7 +56,7 @@ IF (NOT DEFINED TD_CLUSTER)
       ADD_DEFINITIONS(-D_M_X64)
       MESSAGE(STATUS "The current platform is Linux 64-bit")
   ELSEIF (${CMAKE_SIZEOF_VOID_P} MATCHES 4)
-    IF (_TD_ARM_)
+    IF (TD_ARM)
       SET(TD_LINUX_32 TRUE)
       SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/linux)
       #ADD_DEFINITIONS(-D_M_IX86)
@@ -112,7 +116,7 @@ IF (NOT DEFINED TD_CLUSTER)
   IF (TD_LINUX_64)
     SET(DEBUG_FLAGS "-O0 -DDEBUG")
     SET(RELEASE_FLAGS "-O0")
-    IF (NOT _TD_ARM_)
+    IF (NOT TD_ARM)
       IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
         SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -Wno-char-subscripts -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
       ELSE ()
@@ -124,7 +128,7 @@ IF (NOT DEFINED TD_CLUSTER)
     ADD_DEFINITIONS(-DLINUX)
     ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
   ELSEIF (TD_LINUX_32)
-    IF (NOT _TD_ARM_)
+    IF (NOT TD_ARM)
       EXIT ()
     ENDIF ()
     SET(DEBUG_FLAGS "-O0 -DDEBUG")
@@ -194,7 +198,7 @@ IF (NOT DEFINED TD_CLUSTER)
     INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
     INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})")
   ELSEIF (TD_LINUX_32)
-    IF (NOT _TD_ARM_)
+    IF (NOT TD_ARM)
       EXIT ()
     ENDIF ()
     SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index de0312543828d9664049446ecb64fccdd97bfcf2..d3baf84d6754ad2edcf1ac193cd46020760553ea 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -7,7 +7,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 AUX_SOURCE_DIRECTORY(./src SRC)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)
 
   # set the static lib name
diff --git a/src/kit/shell/CMakeLists.txt b/src/kit/shell/CMakeLists.txt
index 96dcec64c81f86cf9de43f0463e7868af25402fe..7442367e91dbd1f972b0bfa703720e6d15be0182 100644
--- a/src/kit/shell/CMakeLists.txt
+++ b/src/kit/shell/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(./src SRC)
   LIST(REMOVE_ITEM SRC ./src/shellWindows.c)
   ADD_EXECUTABLE(shell ${SRC})  
diff --git a/src/kit/taosdemo/CMakeLists.txt b/src/kit/taosdemo/CMakeLists.txt
index 5384fce62dff48c7dfd23aa26c70b3c342021da8..599875fa6086276e0b7ea80b97da1e3791a4f73e 100644
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(taosdemo ${SRC})
   TARGET_LINK_LIBRARIES(taosdemo taos_static)
diff --git a/src/kit/taosdump/CMakeLists.txt b/src/kit/taosdump/CMakeLists.txt
index 49940add9a9f929607827c101995c812bb909d11..76b40d1c2d278bd8f13829a719e23c67402bec2e 100644
--- a/src/kit/taosdump/CMakeLists.txt
+++ b/src/kit/taosdump/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(taosdump ${SRC})
   TARGET_LINK_LIBRARIES(taosdump taos_static)
diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt
index 4805271d661ed8c6d81702852a0fc949904aa25b..d8dccb526affec580adf5d69d7b10c033b51d0ad 100644
--- a/src/modules/http/CMakeLists.txt
+++ b/src/modules/http/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)
diff --git a/src/modules/monitor/CMakeLists.txt b/src/modules/monitor/CMakeLists.txt
index baa5e6218c8996d8dc400c03753d0fe6c5a2f2a7..44ac8aae0b6d9e72c6e5a824d874c38972e93348 100644
--- a/src/modules/monitor/CMakeLists.txt
+++ b/src/modules/monitor/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
   INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
diff --git a/src/os/linux/CMakeLists.txt b/src/os/linux/CMakeLists.txt
index 14e7e06b236edd0b4f34d1c5d93fec9dc888f025..a702cac759a3dea135da05689118b763631e83f9 100644
--- a/src/os/linux/CMakeLists.txt
+++ b/src/os/linux/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)
diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt
index febb3eb83f6b4f1333e484efcbd6041065ca5876..8d54d5fda591acd790c4bfab751cec079762e561 100644
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(./src SRC)
 ELSEIF (TD_DARWIN_64)
   LIST(APPEND SRC ./src/thaship.c)
diff --git a/src/sdb/CMakeLists.txt b/src/sdb/CMakeLists.txt
index 08cdb4baef114743a0ec679491bf17bcdbfdb6b8..6b29eefde6c4792f691fae9f0d5c370751460c93 100644
--- a/src/sdb/CMakeLists.txt
+++ b/src/sdb/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
     AUX_SOURCE_DIRECTORY(src SRC)
     ADD_LIBRARY(sdb ${SRC})
     TARGET_LINK_LIBRARIES(sdb trpc)
diff --git a/src/system/detail/CMakeLists.txt b/src/system/detail/CMakeLists.txt
index 16468e7984416018315d1181b0435bf40a604173..95cce3dfe617464cb0cc442686a2802f2178cbbc 100644
--- a/src/system/detail/CMakeLists.txt
+++ b/src/system/detail/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)
diff --git a/src/system/lite/CMakeLists.txt b/src/system/lite/CMakeLists.txt
index e9257b23888f436ba7b2891eaa238741152f1330..a22ed60563e5a237d060abfc46dc9fa87e546a87 100644
--- a/src/system/lite/CMakeLists.txt
+++ b/src/system/lite/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index b36ae3a4b5425e66bb641dcaee885a5554ca3a50..e73428353e76bfda2b11f86efeadd44b97d73138 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(TDengine)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND _TD_ARM_))
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(src SRC)
   ADD_LIBRARY(tutil ${SRC})
   TARGET_LINK_LIBRARIES(tutil pthread os m rt)
diff --git a/src/util/src/tcrc32c.c b/src/util/src/tcrc32c.c
index 88841bcbc926d5ab18f64c11cc92c5c22f9e2e81..705ca5872ae5e9ab0b0d826c12a52ea5a4634a36 100644
--- a/src/util/src/tcrc32c.c
+++ b/src/util/src/tcrc32c.c
@@ -1353,7 +1353,7 @@ uint32_t crc32c_hw(uint32_t crc, crc_stream buf, size_t len) {
 #endif // #ifndef _TD_ARM_
 
 void taosResolveCRC() {
-#ifndef _TD_ARM_32
+#ifndef _TD_ARM_
   int sse42;
   SSE42(sse42);
   crc32c = sse42 ? crc32c_hw : crc32c_sf;