ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvm-18: cleanup

Browse Source
This commit is contained in:
Laytan Laats
2024-05-07 16:52:46 +02:00
parent a3821615dc
commit ecddf3b7f1
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_odin.sh
+1 -1
View File
@@ -65,7 +65,7 @@ Darwin)
fi fi
CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)"
LDFLAGS="$LDFLAGS -isysroot $(xcrun --show-sdk-path -sdk macosx) -liconv -ldl -framework System -lLLVM -Wl,-rpath $($LLVM_CONFIG --libdir)" LDFLAGS="$LDFLAGS -liconv -ldl -framework System -lLLVM"
;; ;;
FreeBSD) FreeBSD)
CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)" CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)"
src/build_settings.cpp
+7 -7
View File
@@ -922,17 +922,17 @@ gb_internal isize MAX_ERROR_COLLECTOR_COUNT(void) {
return build_context.max_error_count; return build_context.max_error_count;
} }
// NOTE: AMD64 targets had their alignment on 128 bit ints bumped from 8 to 16 (undocumented of course).
#if defined(GB_SYSTEM_WINDOWS) #if defined(GB_SYSTEM_WINDOWS)
#define AMD64_MAX_ALIGNMENT (8) // TODO: up to 16 when Windows is updated to LLVM 18. #include <llvm-c/Config/llvm-config.h>
#else #else
#include <llvm/Config/llvm-config.h> #include <llvm/Config/llvm-config.h>
#endif
#if LLVM_VERSION_MAJOR >= 18 // NOTE: AMD64 targets had their alignment on 128 bit ints bumped from 8 to 16 (undocumented of course).
#define AMD64_MAX_ALIGNMENT (16) #if LLVM_VERSION_MAJOR >= 18
#else #define AMD64_MAX_ALIGNMENT 16
#define AMD64_MAX_ALIGNMENT (8) #else
#endif #define AMD64_MAX_ALIGNMENT 8
#endif #endif
gb_global TargetMetrics target_windows_i386 = { gb_global TargetMetrics target_windows_i386 = {
src/llvm_backend.hpp
+4 -9
View File
@@ -1,13 +1,9 @@
#if defined(GB_SYSTEM_WINDOWS) #if defined(GB_SYSTEM_WINDOWS)
#include "llvm-c/Core.h" #include <llvm-c/Config/llvm-config.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/PassBuilder.h"
#else #else
#include <llvm/Config/llvm-config.h>
#endif
#include <llvm-c/Core.h> #include <llvm-c/Core.h>
#include <llvm-c/ExecutionEngine.h> #include <llvm-c/ExecutionEngine.h>
#include <llvm-c/Target.h> #include <llvm-c/Target.h>
@@ -26,7 +22,6 @@
#include <llvm-c/Transforms/Utils.h> #include <llvm-c/Transforms/Utils.h>
#include <llvm-c/Transforms/Vectorize.h> #include <llvm-c/Transforms/Vectorize.h>
#endif #endif
#endif
#if LLVM_VERSION_MAJOR < 11 #if LLVM_VERSION_MAJOR < 11
#error "LLVM Version 11 is the minimum required" #error "LLVM Version 11 is the minimum required"