Skip to content

Commit cdf3063

Browse files
authored
Fix compile warning on non-x86 targets, fix alios build error (#923)
And fix os_thread_signal_init issue on windows platform
1 parent 20867c9 commit cdf3063

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

core/iwasm/common/wasm_runtime_common.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -115,22 +115,22 @@ GET_F64_FROM_ADDR(uint32 *addr)
115115
/* For STORE opcodes */
116116
#define STORE_I64(addr, value) \
117117
do { \
118-
uintptr_t addr1 = (uintptr_t)(addr); \
118+
uintptr_t addr_ = (uintptr_t)(addr); \
119119
union { \
120120
int64 val; \
121121
uint32 u32[2]; \
122122
uint16 u16[4]; \
123123
uint8 u8[8]; \
124124
} u; \
125-
if ((addr1 & (uintptr_t)7) == 0) \
125+
if ((addr_ & (uintptr_t)7) == 0) \
126126
*(int64 *)(addr) = (int64)(value); \
127127
else { \
128128
u.val = (int64)(value); \
129-
if ((addr1 & (uintptr_t)3) == 0) { \
129+
if ((addr_ & (uintptr_t)3) == 0) { \
130130
((uint32 *)(addr))[0] = u.u32[0]; \
131131
((uint32 *)(addr))[1] = u.u32[1]; \
132132
} \
133-
else if ((addr1 & (uintptr_t)1) == 0) { \
133+
else if ((addr_ & (uintptr_t)1) == 0) { \
134134
((uint16 *)(addr))[0] = u.u16[0]; \
135135
((uint16 *)(addr))[1] = u.u16[1]; \
136136
((uint16 *)(addr))[2] = u.u16[2]; \
@@ -146,17 +146,17 @@ GET_F64_FROM_ADDR(uint32 *addr)
146146

147147
#define STORE_U32(addr, value) \
148148
do { \
149-
uintptr_t addr1 = (uintptr_t)(addr); \
149+
uintptr_t addr_ = (uintptr_t)(addr); \
150150
union { \
151151
uint32 val; \
152152
uint16 u16[2]; \
153153
uint8 u8[4]; \
154154
} u; \
155-
if ((addr1 & (uintptr_t)3) == 0) \
155+
if ((addr_ & (uintptr_t)3) == 0) \
156156
*(uint32 *)(addr) = (uint32)(value); \
157157
else { \
158158
u.val = (uint32)(value); \
159-
if ((addr1 & (uintptr_t)1) == 0) { \
159+
if ((addr_ & (uintptr_t)1) == 0) { \
160160
((uint16 *)(addr))[0] = u.u16[0]; \
161161
((uint16 *)(addr))[1] = u.u16[1]; \
162162
} \

core/shared/platform/windows/win_thread.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ os_thread_signal_init()
614614
bool ret;
615615

616616
if (thread_signal_inited)
617-
return true;
617+
return 0;
618618

619619
ret = SetThreadStackGuarantee(&StackSizeInBytes);
620620
if (ret)

product-mini/platforms/alios-things/aos.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ endif
112112
ifeq (${WAMR_BUILD_AOT}, 1)
113113
$(NAME)_SOURCES += ${IWASM_ROOT}/aot/aot_loader.c \
114114
${IWASM_ROOT}/aot/arch/${AOT_RELOC} \
115-
${IWASM_ROOT}/aot/aot_runtime.c
115+
${IWASM_ROOT}/aot/aot_runtime.c \
116+
${IWASM_ROOT}/aot/aot_intrinsic.c
116117
endif
117118

0 commit comments

Comments
 (0)