From ad29658d3887d470bcdb0693f03b6441cc47ffd9 Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Fri, 16 Aug 2024 13:15:40 -0700 Subject: [PATCH 1/2] [rebranch] Drop minimum python support to 3.6 This was changed back in Februrary, but we still support platforms that only have Python 3.6 (Amazon Linux 2). --- llvm/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index e4ed0134d6c6d..e9a64c9bc9e5a 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -947,7 +947,7 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH if(LLVM_INCLUDE_TESTS) # All LLVM Python files should be compatible down to this minimum version. - set(LLVM_MINIMUM_PYTHON_VERSION 3.8) + set(LLVM_MINIMUM_PYTHON_VERSION 3.6) else() # FIXME: it is unknown if this is the actual minimum bound set(LLVM_MINIMUM_PYTHON_VERSION 3.0) From 0fc67cbf8158bc5c767d663f5d188bc45a6574fc Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Wed, 11 Sep 2024 22:10:10 -0700 Subject: [PATCH 2/2] [Interpreter] Try include `LLJIT.h` to fix Amazon Linux 2 failures These shouldn't be needed, but see if they fix Amazon Linux 2 anyway. --- clang/lib/Interpreter/CodeCompletion.cpp | 1 - clang/lib/Interpreter/IncrementalParser.cpp | 1 + clang/lib/Interpreter/Value.cpp | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/lib/Interpreter/CodeCompletion.cpp b/clang/lib/Interpreter/CodeCompletion.cpp index 791426807cb91..f795c0da1ba18 100644 --- a/clang/lib/Interpreter/CodeCompletion.cpp +++ b/clang/lib/Interpreter/CodeCompletion.cpp @@ -19,7 +19,6 @@ #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendActions.h" -#include "clang/Interpreter/Interpreter.h" #include "clang/Lex/PreprocessorOptions.h" #include "clang/Sema/CodeCompleteConsumer.h" #include "clang/Sema/CodeCompleteOptions.h" diff --git a/clang/lib/Interpreter/IncrementalParser.cpp b/clang/lib/Interpreter/IncrementalParser.cpp index b7c809c45098c..8b0cb1165bfe5 100644 --- a/clang/lib/Interpreter/IncrementalParser.cpp +++ b/clang/lib/Interpreter/IncrementalParser.cpp @@ -22,6 +22,7 @@ #include "clang/Interpreter/Interpreter.h" #include "clang/Parse/Parser.h" #include "clang/Sema/Sema.h" +#include "llvm/ExecutionEngine/Orc/LLJIT.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/Error.h" diff --git a/clang/lib/Interpreter/Value.cpp b/clang/lib/Interpreter/Value.cpp index eb2ce9c9fd330..48bf67ba8a3a7 100644 --- a/clang/lib/Interpreter/Value.cpp +++ b/clang/lib/Interpreter/Value.cpp @@ -16,6 +16,7 @@ #include "clang/AST/Type.h" #include "clang/Interpreter/Interpreter.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/ExecutionEngine/Orc/LLJIT.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_os_ostream.h" #include