Browse Source
Merge pull request #3345 from nsait-linaro/windows_on_arm64
Add support for windows/arm64 targets with clangtags/v0.3.18
Martin Kroeker
GitHub
4 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Unified View
Diff Options
-
+1 -1common_arm64.h
-
+2 -2ctest.c
-
+7 -2utest/ctest.h
+ 1
- 1
common_arm64.h
View File
| @@ -120,7 +120,7 @@ static inline int blas_quickdivide(blasint x, blasint y){ | |||||
| .text ; | .text ; | ||||
| .p2align 2 ; | .p2align 2 ; | ||||
| .global REALNAME ; | .global REALNAME ; | ||||
| #ifndef __APPLE__ | |||||
| #if !defined(__APPLE__) && !defined(_WIN32) | |||||
| .type REALNAME, %function ; | .type REALNAME, %function ; | ||||
| #endif | #endif | ||||
| REALNAME: | REALNAME: | ||||
+ 2
- 2
ctest.c
View File
| @@ -84,7 +84,7 @@ OS_AIX | |||||
| OS_OSF | OS_OSF | ||||
| #endif | #endif | ||||
| #if defined(__WIN32) || defined(__WIN64) || defined(__WINNT) | |||||
| #if defined(__WIN32) || defined(__WIN64) || defined(_WIN32) || defined(_WIN64) || defined(__WINNT) | |||||
| OS_WINNT | OS_WINNT | ||||
| #endif | #endif | ||||
| @@ -141,7 +141,7 @@ ARCH_SPARC | |||||
| ARCH_IA64 | ARCH_IA64 | ||||
| #endif | #endif | ||||
| #if defined(__LP64) || defined(__LP64__) || defined(__ptr64) || defined(__x86_64__) || defined(__amd64__) || defined(__64BIT__) | |||||
| #if defined(__LP64) || defined(__LP64__) || defined(__ptr64) || defined(__x86_64__) || defined(__amd64__) || defined(__64BIT__) || defined(__aarch64__) | |||||
| BINARY_64 | BINARY_64 | ||||
| #endif | #endif | ||||
+ 7
- 2
utest/ctest.h
View File
| @@ -65,9 +65,14 @@ struct ctest { | |||||
| #undef CTEST_SEGFAULT | #undef CTEST_SEGFAULT | ||||
| #endif | #endif | ||||
| #if defined(_WIN32) && defined(_MSC_VER) | |||||
| #if defined(_WIN32) | |||||
| #if defined(__clang__) | |||||
| #define __CTEST_NO_TIME | |||||
| #undef CTEST_SEGFAULT | |||||
| #elif defined(_MSC_VER) | |||||
| #define __CTEST_MSVC | #define __CTEST_MSVC | ||||
| #endif | #endif | ||||
| #endif | |||||
| //config for MSVC compiler | //config for MSVC compiler | ||||
| #ifdef __CTEST_MSVC | #ifdef __CTEST_MSVC | ||||
| @@ -286,7 +291,7 @@ void assert_dbl_far(double exp, double real, double tol, const char* caller, int | |||||
| #endif | #endif | ||||
| #include <stdint.h> | #include <stdint.h> | ||||
| #ifdef __CTEST_MSVC | |||||
| #ifdef _WIN32 | |||||
| #include <io.h> | #include <io.h> | ||||
| #else | #else | ||||
| #include <unistd.h> | #include <unistd.h> | ||||