Skip to content

Update to Swift 6.0.3 and LLVM 19.1.7 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
// swift-tools-version:5.2
// swift-tools-version:6.0.2

import PackageDescription

let package = Package(
name: "LLVM",
platforms: [
.macOS(.v10_14),
.macOS(.v10_14)
],
products: [
.library(
name: "LLVM",
targets: ["LLVM"]),
targets: ["LLVM"])
],
dependencies: [
.package(url: "https://github.com/llvm-swift/FileCheck.git", from: "0.0.3"),
.package(url: "https://github.com/llvm-swift/FileCheck.git", from: "0.0.3")
],
targets: [
.systemLibrary(
name: "cllvm",
pkgConfig: "cllvm",
providers: [
.brew(["llvm"]),
]),
pkgConfig: "llvm"
),
.target(
name: "llvmshims",
dependencies: ["cllvm"]),
Expand All @@ -32,5 +30,7 @@ let package = Package(
name: "LLVMTests",
dependencies: ["LLVM", "FileCheck"]),
],
cxxLanguageStandard: .cxx14
swiftLanguageModes: [.v5],
cxxLanguageStandard: .cxx17

)
3 changes: 1 addition & 2 deletions Sources/LLVM/CallingConvention.swift
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,6 @@ public enum CallingConvention {
case LLVMColdCallConv: self = .cold
case LLVMGHCCallConv: self = .ghc
case LLVMHiPECallConv: self = .hiPE
case LLVMWebKitJSCallConv: self = .webKitJS
case LLVMAnyRegCallConv: self = .anyReg
case LLVMPreserveMostCallConv: self = .preserveMost
case LLVMPreserveAllCallConv: self = .preserveAll
Expand Down Expand Up @@ -392,7 +391,7 @@ public enum CallingConvention {
private static let conventionMapping: [CallingConvention: LLVMCallConv] = [
.c : LLVMCCallConv, .fast : LLVMFastCallConv, .cold : LLVMColdCallConv,
.ghc : LLVMGHCCallConv, .hiPE : LLVMHiPECallConv,
.webKitJS : LLVMWebKitJSCallConv, .anyReg : LLVMAnyRegCallConv,
.anyReg : LLVMAnyRegCallConv,
.preserveMost : LLVMPreserveMostCallConv,
.preserveAll : LLVMPreserveAllCallConv, .swift : LLVMSwiftCallConv,
.cxxFastThreadLocalStorage : LLVMCXXFASTTLSCallConv,
Expand Down
4 changes: 2 additions & 2 deletions Sources/LLVM/Comdat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ extension Comdat {
case LLVMAnyComdatSelectionKind: self = .any
case LLVMExactMatchComdatSelectionKind: self = .exactMatch
case LLVMLargestComdatSelectionKind: self = .largest
case LLVMNoDuplicatesComdatSelectionKind: self = .noDuplicates
case LLVMNoDeduplicateComdatSelectionKind: self = .noDuplicates
case LLVMSameSizeComdatSelectionKind: self = .sameSize
default: fatalError("unknown comdat selection kind \(llvm)")
}
Expand All @@ -113,7 +113,7 @@ extension Comdat {
.any: LLVMAnyComdatSelectionKind,
.exactMatch: LLVMExactMatchComdatSelectionKind,
.largest: LLVMLargestComdatSelectionKind,
.noDuplicates: LLVMNoDuplicatesComdatSelectionKind,
.noDuplicates: LLVMNoDeduplicateComdatSelectionKind,
.sameSize: LLVMSameSizeComdatSelectionKind,
]

Expand Down
Loading