TD-1047 change some definitions in arm64 platform

cmake/define.inc

@@ -47,6 +47,7 @@ IF (TD_LINUX_32)
 ENDIF ()
 
 IF (TD_ARM_64)
+  ADD_DEFINITIONS(-D_M_X64)
   ADD_DEFINITIONS(-D_TD_ARM_64_)
   ADD_DEFINITIONS(-D_TD_ARM_)
   SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")

cmake/install.inc

-IF (TD_LINUX_64)
+IF (TD_LINUX)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
   INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
   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)
-    EXIT ()
-  ENDIF ()
-  SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
-  INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
-  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_WINDOWS_64)
+ELSEIF (TD_WINDOWS)
   SET(CMAKE_INSTALL_PREFIX C:/TDengine)
   IF (NOT TD_GODLL)
     #INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector)
@@ -33,7 +25,7 @@ ELSEIF (TD_WINDOWS_64)
     INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/libtaos.dll DESTINATION driver)
     INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/libtaos.dll.a DESTINATION driver)
   ENDIF ()
-ELSEIF (TD_DARWIN_64)
+ELSEIF (TD_DARWIN)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
   INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
   INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")

cmake/platform.inc

@@ -43,7 +43,6 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   ELSEIF (${CMAKE_SIZEOF_VOID_P} MATCHES 4)
     SET(TD_LINUX_32 TRUE)
     MESSAGE(STATUS "The current platform is Linux 32-bit")
-
   ELSE ()
     MESSAGE(FATAL_ERROR "The current platform is Linux neither 32-bit nor 64-bit, not supported yet")
     EXIT ()

src/os/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX_64)
-  ADD_SUBDIRECTORY(src/linux64)
-ELSEIF (TD_LINUX_32)
-  ADD_SUBDIRECTORY(src/linux32)
-ELSEIF (TD_DARWIN_64)
+IF (TD_LINUX)
+  ADD_SUBDIRECTORY(src/linux)
+ELSEIF (TD_DARWIN)
   ADD_SUBDIRECTORY(src/darwin)  
-ELSEIF (TD_WINDOWS_64)
-  ADD_SUBDIRECTORY(src/windows)
-ELSEIF (TD_WINDOWS_32)
+ELSEIF (TD_WINDOWS)
   ADD_SUBDIRECTORY(src/windows)
 ENDIF ()
 

src/os/inc/os.h

@@ -24,7 +24,7 @@ extern "C" {
 #include "osDarwin.h"
 #endif
 
-#ifdef _TD_ARM_64
+#ifdef _TD_ARM_64_
 #include "osArm64.h"
 #endif
 

src/rpc/test/CMakeLists.txt

@@ -3,7 +3,7 @@ PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/rpc/inc)
 
-IF (TD_LINUX_64)
+IF (TD_LINUX)
   LIST(APPEND CLIENT_SRC ./rclient.c)
   ADD_EXECUTABLE(rclient ${CLIENT_SRC})
   TARGET_LINK_LIBRARIES(rclient trpc)

src/sync/test/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX_64)
+IF (TD_LINUX)
   INCLUDE_DIRECTORIES(../inc)
 
   LIST(APPEND CLIENT_SRC ./syncClient.c)

src/wal/test/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX_64)
+IF (TD_LINUX)
   INCLUDE_DIRECTORIES(../inc)
 
   LIST(APPEND WALTEST_SRC ./waltest.c)

tests/comparisonTest/tdengine/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX_64)
+IF (TD_LINUX)
   add_executable(tdengineTest tdengineTest.c)
   target_link_libraries(tdengineTest taos_static tutil common pthread)
 ENDIF()