Module Name: src
Committed By: riastradh
Date: Sun May 5 15:18:10 UTC 2024
Modified Files:
src/sys/arch/aarch64/include: sljit_machdep.h
Log Message:
aarch64/sljit_machdep.h: Make this work in compat32 context.
Should fix clang build of compat32 eabi libsljit:
dependall ===> compat/arm/eabi/../../../lib/../external/bsd/sljit/lib
In file included from
/home/source/ab/HEAD-llvm/src/sys/external/bsd/sljit/dist/sljit_src/sljitLir.c:1678:
/home/source/ab/HEAD-llvm/src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c:142:54:
error: shift count >= width of type [-Werror,-Wshift-count-overflow]
FAIL_IF(push_inst(compiler, MOVK | RD(dst) | (((imm >> 32) & 0xffff) <<
5) | (2 << 21)));
^ ~~
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/include/sljit_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/include/sljit_machdep.h
diff -u src/sys/arch/aarch64/include/sljit_machdep.h:1.4 src/sys/arch/aarch64/include/sljit_machdep.h:1.5
--- src/sys/arch/aarch64/include/sljit_machdep.h:1.4 Tue Apr 2 22:37:34 2024
+++ src/sys/arch/aarch64/include/sljit_machdep.h Sun May 5 15:18:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sljit_machdep.h,v 1.4 2024/04/02 22:37:34 riastradh Exp $ */
+/* $NetBSD: sljit_machdep.h,v 1.5 2024/05/05 15:18:10 riastradh Exp $ */
/*-
* Copyright (c) 2014 Alexander Nasonov.
@@ -29,6 +29,12 @@
#ifndef _AARCH64_SLJITARCH_H
#define _AARCH64_SLJITARCH_H
+#ifndef __aarch64__ /* compat32 */
+
+#include <arm/sljit_machdep.h>
+
+#else /* __aarch64__ */
+
#include <sys/cdefs.h>
#ifdef _KERNEL
@@ -56,4 +62,6 @@
(void)__builtin___clear_cache((char *)(from), (char *)(to))
#endif
-#endif
+#endif /* __aarch64__ (vs compat32) */
+
+#endif /* _AARCH64_SLJITARCH_H */
