gingerBill il y a 4 ans
Parent
commit
2b4010998d
3 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 2 2
      .github/workflows/ci.yml
  2. 2 2
      Makefile
  3. 1 1
      src/llvm_backend.cpp

+ 2 - 2
.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Download LLVM
-        run: sudo apt-get install llvm
+        run: sudo apt-get install llvm-11 llvm-11
       - name: build odin
         run: make release
       - name: Odin run
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v1
       - name: Download LLVM and setup PATH
         run: |
-          brew install llvm
+          brew install llvm@11
           echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
           TMP_PATH=$(xcrun --show-sdk-path)/user/include
           echo "CPATH=$TMP_PATH" >> $GITHUB_ENV

+ 2 - 2
Makefile

@@ -9,11 +9,11 @@ OS=$(shell uname)
 ifeq ($(OS), Darwin)
 	LDFLAGS:=$(LDFLAGS) -liconv
 	CFLAGS:=$(CFLAGS) $(shell llvm-config --cflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM
-	LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs)
+	LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) -lLLVM-C
 endif
 ifeq ($(OS), Linux)
 	CFLAGS:=$(CFLAGS) $(shell llvm-config --cflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM
-	LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs)
+	LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) -lLLVM-C
 endif
 
 all: debug demo

+ 1 - 1
src/llvm_backend.cpp

@@ -2323,7 +2323,7 @@ void lb_debug_complete_types(lbModule *m) {
 						for (unsigned i = 0; i < element_count; i++) {
 							u64 offset_in_bits = i;
 							i64 val = bt->BitSet.lower + cast(i64)i;
-							gb_snprintf(name, gb_count_of(name), "%lld", val);
+							gb_snprintf(name, gb_count_of(name), "%lld", cast(long long)val);
 							elements[i] = LLVMDIBuilderCreateBitFieldMemberType(
 								m->debug_builder,
 								scope,