rebase of the patches

This commit is contained in:
Sylvestre Ledru 2024-10-11 21:42:16 +02:00
parent af6609c5b3
commit fc2f621dab
23 changed files with 161 additions and 161 deletions

View File

@ -9,10 +9,10 @@ Subject: Set html_static_path = ['_static'] everywhere.
polly/docs/conf.py | 2 +- polly/docs/conf.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-) 4 files changed, 4 insertions(+), 4 deletions(-)
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/analyzer/conf.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/analyzer/conf.py --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/docs/analyzer/conf.py
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/analyzer/conf.py
@@ -118,7 +118,7 @@ html_theme = "haiku" @@ -118,7 +118,7 @@ html_theme = "haiku"
# Add any paths that contain custom static files (such as style sheets) here, # Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files, # relative to this directory. They are copied after the builtin static files,
@ -22,11 +22,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analy
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format. # using the given strftime format.
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/conf.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/docs/conf.py
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/conf.py
@@ -118,7 +118,7 @@ html_theme = "haiku" @@ -127,7 +127,7 @@ html_theme = "haiku"
# Add any paths that contain custom static files (such as style sheets) here, # Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files, # relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css". # so a file named "default.css" will overwrite the builtin "default.css".
@ -35,10 +35,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format. # using the given strftime format.
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/polly/docs/conf.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/conf.py --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/polly/docs/conf.py
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/polly/docs/conf.py
@@ -124,7 +124,7 @@ except ImportError: @@ -124,7 +124,7 @@ except ImportError:
# Add any paths that contain custom static files (such as style sheets) here, # Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files, # relative to this directory. They are copied after the builtin static files,

View File

@ -7,11 +7,11 @@
clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- clang/test/Sema/warn-strlcpycat-size.c | 55 --------------
6 files changed, 25 insertions(+), 78 deletions(-) 6 files changed, 25 insertions(+), 78 deletions(-)
Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/AST/Decl.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/AST/Decl.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/AST/Decl.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/AST/Decl.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/AST/Decl.cpp
@@ -4426,13 +4426,13 @@ unsigned FunctionDecl::getMemoryFunction @@ -4412,13 +4412,13 @@ unsigned FunctionDecl::getMemoryFunction
case Builtin::BImemmove: case Builtin::BImemmove:
return Builtin::BImemmove; return Builtin::BImemmove;
@ -31,11 +31,11 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/AST/De
case Builtin::BI__builtin_memcmp: case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp: case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/SemaChecking.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Sema/SemaChecking.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/Sema/SemaChecking.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/SemaChecking.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Sema/SemaChecking.cpp
@@ -1320,8 +1320,8 @@ void Sema::checkFortifiedBuiltinMemoryFu @@ -1348,8 +1348,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memcpy_chk:
case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memmove_chk:
case Builtin::BI__builtin___memset_chk: case Builtin::BI__builtin___memset_chk:
@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/S
case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncat_chk:
case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___strncpy_chk:
case Builtin::BI__builtin___stpncpy_chk: case Builtin::BI__builtin___stpncpy_chk:
@@ -8179,10 +8179,10 @@ bool Sema::CheckFunctionCall(FunctionDec @@ -3422,10 +3422,10 @@ bool Sema::CheckFunctionCall(FunctionDec
switch (CMId) { switch (CMId) {
case 0: case 0:
return false; return false;
@ -59,11 +59,11 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/S
case Builtin::BIstrncat: case Builtin::BIstrncat:
CheckStrncatArguments(TheCall, FnInfo); CheckStrncatArguments(TheCall, FnInfo);
break; break;
Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
@@ -741,9 +741,9 @@ void GenericTaintChecker::initTaintRules @@ -743,9 +743,9 @@ void GenericTaintChecker::initTaintRules
TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})},
{{CDM::CLibraryMaybeHardened, {"strncat"}}, {{CDM::CLibraryMaybeHardened, {"strncat"}},
TR::Prop({{0, 1, 2}}, {{0, ReturnValueIndex}})}, TR::Prop({{0, 1, 2}}, {{0, ReturnValueIndex}})},
@ -75,10 +75,10 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Static
// Usually the matching mode `CDM::CLibraryMaybeHardened` is sufficient // Usually the matching mode `CDM::CLibraryMaybeHardened` is sufficient
// for unified handling of a function `FOO()` and its hardened variant // for unified handling of a function `FOO()` and its hardened variant
// `__FOO_chk()`, but in the "sprintf" family the extra parameters of the // `__FOO_chk()`, but in the "sprintf" family the extra parameters of the
Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/builtins.c Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/test/Sema/builtins.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/test/Sema/builtins.c --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/builtins.c +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/test/Sema/builtins.c
@@ -195,12 +195,10 @@ void test18(void) { @@ -195,12 +195,10 @@ void test18(void) {
void *ptr; void *ptr;
@ -110,10 +110,10 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/
char * Test20(char *p, const char *in, unsigned n) char * Test20(char *p, const char *in, unsigned n)
{ {
Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/warn-strlcpycat-size.c Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/test/Sema/warn-strlcpycat-size.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/test/Sema/warn-strlcpycat-size.c --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/test/Sema/warn-strlcpycat-size.c
+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/warn-strlcpycat-size.c +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/test/Sema/warn-strlcpycat-size.c
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
- -
@ -170,11 +170,11 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/
- -
- strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
-} -}
Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/include/clang/Basic/Builtins.td Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/include/clang/Basic/Builtins.td
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/include/clang/Basic/Builtins.td --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/include/clang/Basic/Builtins.td
+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/include/clang/Basic/Builtins.td +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/include/clang/Basic/Builtins.td
@@ -3274,7 +3274,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h @@ -3316,7 +3316,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h
// non-standard but very common // non-standard but very common
@ -184,7 +184,7 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/include/cl
let Spellings = ["strlcpy"]; let Spellings = ["strlcpy"];
let Prototype = "size_t(char*, char const*, size_t)"; let Prototype = "size_t(char*, char const*, size_t)";
} }
@@ -3283,6 +3284,7 @@ def StrlCat : GNULibBuiltin<"string.h"> @@ -3325,6 +3326,7 @@ def StrlCat : GNULibBuiltin<"string.h">
let Spellings = ["strlcat"]; let Spellings = ["strlcat"];
let Prototype = "size_t(char*, char const*, size_t)"; let Prototype = "size_t(char*, char const*, size_t)";
} }

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -264,10 +264,12 @@ def main(): @@ -300,10 +300,12 @@ async def main() -> None:
help="Allow alpha checkers from clang-analyzer.", help="Allow alpha checkers from clang-analyzer.",
) )
parser.add_argument( parser.add_argument(

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang-tools-extra/clangd/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/clangd/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang-tools-extra/clangd/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang-tools-extra/clangd/CMakeLists.txt
@@ -61,6 +61,11 @@ endif() @@ -61,6 +61,11 @@ endif()
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy") include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy")
include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include") include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include")
@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extr
add_clang_library(clangDaemon add_clang_library(clangDaemon
AST.cpp AST.cpp
ASTSignals.cpp ASTSignals.cpp
@@ -178,6 +183,7 @@ clang_target_link_libraries(clangDaemon @@ -181,6 +186,7 @@ clang_target_link_libraries(clangDaemon
target_link_libraries(clangDaemon target_link_libraries(clangDaemon
PRIVATE PRIVATE
${LLVM_PTHREAD_LIB} ${LLVM_PTHREAD_LIB}

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Driver/ToolChains/Linux.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Linux.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Driver/ToolChains/Linux.cpp
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
#include "Arch/PPC.h" #include "Arch/PPC.h"
#include "Arch/RISCV.h" #include "Arch/RISCV.h"
@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver
#include "clang/Config/config.h" #include "clang/Config/config.h"
#include "clang/Driver/Distro.h" #include "clang/Driver/Distro.h"
#include "clang/Driver/Driver.h" #include "clang/Driver/Driver.h"
@@ -627,8 +628,18 @@ void Linux::AddClangSystemIncludeArgs(co @@ -634,8 +635,18 @@ void Linux::AddClangSystemIncludeArgs(co
SmallString<128> ResourceDirInclude(D.ResourceDir); SmallString<128> ResourceDirInclude(D.ResourceDir);
llvm::sys::path::append(ResourceDirInclude, "include"); llvm::sys::path::append(ResourceDirInclude, "include");
if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && if (!DriverArgs.hasArg(options::OPT_nobuiltininc) &&

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/FileManager.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Basic/FileManager.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Basic/FileManager.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/Basic/FileManager.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/FileManager.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Basic/FileManager.cpp
@@ -592,6 +592,12 @@ FileManager::getNoncachedStatValue(Strin @@ -609,6 +609,12 @@ FileManager::getNoncachedStatValue(Strin
return std::error_code(); return std::error_code();
} }
@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/
void FileManager::GetUniqueIDMapping( void FileManager::GetUniqueIDMapping(
SmallVectorImpl<OptionalFileEntryRef> &UIDToFiles) const { SmallVectorImpl<OptionalFileEntryRef> &UIDToFiles) const {
UIDToFiles.clear(); UIDToFiles.clear();
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/include/lldb/lldb-defines.h Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/include/lldb/lldb-defines.h
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/include/lldb/lldb-defines.h --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/include/lldb/lldb-defines.h
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/include/lldb/lldb-defines.h +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/include/lldb/lldb-defines.h
@@ -15,6 +15,11 @@ @@ -15,6 +15,11 @@
#define INT32_MAX 2147483647 #define INT32_MAX 2147483647
#endif #endif

View File

@ -1,10 +1,10 @@
set rpath for prepare_builtins build utility to find correct stage2 set rpath for prepare_builtins build utility to find correct stage2
libs at runtime when executed as part of a build libs at runtime when executed as part of a build
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libclc/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libclc/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/libclc/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libclc/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libclc/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libclc/CMakeLists.txt
@@ -176,6 +176,9 @@ endif() @@ -177,6 +177,9 @@ endif()
target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} )
# These were not properly reported in early LLVM and we don't need them # These were not properly reported in early LLVM and we don't need them
target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions )

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/include/__atomic/aliases.h
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5.orig/libcxx/include/__atomic/aliases.h --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxx/include/__atomic/aliases.h
+++ llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/include/__atomic/aliases.h
@@ -96,6 +96,7 @@ using __largest_lock_free_type = char; @@ -95,6 +95,7 @@ using __largest_lock_free_type = char;
# endif # endif
# ifndef _LIBCPP_NO_LOCK_FREE_TYPES # ifndef _LIBCPP_NO_LOCK_FREE_TYPES
@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/_
using __contention_t_or_largest = using __contention_t_or_largest =
__conditional_t<__libcpp_is_always_lock_free<__cxx_contention_t>::__value, __conditional_t<__libcpp_is_always_lock_free<__cxx_contention_t>::__value,
__cxx_contention_t, __cxx_contention_t,
@@ -105,6 +106,8 @@ using atomic_signed_lock_free = atomic @@ -104,6 +105,8 @@ using atomic_signed_lock_free = atomic
using atomic_unsigned_lock_free = atomic<make_unsigned_t<__contention_t_or_largest>>; using atomic_unsigned_lock_free = atomic<make_unsigned_t<__contention_t_or_largest>>;
# endif // !_LIBCPP_NO_LOCK_FREE_TYPES # endif // !_LIBCPP_NO_LOCK_FREE_TYPES
#endif // C++20 #endif // C++20

View File

@ -1,9 +1,9 @@
if libatomic is found only link it if libgcc is the rtlib if libatomic is found only link it if libgcc is the rtlib
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxx/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxx/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxx/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxx/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/CMakeLists.txt
@@ -691,13 +691,16 @@ function(cxx_link_system_libraries targe @@ -693,13 +693,16 @@ function(cxx_link_system_libraries targe
endif() endif()
elseif (LIBCXX_HAS_GCC_LIB) elseif (LIBCXX_HAS_GCC_LIB)
target_link_libraries(${target} PRIVATE gcc) target_link_libraries(${target} PRIVATE gcc)

View File

@ -10,11 +10,11 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi
Bug: https://llvm.org/bugs/show_bug.cgi?id=19355 Bug: https://llvm.org/bugs/show_bug.cgi?id=19355
Index: llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.pass.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba.orig/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.pass.cpp
+++ llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.pass.cpp
@@ -22,6 +22,14 @@ @@ -27,6 +27,14 @@
#include "test_macros.h" #include "test_macros.h"
#include "atomic_helpers.h" #include "atomic_helpers.h"

View File

@ -7,11 +7,11 @@ sure their ABI stays in sync.
No known upstream bug about this. No known upstream bug about this.
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/src/cxa_exception.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/cxa_exception.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxxabi/src/cxa_exception.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/src/cxa_exception.cpp
@@ -286,15 +286,16 @@ __cxa_throw(void *thrown_object, std::ty @@ -291,15 +291,16 @@ __cxa_throw(void *thrown_object, std::ty
#ifdef __USING_SJLJ_EXCEPTIONS__ #ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&exception_header->unwindHeader); _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
@ -30,7 +30,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cx
// 2.5.3 Exception Handlers // 2.5.3 Exception Handlers
/* /*
The adjusted pointer is computed by the personality routine during phase 1 The adjusted pointer is computed by the personality routine during phase 1
@@ -578,7 +579,11 @@ void __cxa_end_catch() { @@ -583,7 +584,11 @@ void __cxa_end_catch() {
// to touch a foreign exception in any way, that is undefined // to touch a foreign exception in any way, that is undefined
// behavior. They likely can't since the only way to catch // behavior. They likely can't since the only way to catch
// a foreign exception is with catch (...)! // a foreign exception is with catch (...)!
@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cx
globals->caughtExceptions = 0; globals->caughtExceptions = 0;
} }
} }
@@ -635,8 +640,10 @@ void __cxa_rethrow() { @@ -645,8 +650,10 @@ void __cxa_rethrow() {
} }
#ifdef __USING_SJLJ_EXCEPTIONS__ #ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&exception_header->unwindHeader); _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
@ -54,7 +54,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cx
#endif #endif
// If we get here, some kind of unwinding error has occurred. // If we get here, some kind of unwinding error has occurred.
@@ -760,8 +767,10 @@ __cxa_rethrow_primary_exception(void* th @@ -770,8 +777,10 @@ __cxa_rethrow_primary_exception(void* th
dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup; dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup;
#ifdef __USING_SJLJ_EXCEPTIONS__ #ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader); _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader);
@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cx
#endif #endif
// Some sort of unwinding error. Note that terminate is a handler. // Some sort of unwinding error. Note that terminate is a handler.
__cxa_begin_catch(&dep_exception_header->unwindHeader); __cxa_begin_catch(&dep_exception_header->unwindHeader);
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.h Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/src/cxa_exception.h
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/cxa_exception.h --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxxabi/src/cxa_exception.h
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.h +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/src/cxa_exception.h
@@ -27,6 +27,45 @@ _LIBCXXABI_HIDDEN uint64_t __getExceptio @@ -27,6 +27,45 @@ _LIBCXXABI_HIDDEN uint64_t __getExceptio
_LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t); _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t);
_LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*);

View File

@ -2,11 +2,11 @@ Powerpc has extended double that doesn't match x86 coding. Power format would
need special tests to verify correctness but for now it is enough to prevent need special tests to verify correctness but for now it is enough to prevent
incorrect test from running. incorrect test from running.
Index: llvm-toolchain-snapshot_19~++20240228110413+ba692301f169/libcxxabi/test/test_demangle.pass.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/test/test_demangle.pass.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240228110413+ba692301f169.orig/libcxxabi/test/test_demangle.pass.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxxabi/test/test_demangle.pass.cpp
+++ llvm-toolchain-snapshot_19~++20240228110413+ba692301f169/libcxxabi/test/test_demangle.pass.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/test/test_demangle.pass.cpp
@@ -30239,7 +30239,7 @@ const char* invalid_cases[] = @@ -30235,7 +30235,7 @@ const char* invalid_cases[] =
"_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_", "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_",
"3FooILdaaaaaaaaaaAAAAaaEE", "3FooILdaaaaaaaaaaAAAAaaEE",
"3FooILdaaaaaaaaaaaaaaEE", "3FooILdaaaaaaaaaaaaaaEE",

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/tools/argdumper/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/argdumper/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/tools/argdumper/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/tools/argdumper/CMakeLists.txt
@@ -6,3 +6,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM @@ -6,3 +6,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM
) )
@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdu
+ +
+install(TARGETS lldb-argdumper +install(TARGETS lldb-argdumper
+ RUNTIME DESTINATION bin) + RUNTIME DESTINATION bin)
Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/tools/lldb-server/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/lldb-server/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/tools/lldb-server/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/tools/lldb-server/CMakeLists.txt
@@ -68,3 +68,7 @@ add_dependencies(lldb-server @@ -67,3 +67,7 @@ add_dependencies(lldb-server
) )
target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source") target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source")
target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS}) target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})

View File

@ -2,10 +2,10 @@
lldb/source/API/CMakeLists.txt | 14 +++++++------- lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-) 1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/source/API/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab.orig/lldb/source/API/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/source/API/CMakeLists.txt
@@ -40,7 +40,12 @@ add_custom_target(lldb-sbapi-dwarf-enums @@ -40,7 +40,12 @@ add_custom_target(lldb-sbapi-dwarf-enums
DEPENDS ${sb_languages_file}) DEPENDS ${sb_languages_file})
set_target_properties(lldb-sbapi-dwarf-enums PROPERTIES FOLDER "LLDB/Tablegenning") set_target_properties(lldb-sbapi-dwarf-enums PROPERTIES FOLDER "LLDB/Tablegenning")
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/
SBAddress.cpp SBAddress.cpp
SBAddressRange.cpp SBAddressRange.cpp
SBAddressRangeList.cpp SBAddressRangeList.cpp
@@ -194,7 +199,7 @@ endif() @@ -195,7 +200,7 @@ endif()
set_target_properties(liblldb set_target_properties(liblldb
PROPERTIES PROPERTIES
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/
) )
target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB)
@@ -258,12 +263,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) @@ -259,12 +264,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS)
add_llvm_symbol_exports(liblldb ${exported_symbol_file}) add_llvm_symbol_exports(liblldb ${exported_symbol_file})
endif() endif()

View File

@ -1,10 +1,10 @@
Author: Gianfranco Costamagna <locutusofborg@debian.org> Author: Gianfranco Costamagna <locutusofborg@debian.org>
Last-Update: 2023-01-19 Last-Update: 2023-01-19
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/python/get-python-config.py Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/bindings/python/get-python-config.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/bindings/python/get-python-config.py --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/bindings/python/get-python-config.py
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/python/get-python-config.py +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/bindings/python/get-python-config.py
@@ -16,6 +16,7 @@ def relpath_nodots(path, base): @@ -16,6 +16,7 @@ def relpath_nodots(path, base):
@ -34,11 +34,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/py
except ValueError: except ValueError:
# Try to fall back to something reasonable if sysconfig's platlib # Try to fall back to something reasonable if sysconfig's platlib
# is outside of sys.prefix # is outside of sys.prefix
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -260,6 +260,7 @@ void ScriptInterpreterPython::ComputePyt @@ -261,6 +261,7 @@ void ScriptInterpreterPython::ComputePyt
// the real python interpreter uses. (e.g. lib for most, lib64 on RHEL // the real python interpreter uses. (e.g. lib for most, lib64 on RHEL
// x86_64, or bin on Windows). // x86_64, or bin on Windows).
llvm::sys::path::remove_filename(path); llvm::sys::path::remove_filename(path);

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc/llvm/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc.orig/llvm/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/llvm/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc/llvm/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/CMakeLists.txt
@@ -904,7 +904,7 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH @@ -932,7 +932,7 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH
if(LLVM_INCLUDE_TESTS) if(LLVM_INCLUDE_TESTS)
# All LLVM Python files should be compatible down to this minimum version. # All LLVM Python files should be compatible down to this minimum version.

View File

@ -24,11 +24,11 @@ Differential Revision: https://reviews.llvm.org/D101773
2 files changed, 33 insertions(+) 2 files changed, 33 insertions(+)
create mode 100644 llvm/test/MC/Mips/mips_lo16.s create mode 100644 llvm/test/MC/Mips/mips_lo16.s
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/MC/ELFObjectWriter.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/lib/MC/ELFObjectWriter.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/MC/ELFObjectWriter.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/llvm/lib/MC/ELFObjectWriter.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/MC/ELFObjectWriter.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/lib/MC/ELFObjectWriter.cpp
@@ -1412,6 +1412,17 @@ bool ELFObjectWriter::shouldRelocateWith @@ -1293,6 +1293,17 @@ bool ELFObjectWriter::shouldRelocateWith
if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS && if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS &&
!hasRelocationAddend()) !hasRelocationAddend())
return true; return true;

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/Mips/MipsSubtarget.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/lib/Target/Mips/MipsSubtarget.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp
+++ llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/Mips/MipsSubtarget.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/lib/Target/Mips/MipsSubtarget.cpp
@@ -81,7 +81,7 @@ MipsSubtarget::MipsSubtarget(const Tripl @@ -81,7 +81,7 @@ MipsSubtarget::MipsSubtarget(const Tripl
InMips16HardFloat(Mips16HardFloat), InMicroMipsMode(false), HasDSP(false), InMips16HardFloat(Mips16HardFloat), InMicroMipsMode(false), HasDSP(false),
HasDSPR2(false), HasDSPR3(false), AllowMixed16_32(Mixed16_32 || Mips_Os16), HasDSPR2(false), HasDSPR3(false), AllowMixed16_32(Mixed16_32 || Mips_Os16),
@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/
// MIPS-I has not been tested. // MIPS-I has not been tested.
if (MipsArchVersion == Mips1 && !MIPS1WarningPrinted) { if (MipsArchVersion == Mips1 && !MIPS1WarningPrinted) {
errs() << "warning: MIPS-I support is experimental\n"; errs() << "warning: MIPS-I support is experimental\n";
@@ -242,6 +245,7 @@ MipsSubtarget & @@ -241,6 +244,7 @@ MipsSubtarget &
MipsSubtarget::initializeSubtargetDependencies(StringRef CPU, StringRef FS, MipsSubtarget::initializeSubtargetDependencies(StringRef CPU, StringRef FS,
const TargetMachine &TM) { const TargetMachine &TM) {
StringRef CPUName = MIPS_MC::selectMipsCPU(TM.getTargetTriple(), CPU); StringRef CPUName = MIPS_MC::selectMipsCPU(TM.getTargetTriple(), CPU);
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/
// Parse features string. // Parse features string.
ParseSubtargetFeatures(CPUName, /*TuneCPU*/ CPUName, FS); ParseSubtargetFeatures(CPUName, /*TuneCPU*/ CPUName, FS);
@@ -264,6 +268,13 @@ MipsSubtarget::initializeSubtargetDepend @@ -263,6 +267,13 @@ MipsSubtarget::initializeSubtargetDepend
report_fatal_error("64-bit code requested on a subtarget that doesn't " report_fatal_error("64-bit code requested on a subtarget that doesn't "
"support it!"); "support it!");

View File

@ -1,11 +1,11 @@
include required runtimes as dependencies to openmp targets to make sure include required runtimes as dependencies to openmp targets to make sure
they are built first when included as part of a runtimes build since openmp they are built first when included as part of a runtimes build since openmp
can depend on them can depend on them
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/runtimes/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/runtimes/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/llvm/runtimes/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/runtimes/CMakeLists.txt
@@ -249,6 +249,7 @@ function(runtime_default_target) @@ -261,6 +261,7 @@ function(runtime_default_target)
-DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR}
-DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS} -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CM
-DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_C_COMPILER_WORKS=ON
-DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON
-DCMAKE_ASM_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON
@@ -625,7 +626,7 @@ if(build_runtimes) @@ -637,7 +638,7 @@ if(build_runtimes)
# build directory cannot find the C++ headers in certain configurations. # build directory cannot find the C++ headers in certain configurations.
# I need to build a mechanism for runtime projects to provide CMake code # I need to build a mechanism for runtime projects to provide CMake code
# that executes at LLVM configuration time to handle this case. # that executes at LLVM configuration time to handle this case.
@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CM
# We need to add the runtimes as a dependency because compiler-rt can be # We need to add the runtimes as a dependency because compiler-rt can be
# built as part of runtimes and we need the profile runtime for PGO # built as part of runtimes and we need the profile runtime for PGO
add_dependencies(clang-bootstrap-deps runtimes) add_dependencies(clang-bootstrap-deps runtimes)
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/CMakeLists.txt
@@ -122,6 +122,28 @@ else() @@ -122,6 +122,28 @@ else()
get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
endif() endif()
@ -55,20 +55,20 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeList
# Build host runtime library, after LIBOMPTARGET variables are set since they are needed # Build host runtime library, after LIBOMPTARGET variables are set since they are needed
# to enable time profiling support in the OpenMP runtime. # to enable time profiling support in the OpenMP runtime.
add_subdirectory(runtime) add_subdirectory(runtime)
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/cuda/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/plugins-nextgen/cuda/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/plugins-nextgen/cuda/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/cuda/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/plugins-nextgen/cuda/CMakeLists.txt
@@ -26,3 +26,5 @@ else() @@ -26,3 +26,5 @@ else()
message(STATUS "Not generating NVIDIA tests, no supported devices detected." message(STATUS "Not generating NVIDIA tests, no supported devices detected."
" Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.")
endif() endif()
+ +
+add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda)
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/src/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/src/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/offload/src/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/src/CMakeLists.txt
@@ -38,6 +38,9 @@ add_llvm_library(omptarget @@ -38,6 +38,9 @@ add_llvm_library(omptarget
NO_INSTALL_RPATH NO_INSTALL_RPATH
BUILDTREE_ONLY BUILDTREE_ONLY
@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMak
target_include_directories(omptarget PRIVATE target_include_directories(omptarget PRIVATE
${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR} ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR}
) )
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/runtime/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/runtime/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/CMakeLists.txt
@@ -326,6 +326,10 @@ if(LIBOMP_STATS) @@ -326,6 +326,10 @@ if(LIBOMP_STATS)
set(LIBOMP_USE_STDCPPLIB TRUE) set(LIBOMP_USE_STDCPPLIB TRUE)
endif() endif()
@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/C
# Shared library can be switched to a static library # Shared library can be switched to a static library
set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL
"Shared library instead of static library?") "Shared library instead of static library?")
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/src/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/src/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/runtime/src/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/runtime/src/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/src/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/src/CMakeLists.txt
@@ -151,6 +151,7 @@ set_source_files_properties(${LIBOMP_ASM @@ -151,6 +151,7 @@ set_source_files_properties(${LIBOMP_ASM
if(NOT ${LIBOMP_USE_STDCPPLIB}) if(NOT ${LIBOMP_USE_STDCPPLIB})
set(LIBOMP_LINKER_LANGUAGE C) set(LIBOMP_LINKER_LANGUAGE C)
@ -115,10 +115,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/s
# Get the library's location within the build tree for the unit tester # Get the library's location within the build tree for the unit tester
if(NOT WIN32) if(NOT WIN32)
get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY) get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY)
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/tools/archer/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/tools/archer/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/tools/archer/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/tools/archer/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/tools/archer/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/tools/archer/CMakeLists.txt
@@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
target_link_libraries(archer ${CMAKE_DL_LIBS}) target_link_libraries(archer ${CMAKE_DL_LIBS})
add_library(archer_static STATIC ompt-tsan.cpp) add_library(archer_static STATIC ompt-tsan.cpp)
@ -129,10 +129,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/tools/arc
install(TARGETS archer archer_static install(TARGETS archer archer_static
LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR})
Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/host/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/plugins-nextgen/host/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/plugins-nextgen/host/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/offload/plugins-nextgen/host/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/host/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/plugins-nextgen/host/CMakeLists.txt
@@ -27,6 +27,8 @@ else() @@ -27,6 +27,8 @@ else()
target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi)
endif() endif()

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/runtime/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/CMakeLists.txt
@@ -411,7 +411,8 @@ else() @@ -419,7 +419,8 @@ else()
set(LIBOMP_INSTALL_KIND ARCHIVE) set(LIBOMP_INSTALL_KIND ARCHIVE)
endif() endif()

View File

@ -2,11 +2,11 @@
clang/bindings/python/clang/cindex.py | 2 +- clang/bindings/python/clang/cindex.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/bindings/python/clang/cindex.py Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/bindings/python/clang/cindex.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/bindings/python/clang/cindex.py --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/bindings/python/clang/cindex.py
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/bindings/python/clang/cindex.py +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/bindings/python/clang/cindex.py
@@ -3980,7 +3980,7 @@ class Config: @@ -4045,7 +4045,7 @@ class Config:
elif name == "Windows": elif name == "Windows":
file = "libclang.dll" file = "libclang.dll"
else: else:

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9/clang/docs/CommandGuide/clang.rst Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/CommandGuide/clang.rst
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9.orig/clang/docs/CommandGuide/clang.rst --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/docs/CommandGuide/clang.rst
+++ llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9/clang/docs/CommandGuide/clang.rst +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/CommandGuide/clang.rst
@@ -354,24 +354,10 @@ Clang fully supports cross compilation a @@ -354,24 +354,10 @@ Clang fully supports cross compilation a
Depending on how your version of Clang is configured, it may have support for a Depending on how your version of Clang is configured, it may have support for a
number of cross compilers, or may only support a native target. number of cross compilers, or may only support a native target.
@ -27,7 +27,7 @@ Index: llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9/clang/docs/Comma
.. option:: --print-supported-cpus .. option:: --print-supported-cpus
Print out a list of supported processors for the given target (specified Print out a list of supported processors for the given target (specified
@@ -721,11 +707,6 @@ ENVIRONMENT @@ -740,11 +726,6 @@ ENVIRONMENT
These environment variables specify additional paths, as for :envvar:`CPATH`, which are These environment variables specify additional paths, as for :envvar:`CPATH`, which are
only used when processing the appropriate language. only used when processing the appropriate language.

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -34,6 +34,11 @@ @@ -34,6 +34,11 @@
# include "sanitizer_symbolizer_libbacktrace.h" # include "sanitizer_symbolizer_libbacktrace.h"
# include "sanitizer_symbolizer_mac.h" # include "sanitizer_symbolizer_mac.h"
@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/
VReport(2, "Using llvm-symbolizer found at: %s\n", found_path); VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
return new(*allocator) LLVMSymbolizer(found_path, allocator); return new(*allocator) LLVMSymbolizer(found_path, allocator);
} }
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/CMakeLists.txt Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/compiler-rt/lib/sanitizer_common/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt --- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/CMakeLists.txt +++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -214,6 +214,7 @@ set(SANITIZER_IMPL_HEADERS @@ -211,6 +211,7 @@ set(SANITIZER_IMPL_HEADERS
) )
include_directories(..) include_directories(..)