From e826a65dc8ae27466383a7b9bc10ea8ada6f5386 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 12 Aug 2020 22:48:28 +0800 Subject: [PATCH] TD-1047 undefine linux64 while cputype is aarch64 --- cmake/platform.inc | 3 +++ src/os/inc/os.h | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cmake/platform.inc b/cmake/platform.inc index 4cb6262471..ffde56aab2 100755 --- a/cmake/platform.inc +++ b/cmake/platform.inc @@ -81,14 +81,17 @@ ENDIF () # cmake -DCPUTYPE=aarch32 .. or cmake -DCPUTYPE=aarch64 IF (${CPUTYPE} MATCHES "aarch32") SET(TD_LINUX TRUE) + SET(TD_LINUX_32 FALSE) SET(TD_ARM_32 TRUE) MESSAGE(STATUS "input cpuType: aarch32") ELSEIF (${CPUTYPE} MATCHES "aarch64") SET(TD_LINUX TRUE) + SET(TD_LINUX_64 FALSE) SET(TD_ARM_64 TRUE) MESSAGE(STATUS "input cpuType: aarch64") ELSEIF (${CPUTYPE} MATCHES "mips64") SET(TD_LINUX TRUE) + SET(TD_LINUX_64 FALSE) SET(TD_MIPS_64 TRUE) MESSAGE(STATUS "input cpuType: mips64") ELSEIF (${CPUTYPE} MATCHES "x64") diff --git a/src/os/inc/os.h b/src/os/inc/os.h index 6b9517a4b2..2005072ad1 100644 --- a/src/os/inc/os.h +++ b/src/os/inc/os.h @@ -24,12 +24,12 @@ extern "C" { #include "osDarwin.h" #endif +#ifdef _TD_ARM_64 +#include "osArm64.h" +#endif + #ifdef _TD_LINUX_64 - #ifdef _TD_ARM_64 - #include "osArm64.h" - #elif - #include "osLinux64.h" - #endif +#include "osLinux64.h" #endif #ifdef _TD_LINUX_32 -- GitLab