75 lines
3.2 KiB
Diff
75 lines
3.2 KiB
Diff
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/CMakeLists.txt DCF-6.0.0-edit/CMakeLists.txt
|
|
*** DCF-6.0.0/CMakeLists.txt 2024-11-02 17:04:54.937886579 +0800
|
|
--- DCF-6.0.0-edit/CMakeLists.txt 2024-11-02 17:04:05.634252331 +0800
|
|
***************
|
|
*** 84,89 ****
|
|
--- 84,91 ----
|
|
add_compile_options(-mtune=cortex-a72 -fsigned-char -g -ggdb3 -march=armv8-a+crc -funwind-tables)
|
|
elseif (OS_ARCH STREQUAL "x86_64")
|
|
add_compile_options(-msse4.2 )
|
|
+ else ()
|
|
+ add_compile_options()
|
|
endif ()
|
|
Add_Definitions(-DWSEC_COMPILE_CAC_OPENSSL -DWSEC_AES_GCM_SUPPORT -DWSEC_USE_OPENSSL_110)
|
|
else ()
|
|
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_concurrency/cm_spinlock.h DCF-6.0.0-edit/src/common/cm_concurrency/cm_spinlock.h
|
|
*** DCF-6.0.0/src/common/cm_concurrency/cm_spinlock.h 2024-11-02 17:38:45.539451623 +0800
|
|
--- DCF-6.0.0-edit/src/common/cm_concurrency/cm_spinlock.h 2024-11-02 17:37:19.778567408 +0800
|
|
***************
|
|
*** 63,69 ****
|
|
uint64 fails;
|
|
} spin_statis_t;
|
|
|
|
! #if defined(__arm__) || defined(__aarch64__) || defined(__loongarch__)
|
|
#define fas_cpu_pause() \
|
|
{ \
|
|
__asm__ volatile("nop"); \
|
|
--- 63,69 ----
|
|
uint64 fails;
|
|
} spin_statis_t;
|
|
|
|
! #if defined(__arm__) || defined(__aarch64__) || defined(__loongarch__) || defined(__riscv)
|
|
#define fas_cpu_pause() \
|
|
{ \
|
|
__asm__ volatile("nop"); \
|
|
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_concurrency/cm_thread.c DCF-6.0.0-edit/src/common/cm_concurrency/cm_thread.c
|
|
*** DCF-6.0.0/src/common/cm_concurrency/cm_thread.c 2024-11-02 17:38:45.539451623 +0800
|
|
--- DCF-6.0.0-edit/src/common/cm_concurrency/cm_thread.c 2024-11-02 17:37:19.779567360 +0800
|
|
***************
|
|
*** 296,302 ****
|
|
#define __SYS_GET_SPID 186
|
|
#elif (defined __aarch64__)
|
|
#define __SYS_GET_SPID 178
|
|
! #elif (defined __loongarch__)
|
|
#include<sys/syscall.h>
|
|
#define __SYS_GET_SPID SYS_gettid
|
|
#endif
|
|
--- 296,302 ----
|
|
#define __SYS_GET_SPID 186
|
|
#elif (defined __aarch64__)
|
|
#define __SYS_GET_SPID 178
|
|
! #elif (defined __loongarch__) || (defined __riscv)
|
|
#include<sys/syscall.h>
|
|
#define __SYS_GET_SPID SYS_gettid
|
|
#endif
|
|
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_utils/cm_memory.h DCF-6.0.0-edit/src/common/cm_utils/cm_memory.h
|
|
*** DCF-6.0.0/src/common/cm_utils/cm_memory.h 2024-11-02 17:38:45.539451623 +0800
|
|
--- DCF-6.0.0-edit/src/common/cm_utils/cm_memory.h 2024-11-02 17:37:19.781567264 +0800
|
|
***************
|
|
*** 62,68 ****
|
|
__asm__ volatile("mfence" :: \
|
|
: "memory"); \
|
|
}
|
|
! #elif defined(__loongarch__)
|
|
#define CM_MFENCE \
|
|
{ \
|
|
__asm__ volatile("" :: \
|
|
--- 62,68 ----
|
|
__asm__ volatile("mfence" :: \
|
|
: "memory"); \
|
|
}
|
|
! #elif defined(__loongarch__) || defined(__riscv)
|
|
#define CM_MFENCE \
|
|
{ \
|
|
__asm__ volatile("" :: \
|