aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2020-11-25 16:19:56 +0000
committergingerBill <bill@gingerbill.org>2020-11-25 16:19:56 +0000
commitdbaf4d24f6e67ec05e8640b037cd934121f125c5 (patch)
tree68823947cecb81215d92210b839ceb4c84b0a0c5 /src
parent9c1c9693f26114499d0fb37bb692291ede8fa7ea (diff)
Update package json for new map layout; Correct llvm-api includes for *nix
Diffstat (limited to 'src')
-rw-r--r--src/llvm_backend.cpp4
-rw-r--r--src/llvm_backend.hpp19
-rw-r--r--src/main.cpp4
3 files changed, 27 insertions, 0 deletions
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp
index f8c6b44e1..2d5e14c68 100644
--- a/src/llvm_backend.cpp
+++ b/src/llvm_backend.cpp
@@ -12522,6 +12522,10 @@ void lb_generate_code(lbGenerator *gen) {
1, "", 0,
LLVMDWARFEmissionFull, 0, true,
true
+ #if LLVM_VERSION_MAJOR > 10
+ , "", 0,
+ "", 0
+ #endif
);
}
diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp
index 388176e9a..09929c8cd 100644
--- a/src/llvm_backend.hpp
+++ b/src/llvm_backend.hpp
@@ -1,3 +1,5 @@
+#if defined(LLVM_BACKEND_SUPPORT)
+#if defined(GB_SYSTEM_WINDOWS)
#include "llvm-c/Core.h"
#include "llvm-c/ExecutionEngine.h"
#include "llvm-c/Target.h"
@@ -12,6 +14,23 @@
#include "llvm-c/Transforms/Scalar.h"
#include "llvm-c/Transforms/Utils.h"
#include "llvm-c/Transforms/Vectorize.h"
+#else
+#include <llvm-c/Core.h>
+#include <llvm-c/ExecutionEngine.h>
+#include <llvm-c/Target.h>
+#include <llvm-c/Analysis.h>
+#include <llvm-c/Object.h>
+#include <llvm-c/BitWriter.h>
+#include <llvm-c/DebugInfo.h>
+#include <llvm-c/Transforms/AggressiveInstCombine.h>
+#include <llvm-c/Transforms/InstCombine.h>
+#include <llvm-c/Transforms/IPO.h>
+#include <llvm-c/Transforms/PassManagerBuilder.h>
+#include <llvm-c/Transforms/Scalar.h>
+#include <llvm-c/Transforms/Utils.h>
+#include <llvm-c/Transforms/Vectorize.h>
+#endif
+#endif
struct lbProcedure;
diff --git a/src/main.cpp b/src/main.cpp
index dbade085d..fbcc03dae 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,7 +11,11 @@
gb_global Timings global_timings = {0};
#if defined(LLVM_BACKEND_SUPPORT)
+#if defined(GB_SYSTEM_WINDOWS)
#include "llvm-c/Types.h"
+#else
+#include <llvm-c/Types.h>
+#endif
#endif
#include "parser.hpp"