From 972c2cd2882b6dd7a2059d030d03e89dae47ede7 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 1 Oct 2024 04:49:11 -0400 Subject: jit: Require at least LLVM 14, if enabled. Remove support for LLVM versions 10-13. The default on all non-EOL'd OSes represented in our build farm will be at least LLVM 14 when PostgreSQL 18 ships. Author: Thomas Munro Reviewed-by: Peter Eisentraut Discussion: https://postgr.es/m/CA%2BhUKGLhNs5geZaVNj2EJ79Dx9W8fyWUU3HxcpZy55sMGcY%3DiA%40mail.gmail.com --- src/backend/jit/llvm/llvmjit_error.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'src/backend/jit/llvm/llvmjit_error.cpp') diff --git a/src/backend/jit/llvm/llvmjit_error.cpp b/src/backend/jit/llvm/llvmjit_error.cpp index ebe2f1baa10..351354c30bc 100644 --- a/src/backend/jit/llvm/llvmjit_error.cpp +++ b/src/backend/jit/llvm/llvmjit_error.cpp @@ -30,13 +30,7 @@ static std::new_handler old_new_handler = NULL; static void fatal_system_new_handler(void); static void fatal_llvm_new_handler(void *user_data, const char *reason, bool gen_crash_diag); -#if LLVM_VERSION_MAJOR < 14 -static void fatal_llvm_new_handler(void *user_data, const std::string& reason, bool gen_crash_diag); -#endif static void fatal_llvm_error_handler(void *user_data, const char *reason, bool gen_crash_diag); -#if LLVM_VERSION_MAJOR < 14 -static void fatal_llvm_error_handler(void *user_data, const std::string& reason, bool gen_crash_diag); -#endif /* @@ -135,15 +129,6 @@ fatal_llvm_new_handler(void *user_data, errmsg("out of memory"), errdetail("While in LLVM: %s", reason))); } -#if LLVM_VERSION_MAJOR < 14 -static void -fatal_llvm_new_handler(void *user_data, - const std::string& reason, - bool gen_crash_diag) -{ - fatal_llvm_new_handler(user_data, reason.c_str(), gen_crash_diag); -} -#endif static void fatal_llvm_error_handler(void *user_data, @@ -154,13 +139,3 @@ fatal_llvm_error_handler(void *user_data, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("fatal llvm error: %s", reason))); } - -#if LLVM_VERSION_MAJOR < 14 -static void -fatal_llvm_error_handler(void *user_data, - const std::string& reason, - bool gen_crash_diag) -{ - fatal_llvm_error_handler(user_data, reason.c_str(), gen_crash_diag); -} -#endif -- cgit v1.2.3