hare

The Hare programming language
git clone https://git.torresjrjr.com/hare.git
Log | Files | Refs | README | LICENSE

commit 8f7b7a27e12bc333e3c8a6ab7937d33d21c07d62
parent 8884f78e95b675a3172cdee1a8ea54726b6904a7
Author: Armin Weigl <tb46305@gmail.com>
Date:   Sat, 23 Apr 2022 18:03:50 +0200

rt/cpuid: fix compilation on non x86_64 architectures

Signed-off-by: Armin Weigl <tb46305@gmail.com>

Diffstat:
Art/+aarch64/cpuid.ha | 1+
Art/+aarch64/cpuid_native.s | 0
Art/+riscv64/cpuid.ha | 1+
Art/+riscv64/cpuid_native.s | 0
Mscripts/gen-stdlib | 4++--
Mstdlib.mk | 8++++----
6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/rt/+aarch64/cpuid.ha b/rt/+aarch64/cpuid.ha @@ -0,0 +1 @@ +// TODO diff --git a/rt/+aarch64/cpuid_native.s b/rt/+aarch64/cpuid_native.s diff --git a/rt/+riscv64/cpuid.ha b/rt/+riscv64/cpuid.ha @@ -0,0 +1 @@ +// TODO diff --git a/rt/+riscv64/cpuid_native.s b/rt/+riscv64/cpuid_native.s diff --git a/scripts/gen-stdlib b/scripts/gen-stdlib @@ -35,7 +35,7 @@ gensrcs_rt() { '+$(ARCH)'/jmp.ha \ '+$(ARCH)'/backtrace.ha \ fenv_defs.ha \ - +x86_64/cpuid.ha \ + '+$(ARCH)'/cpuid.ha \ ensure.ha \ jmp.ha \ malloc.ha \ @@ -58,7 +58,7 @@ gensrcs_rt() { +'$(ARCH)'/jmp.ha \ +'$(ARCH)'/backtrace.ha \ fenv_defs.ha \ - +x86_64/cpuid.ha \ + +'$(ARCH)'/cpuid.ha \ ensure.ha \ jmp.ha \ malloc.ha \ diff --git a/stdlib.mk b/stdlib.mk @@ -19,7 +19,7 @@ stdlib_rt_linux_srcs= \ $(STDLIB)/rt/+$(ARCH)/jmp.ha \ $(STDLIB)/rt/+$(ARCH)/backtrace.ha \ $(STDLIB)/rt/fenv_defs.ha \ - $(STDLIB)/rt/+x86_64/cpuid.ha \ + $(STDLIB)/rt/+$(ARCH)/cpuid.ha \ $(STDLIB)/rt/ensure.ha \ $(STDLIB)/rt/jmp.ha \ $(STDLIB)/rt/malloc.ha \ @@ -45,7 +45,7 @@ stdlib_rt_freebsd_srcs= \ $(STDLIB)/rt/+$(ARCH)/jmp.ha \ $(STDLIB)/rt/+$(ARCH)/backtrace.ha \ $(STDLIB)/rt/fenv_defs.ha \ - $(STDLIB)/rt/+x86_64/cpuid.ha \ + $(STDLIB)/rt/+$(ARCH)/cpuid.ha \ $(STDLIB)/rt/ensure.ha \ $(STDLIB)/rt/jmp.ha \ $(STDLIB)/rt/malloc.ha \ @@ -2007,7 +2007,7 @@ testlib_rt_linux_srcs= \ $(STDLIB)/rt/+$(ARCH)/jmp.ha \ $(STDLIB)/rt/+$(ARCH)/backtrace.ha \ $(STDLIB)/rt/fenv_defs.ha \ - $(STDLIB)/rt/+x86_64/cpuid.ha \ + $(STDLIB)/rt/+$(ARCH)/cpuid.ha \ $(STDLIB)/rt/ensure.ha \ $(STDLIB)/rt/jmp.ha \ $(STDLIB)/rt/malloc.ha \ @@ -2037,7 +2037,7 @@ testlib_rt_freebsd_srcs= \ $(STDLIB)/rt/+$(ARCH)/jmp.ha \ $(STDLIB)/rt/+$(ARCH)/backtrace.ha \ $(STDLIB)/rt/fenv_defs.ha \ - $(STDLIB)/rt/+x86_64/cpuid.ha \ + $(STDLIB)/rt/+$(ARCH)/cpuid.ha \ $(STDLIB)/rt/ensure.ha \ $(STDLIB)/rt/jmp.ha \ $(STDLIB)/rt/malloc.ha \