diff --git a/cmake/cmake.platform b/cmake/cmake.platform
index e822cc5e2c..711d74fa4c 100644
--- a/cmake/cmake.platform
+++ b/cmake/cmake.platform
@@ -82,10 +82,12 @@ IF ("${CPUTYPE}" STREQUAL "")
     MESSAGE(STATUS "Current platform is amd64")
     SET(PLATFORM_ARCH_STR "amd64")
     SET(TD_INTEL_64 TRUE)
+    ADD_DEFINITIONS("-D_TD_X86_")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)")
     MESSAGE(STATUS "Current platform is x86")
     SET(PLATFORM_ARCH_STR "i386")
     SET(TD_INTEL_32 TRUE)
+    ADD_DEFINITIONS("-D_TD_X86_")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l")
     MESSAGE(STATUS "Current platform is aarch32")
     SET(PLATFORM_ARCH_STR "arm")
diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in
index 8b9104e7e5..79b447e20d 100644
--- a/cmake/taostools_CMakeLists.txt.in
+++ b/cmake/taostools_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG 9f587e9
+        GIT_TAG d19e82c
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE
diff --git a/include/os/os.h b/include/os/os.h
index f4592fc575..0688eeb9ad 100644
--- a/include/os/os.h
+++ b/include/os/os.h
@@ -48,8 +48,10 @@ extern "C" {
 #else
 #include <argp.h>
 #include <sys/prctl.h>
+#if defined(_TD_X86_)
 #include <cpuid.h>
 #endif
+#endif
 #else
 
 #ifndef __func__