From 0e98eb8ecdc159177d3a968556c42e1cc4e68add Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Mar 2021 01:36:28 +0800 Subject: [PATCH 1/6] [TD-3148] : make build system detect host arch. --- cmake/platform.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake/platform.inc b/cmake/platform.inc index 889f6c73cf..f4304fc596 100755 --- a/cmake/platform.inc +++ b/cmake/platform.inc @@ -101,6 +101,14 @@ ELSEIF (${CPUTYPE} MATCHES "x86") MESSAGE(STATUS "input cpuType: x86") ELSE () MESSAGE(STATUS "input cpuType unknown " ${CPUTYPE}) + + MESSAGE(STATUS "The current platform is " ${CMAKE_SYSTEM_PROCESSOR}) + IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") + MESSAGE(STATUS "The current platform is x86") + ELSE () + MESSAGE(STATUS "The current os is NOT x86") + ENDIF () + ENDIF () # cmake -DOSTYPE=Ningsi From 959220bd8346a208491c26b2d366bf293cf10daa Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Mar 2021 01:47:51 +0800 Subject: [PATCH 2/6] [TD-3148] : make build system detect host arch. support aarch32 --- cmake/platform.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/platform.inc b/cmake/platform.inc index f4304fc596..b3eb416e58 100755 --- a/cmake/platform.inc +++ b/cmake/platform.inc @@ -105,8 +105,8 @@ ELSE () MESSAGE(STATUS "The current platform is " ${CMAKE_SYSTEM_PROCESSOR}) IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") MESSAGE(STATUS "The current platform is x86") - ELSE () - MESSAGE(STATUS "The current os is NOT x86") + ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l") + SET(CPUTYPE "aarch32") ENDIF () ENDIF () From 637135539efadd8cac63fb6c7f12f37366ed3449 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Mar 2021 01:54:53 +0800 Subject: [PATCH 3/6] [TD-3148] : make build system detect host arch. detect aarch32 --- cmake/platform.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/platform.inc b/cmake/platform.inc index b3eb416e58..93bf3697d7 100755 --- a/cmake/platform.inc +++ b/cmake/platform.inc @@ -102,10 +102,11 @@ ELSEIF (${CPUTYPE} MATCHES "x86") ELSE () MESSAGE(STATUS "input cpuType unknown " ${CPUTYPE}) - MESSAGE(STATUS "The current platform is " ${CMAKE_SYSTEM_PROCESSOR}) + MESSAGE(STATUS "The current platform is detected as " ${CMAKE_SYSTEM_PROCESSOR}) IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") MESSAGE(STATUS "The current platform is x86") ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l") + MESSAGE(STATUS "Set CPUTYPE to aarch32") SET(CPUTYPE "aarch32") ENDIF () From 44c5a2822181af44278ad0d95c06a80ce18fa827 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Mar 2021 02:07:45 +0800 Subject: [PATCH 4/6] [TD-3148] : make build system detect host arch. detect amd64 and x86 --- cmake/platform.inc | 60 +++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/cmake/platform.inc b/cmake/platform.inc index 93bf3697d7..851857e90f 100755 --- a/cmake/platform.inc +++ b/cmake/platform.inc @@ -78,38 +78,48 @@ ELSE() EXIT () ENDIF () -# if generate ARM version: -# 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") - MESSAGE(STATUS "input cpuType: x64") -ELSEIF (${CPUTYPE} MATCHES "x86") - MESSAGE(STATUS "input cpuType: x86") -ELSE () - MESSAGE(STATUS "input cpuType unknown " ${CPUTYPE}) - +IF ("${CPUTYPE}" STREQUAL "") MESSAGE(STATUS "The current platform is detected as " ${CMAKE_SYSTEM_PROCESSOR}) - IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") + + IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64)|(AMD64)") + MESSAGE(STATUS "The current platform is amd64") + MESSAGE(STATUS "Set CPUTYPE to x64") + SET(CPUTYPE "x64") + ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)") MESSAGE(STATUS "The current platform is x86") + MESSAGE(STATUS "Set CPUTYPE to x86") + SET(CPUTYPE "x32") ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l") MESSAGE(STATUS "Set CPUTYPE to aarch32") SET(CPUTYPE "aarch32") ENDIF () +ELSE () + # if generate ARM version: + # 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") + MESSAGE(STATUS "input cpuType: x64") + ELSEIF (${CPUTYPE} MATCHES "x86") + MESSAGE(STATUS "input cpuType: x86") + ELSE () + MESSAGE(STATUS "input cpuType unknown " ${CPUTYPE}) + ENDIF () + ENDIF () # cmake -DOSTYPE=Ningsi From 8e65dc0b0fbf3ccfa0fc2097a754b882ba99cb00 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Mar 2021 02:27:06 +0800 Subject: [PATCH 5/6] [TD-3148] : make build system detect host arch. add other variables. --- cmake/platform.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake/platform.inc b/cmake/platform.inc index 851857e90f..de70e8a345 100755 --- a/cmake/platform.inc +++ b/cmake/platform.inc @@ -92,6 +92,14 @@ IF ("${CPUTYPE}" STREQUAL "") ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l") MESSAGE(STATUS "Set CPUTYPE to aarch32") SET(CPUTYPE "aarch32") + SET(TD_LINUX TRUE) + SET(TD_LINUX_32 FALSE) + SET(TD_ARM_32 TRUE) + ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") + SET(CPUTYPE "aarch64") + SET(TD_LINUX TRUE) + SET(TD_LINUX_64 FALSE) + SET(TD_ARM_64 TRUE) ENDIF () ELSE () From 8f07fc1ba3994d8d88efc04835fae2ba4d8f5d72 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 3 Mar 2021 11:24:45 +0800 Subject: [PATCH 6/6] [TD-3148] : make build system detect host arch. --- cmake/platform.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/platform.inc b/cmake/platform.inc index de70e8a345..dcd0183e27 100755 --- a/cmake/platform.inc +++ b/cmake/platform.inc @@ -79,7 +79,7 @@ ELSE() ENDIF () IF ("${CPUTYPE}" STREQUAL "") - MESSAGE(STATUS "The current platform is detected as " ${CMAKE_SYSTEM_PROCESSOR}) + MESSAGE(STATUS "The current platform " ${CMAKE_SYSTEM_PROCESSOR} " is detected") IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64)|(AMD64)") MESSAGE(STATUS "The current platform is amd64") @@ -92,11 +92,13 @@ IF ("${CPUTYPE}" STREQUAL "") ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l") MESSAGE(STATUS "Set CPUTYPE to aarch32") SET(CPUTYPE "aarch32") + MESSAGE(STATUS "Set CPUTYPE to aarch32") SET(TD_LINUX TRUE) SET(TD_LINUX_32 FALSE) SET(TD_ARM_32 TRUE) - ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") + ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") SET(CPUTYPE "aarch64") + MESSAGE(STATUS "Set CPUTYPE to aarch64") SET(TD_LINUX TRUE) SET(TD_LINUX_64 FALSE) SET(TD_ARM_64 TRUE)