Skip to content

libclc: Remove HAVE_LLVM version macros #158257

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 12, 2025
Merged

libclc: Remove HAVE_LLVM version macros #158257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34e55fc
libclc: Remove HAVE_LLVM version macros
arsenm Sep 12, 2025
e44cd0f
Remove target_compile_definitions
arsenm Sep 12, 2025
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
4 changes: 0 additions & 4 deletions libclc/utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Construct LLVM version define
set( LLVM_VERSION_DEFINE "-DHAVE_LLVM=0x${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}" )

# Setup prepare_builtins tools
set( LLVM_LINK_COMPONENTS
BitReader
Expand All @@ -19,6 +16,5 @@ else()
setup_host_tool( prepare_builtins PREPARE_BUILTINS prepare_builtins_exe prepare_builtins_target )
endif()

target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} )
# These were not properly reported in early LLVM and we don't need them
target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions )
17 changes: 0 additions & 17 deletions libclc/utils/prepare-builtins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@
//
//===----------------------------------------------------------------------===//

#if HAVE_LLVM > 0x0390
#include "llvm/Bitcode/BitcodeReader.h"
#include "llvm/Bitcode/BitcodeWriter.h"
#else
#include "llvm/Bitcode/ReaderWriter.h"
#endif

#include "llvm/Config/llvm-config.h"
#include "llvm/IR/Function.h"
Expand Down Expand Up @@ -62,12 +58,8 @@ int main(int argc, char **argv) {
std::unique_ptr<MemoryBuffer> &BufferPtr = BufferOrErr.get();
SMDiagnostic Err;
std::unique_ptr<llvm::Module> MPtr =
#if HAVE_LLVM > 0x0390
ExitOnErr(Expected<std::unique_ptr<llvm::Module>>(
parseIR(BufferPtr.get()->getMemBufferRef(), Err, Context)));
#else
parseIR(BufferPtr.get()->getMemBufferRef(), Err, Context);
#endif
M = MPtr.release();
}
}
Expand Down Expand Up @@ -106,13 +98,8 @@ int main(int argc, char **argv) {
}

std::error_code EC;
#if HAVE_LLVM >= 0x0600
std::unique_ptr<ToolOutputFile> Out(
new ToolOutputFile(OutputFilename, EC, sys::fs::OF_None));
#else
std::unique_ptr<tool_output_file> Out(
new tool_output_file(OutputFilename, EC, sys::fs::OF_None));
#endif
if (EC) {
errs() << EC.message() << '\n';
exit(1);
Expand All @@ -121,11 +108,7 @@ int main(int argc, char **argv) {
if (TextualOut)
M->print(Out->os(), nullptr, true);
else
#if HAVE_LLVM >= 0x0700
WriteBitcodeToFile(*M, Out->os());
#else
WriteBitcodeToFile(M, Out->os());
#endif

// Declare success.
Out->keep();
Expand Down
Loading