Skip to content

Commit 45f1e2d

Browse files
committed
Some remaining fixups after LLVM 11 and 12 got removed
1 parent 4ca195a commit 45f1e2d

File tree

4 files changed

+7
-20
lines changed

4 files changed

+7
-20
lines changed

IRBindings.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,9 @@ LLVMValueRef LLVMGoGetInlineAsm(LLVMTypeRef Ty, char *AsmString,
7979
LLVMBool IsAlignStack,
8080
LLVMInlineAsmDialect Dialect, LLVMBool CanThrow)
8181
{
82-
#if LLVM_VERSION_MAJOR >= 13
8382
return LLVMGetInlineAsm(Ty, AsmString,
8483
AsmStringSize, Constraints,
8584
ConstraintsSize, HasSideEffects,
8685
IsAlignStack,
8786
Dialect, CanThrow);
88-
#else
89-
return LLVMGetInlineAsm(Ty, AsmString,
90-
AsmStringSize, Constraints,
91-
ConstraintsSize, HasSideEffects,
92-
IsAlignStack,
93-
Dialect);
94-
#endif
9587
}

InstrumentationBindings.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,5 @@ void LLVMAddDataFlowSanitizerPass(LLVMPassManagerRef PM,
4444
for (int i = 0; i != ABIListFilesNum; ++i) {
4545
ABIListFilesVec.push_back(ABIListFiles[i]);
4646
}
47-
#if LLVM_VERSION_MAJOR >= 12
4847
unwrap(PM)->add(createDataFlowSanitizerLegacyPassPass(ABIListFilesVec));
49-
#else
50-
unwrap(PM)->add(createDataFlowSanitizerPass(ABIListFilesVec));
51-
#endif
5248
}

README.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ This library provides bindings to a system-installed LLVM.
44

55
Currently supported:
66

7-
* LLVM 11, 12 and 13 from [apt.llvm.org](http://apt.llvm.org/) on Debian/Ubuntu.
8-
* LLVM 11, 12 and 13 from Homebrew on macOS.
7+
* LLVM 13 and 14 from [apt.llvm.org](http://apt.llvm.org/) on Debian/Ubuntu.
8+
* LLVM 13 and 14 from Homebrew on macOS.
99

1010
## Usage
1111

ir.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,11 @@ const (
286286
//-------------------------------------------------------------------------
287287

288288
const (
289-
AnyComdatSelectionKind ComdatSelectionKind = C.LLVMAnyComdatSelectionKind
290-
ExactMatchComdatSelectionKind ComdatSelectionKind = C.LLVMExactMatchComdatSelectionKind
291-
LargestComdatSelectionKind ComdatSelectionKind = C.LLVMLargestComdatSelectionKind
292-
// LLVM < 13: NoDuplicatesComdatSelectionKind ComdatSelectionKind = C.LLVMNoDuplicatesComdatSelectionKind
293-
// LLVM >= 13: NoDeduplicateComdatSelectionKind ComdatSelectionKind = C.LLVMNoDeduplicateComdatSelectionKind
294-
SameSizeComdatSelectionKind ComdatSelectionKind = C.LLVMSameSizeComdatSelectionKind
289+
AnyComdatSelectionKind ComdatSelectionKind = C.LLVMAnyComdatSelectionKind
290+
ExactMatchComdatSelectionKind ComdatSelectionKind = C.LLVMExactMatchComdatSelectionKind
291+
LargestComdatSelectionKind ComdatSelectionKind = C.LLVMLargestComdatSelectionKind
292+
NoDeduplicateComdatSelectionKind ComdatSelectionKind = C.LLVMNoDeduplicateComdatSelectionKind
293+
SameSizeComdatSelectionKind ComdatSelectionKind = C.LLVMSameSizeComdatSelectionKind
295294
)
296295

297296
//-------------------------------------------------------------------------

0 commit comments

Comments
 (0)