Skip to content

Commit 0762d05

Browse files
committed
fix: update ARM architecture settings in QEMU configuration and adjust jmp_buf size in setjmp.h
1 parent 596de5b commit 0762d05

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

scripts/make/qemu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ else ifeq ($(ARCH), aarch64)
2222
machine := virt
2323
endif
2424
else ifeq ($(ARCH), arm)
25-
machine := virt,gic-version=3
25+
machine := virt,gic-version=2
2626
else ifeq ($(ARCH), loongarch64)
2727
machine := virt
2828
override MEM := 1G

ulib/axlibc/include/setjmp.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ typedef unsigned long __jmp_buf[26];
1111
typedef unsigned long __jmp_buf[8];
1212
#elif defined(__loongarch__)
1313
typedef unsigned long __jmp_buf[21];
14+
#elif defined(__arm__)
15+
typedef unsigned long __jmp_buf[64]; /* r4-r14, d8-d15 (VFP) */
1416
#endif
1517

1618
typedef struct __jmp_buf_tag {

ulib/axlibc/include/stdint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ typedef int64_t intmax_t;
4141
#if __riscv_xlen == 64 || defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch__)
4242
typedef int64_t intptr_t;
4343
typedef uint64_t uintptr_t;
44-
#elif __riscv_xlen == 32 || defined(__i386__)
44+
#elif __riscv_xlen == 32 || defined(__i386__) || defined(__arm__)
4545
typedef int32_t intptr_t;
4646
typedef uint32_t uintptr_t;
4747
#endif

0 commit comments

Comments
 (0)