aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLuc Van Oostenryck <lucvoo@kernel.org>2024-01-29 18:14:05 +0100
committerLuc Van Oostenryck <lucvoo@kernel.org>2024-01-29 18:14:05 +0100
commit09411a7a5127516a0741eb1bd8762642fa9197ce (patch)
tree8fc2899819befdac25a55e50b2ecda6dcaf6009b
parentc991e5c68b48158410ebda9cd0ae0fde065faec7 (diff)
parent2925599897b1459fa46ed95c5e4cceebc91e824a (diff)
downloadsparse-09411a7a5127516a0741eb1bd8762642fa9197ce.tar.gz
Merge branch 'llvm-next'
* llvm: avoid trivial recursion in symbol_type() * llvm: enable LLVM on arm64
-rw-r--r--Makefile2
-rw-r--r--sparse-llvm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8450d8bc..e172758b 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ arch := $(shell uname -m)
ifeq (${MULTIARCH_TRIPLET},x86_64-linux-gnux32)
arch := x32
endif
-ifneq ($(filter ${arch},i386 i486 i586 i686 x86_64 amd64),)
+ifneq ($(filter ${arch},i386 i486 i586 i686 x86_64 amd64 aarch64 arm64),)
LLVM_VERSION:=$(shell $(LLVM_CONFIG) --version)
LLVM_VERSION_MAJOR:=$(firstword $(subst ., ,$(LLVM_VERSION)))
ifeq ($(shell expr "$(LLVM_VERSION_MAJOR)" '>=' 3),1)
diff --git a/sparse-llvm.c b/sparse-llvm.c
index 0b826ce0..90a931b7 100644
--- a/sparse-llvm.c
+++ b/sparse-llvm.c
@@ -194,7 +194,7 @@ static LLVMTypeRef symbol_type(struct symbol *sym)
/* don't cache the result for SYM_NODE */
if (sym->type == SYM_NODE)
- return symbol_type(sym->ctype.base_type);
+ sym = sym->ctype.base_type;
if (sym->aux)
return sym->aux;