Bump LLVM and update Makefile

sysprog21 · Dec 2, 2024 · 96a1f42 · 96a1f42
1 parent f49d839
commit 96a1f42
Showing 1 changed file with 33 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -141,35 +141,39 @@ endif
 ENABLE_JIT ?= 0
 $(call set-feature, JIT)
 ifeq ($(call has, JIT), 1)
-OBJS_EXT += jit.o
-# tier-2 JIT compiler powered LLVM
-LLVM_CONFIG = llvm-config-17
-LLVM_CONFIG := $(shell which $(LLVM_CONFIG))
-ifndef LLVM_CONFIG
-# Try Homebrew on macOS
-LLVM_CONFIG = /opt/homebrew/opt/llvm@17/bin/llvm-config
-LLVM_CONFIG := $(shell which $(LLVM_CONFIG))
-ifdef LLVM_CONFIG
-LDFLAGS += -L/opt/homebrew/opt/llvm@17/lib
-endif
-endif
-ifneq ("$(LLVM_CONFIG)", "")
-ifneq ("$(findstring -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS, "$(shell $(LLVM_CONFIG) --cflags)")", "")
-ENABLE_T2C := 1
-$(call set-feature, T2C)
-OBJS_EXT += t2c.o
-CFLAGS += -g $(shell $(LLVM_CONFIG) --cflags)
-LDFLAGS += $(shell $(LLVM_CONFIG) --libs)
-else
-ENABLE_T2C := 0
-$(call set-feature, T2C)
-$(warning No llvm-config-17 installed. Check llvm-config-17 installation in advance)
-endif
-endif
-
-ifneq ($(processor),$(filter $(processor),x86_64 aarch64 arm64))
-$(error JIT mode only supports for x64 and arm64 target currently.)
-endif
+    OBJS_EXT += jit.o
+    ENABLE_T2C ?= 1
+    $(call set-feature, T2C)
+    ifeq ($(call has, T2C), 1)
+        # tier-2 JIT compiler powered LLVM
+        LLVM_CONFIG = llvm-config-18
+        LLVM_CONFIG := $(shell which $(LLVM_CONFIG))
+        ifndef LLVM_CONFIG
+            # Try Homebrew on macOS
+            LLVM_CONFIG = /opt/homebrew/opt/llvm@18/bin/llvm-config
+            LLVM_CONFIG := $(shell which $(LLVM_CONFIG))
+            ifdef LLVM_CONFIG
+                LDFLAGS += -L/opt/homebrew/opt/llvm@18/lib
+            endif
+        endif
+        ifeq ("$(LLVM_CONFIG)", "")
+            $(error No llvm-config-18 installed. Check llvm-config-18 installation in advance, or use "ENABLE_T2C=0" to disable tier-2 LLVM compiler)
+        endif
+        ifeq ("$(findstring -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS, "$(shell $(LLVM_CONFIG) --cflags)")", "")
+            $(error No llvm-config-18 installed. Check llvm-config-18 installation in advance, or use "ENABLE_T2C=0" to disable tier-2 LLVM compiler)
+        endif
+		CHECK_LLVM_LIBS := $(shell $(LLVM_CONFIG) --libs 2>/dev/null 1>&2; echo $$?)
+		ifeq ("$(CHECK_LLVM_LIBS)", "0")
+            OBJS_EXT += t2c.o
+            CFLAGS += -g $(shell $(LLVM_CONFIG) --cflags)
+            LDFLAGS += $(shell $(LLVM_CONFIG) --libs)
+		else
+            $(error No llvm-config-18 installed. Check llvm-config-18 installation in advance, or use "ENABLE_T2C=0" to disable tier-2 LLVM compiler)
+        endif
+    endif
+    ifneq ($(processor),$(filter $(processor),x86_64 aarch64 arm64))
+        $(error JIT mode only supports for x64 and arm64 target currently.)
+    endif
 
 src/rv32_jit.c:
 	$(Q)tools/gen-jit-template.py $(CFLAGS) > $@