rebase of the patches

This commit is contained in:
Sylvestre Ledru 2018-09-14 21:56:01 +02:00
parent e07f6265ef
commit ef2e6e0e53
26 changed files with 204 additions and 190 deletions

View File

@ -12,11 +12,11 @@ Partially addresses PR37128
cmake/modules/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 6074e835859..1cf4569b884 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -76,10 +76,10 @@ file(COPY .
Index: llvm-toolchain-snapshot_8~svn342269/cmake/modules/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/cmake/modules/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn342269/cmake/modules/CMakeLists.txt
@@ -82,10 +82,10 @@ file(COPY .
# Generate LLVMConfig.cmake for the install tree.
set(LLVM_CONFIG_CODE "
# Compute the installation prefix from this LLVMConfig.cmake file location.
@ -29,6 +29,3 @@ index 6074e835859..1cf4569b884 100644
foreach(p ${_count})
set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}
get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)")
--
2.17.0

View File

@ -2,11 +2,11 @@
lib/Support/CommandLine.cpp | 4 ++++
1 file changed, 4 insertions(+)
Index: llvm-toolchain-snapshot_5.0~svn296106/lib/Support/CommandLine.cpp
Index: llvm-toolchain-snapshot_8~svn342269/lib/Support/CommandLine.cpp
===================================================================
--- llvm-toolchain-snapshot_5.0~svn296106.orig/lib/Support/CommandLine.cpp
+++ llvm-toolchain-snapshot_5.0~svn296106/lib/Support/CommandLine.cpp
@@ -2064,6 +2064,10 @@ public:
--- llvm-toolchain-snapshot_8~svn342269.orig/lib/Support/CommandLine.cpp
+++ llvm-toolchain-snapshot_8~svn342269/lib/Support/CommandLine.cpp
@@ -2127,6 +2127,10 @@ public:
OS << " " << LLVM_VERSION_INFO;
#endif
OS << "\n ";

View File

@ -7,10 +7,10 @@
clang/test/Sema/warn-strlcpycat-size.c | 55 --------------
6 files changed, 25 insertions(+), 78 deletions(-)
Index: llvm-toolchain-snapshot_8~svn341588/clang/include/clang/Basic/Builtins.def
Index: llvm-toolchain-snapshot_8~svn342269/clang/include/clang/Basic/Builtins.def
===================================================================
--- llvm-toolchain-snapshot_8~svn341588.orig/clang/include/clang/Basic/Builtins.def
+++ llvm-toolchain-snapshot_8~svn341588/clang/include/clang/Basic/Builtins.def
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/include/clang/Basic/Builtins.def
+++ llvm-toolchain-snapshot_8~svn342269/clang/include/clang/Basic/Builtins.def
@@ -517,8 +517,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
@ -33,10 +33,10 @@ Index: llvm-toolchain-snapshot_8~svn341588/clang/include/clang/Basic/Builtins.de
// id objc_msgSend(id, SEL, ...)
LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG)
// long double objc_msgSend_fpret(id self, SEL op, ...)
Index: llvm-toolchain-snapshot_8~svn341588/clang/lib/AST/Decl.cpp
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/AST/Decl.cpp
===================================================================
--- llvm-toolchain-snapshot_8~svn341588.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_8~svn341588/clang/lib/AST/Decl.cpp
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/AST/Decl.cpp
@@ -3639,13 +3639,13 @@ unsigned FunctionDecl::getMemoryFunction
case Builtin::BImemmove:
return Builtin::BImemmove;
@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_8~svn341588/clang/lib/AST/Decl.cpp
case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_8~svn341588/clang/lib/Sema/SemaChecking.cpp
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Sema/SemaChecking.cpp
===================================================================
--- llvm-toolchain-snapshot_8~svn341588.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_8~svn341588/clang/lib/Sema/SemaChecking.cpp
@@ -1237,12 +1237,12 @@ Sema::CheckBuiltinFunctionCall(FunctionD
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Sema/SemaChecking.cpp
@@ -1241,12 +1241,12 @@ Sema::CheckBuiltinFunctionCall(FunctionD
case Builtin::BI__builtin___memset_chk:
SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "memset");
break;
@ -76,7 +76,7 @@ Index: llvm-toolchain-snapshot_8~svn341588/clang/lib/Sema/SemaChecking.cpp
case Builtin::BI__builtin___strncat_chk:
SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "strncat");
break;
@@ -4094,9 +4094,10 @@ bool Sema::CheckFunctionCall(FunctionDec
@@ -4098,9 +4098,10 @@ bool Sema::CheckFunctionCall(FunctionDec
return false;
// Handle memory setting and copying functions.
@ -90,10 +90,10 @@ Index: llvm-toolchain-snapshot_8~svn341588/clang/lib/Sema/SemaChecking.cpp
CheckStrncatArguments(TheCall, FnInfo);
else
CheckMemaccessArguments(TheCall, CMId, FnInfo);
Index: llvm-toolchain-snapshot_8~svn341588/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
===================================================================
--- llvm-toolchain-snapshot_8~svn341588.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_8~svn341588/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
@@ -240,9 +240,9 @@ GenericTaintChecker::TaintPropagationRul
case Builtin::BIstrncpy:
case Builtin::BIstrncat:
@ -107,10 +107,10 @@ Index: llvm-toolchain-snapshot_8~svn341588/clang/lib/StaticAnalyzer/Checkers/Gen
case Builtin::BIstrndup:
return TaintPropagationRule(0, 1, ReturnValueIndex);
Index: llvm-toolchain-snapshot_8~svn341588/clang/test/Sema/builtins.c
Index: llvm-toolchain-snapshot_8~svn342269/clang/test/Sema/builtins.c
===================================================================
--- llvm-toolchain-snapshot_8~svn341588.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_8~svn341588/clang/test/Sema/builtins.c
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_8~svn342269/clang/test/Sema/builtins.c
@@ -190,11 +190,11 @@ void test18() {
ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
@ -156,9 +156,9 @@ Index: llvm-toolchain-snapshot_8~svn341588/clang/test/Sema/builtins.c
}
// rdar://11076881
Index: llvm-toolchain-snapshot_8~svn341588/clang/test/Sema/warn-strlcpycat-size.c
Index: llvm-toolchain-snapshot_8~svn342269/clang/test/Sema/warn-strlcpycat-size.c
===================================================================
--- llvm-toolchain-snapshot_8~svn341588.orig/clang/test/Sema/warn-strlcpycat-size.c
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/test/Sema/warn-strlcpycat-size.c
+++ /dev/null
@@ -1,55 +0,0 @@
-// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s

View File

@ -18,11 +18,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
Index: llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Arch/ARM.cpp
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Arch/ARM.cpp
===================================================================
--- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+++ llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Arch/ARM.cpp
@@ -206,7 +206,7 @@ arm::FloatABI arm::getARMFloatABI(const
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Arch/ARM.cpp
@@ -246,7 +246,7 @@ arm::FloatABI arm::getARMFloatABI(const
case llvm::Triple::MuslEABI:
case llvm::Triple::EABI:
// EABI is always AAPCS, and if it was not marked 'hard', it's softfp

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-7-7~+rc2/lib/Target/PowerPC/PPCISelLowering.cpp
Index: llvm-toolchain-snapshot_8~svn342269/lib/Target/PowerPC/PPCISelLowering.cpp
===================================================================
--- llvm-toolchain-7-7~+rc2.orig/lib/Target/PowerPC/PPCISelLowering.cpp
+++ llvm-toolchain-7-7~+rc2/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -3480,9 +3480,14 @@ SDValue PPCTargetLowering::LowerFormalAr
--- llvm-toolchain-snapshot_8~svn342269.orig/lib/Target/PowerPC/PPCISelLowering.cpp
+++ llvm-toolchain-snapshot_8~svn342269/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -3511,9 +3511,14 @@ SDValue PPCTargetLowering::LowerFormalAr
// Argument stored in memory.
assert(VA.isMemLoc());
@ -19,7 +19,7 @@ Index: llvm-toolchain-7-7~+rc2/lib/Target/PowerPC/PPCISelLowering.cpp
// Create load nodes to retrieve arguments from the stack.
SDValue FIN = DAG.getFrameIndex(FI, PtrVT);
@@ -5437,10 +5442,11 @@ SDValue PPCTargetLowering::LowerCall_32S
@@ -5468,10 +5473,11 @@ SDValue PPCTargetLowering::LowerCall_32S
Arg = PtrOff;
}
@ -34,10 +34,10 @@ Index: llvm-toolchain-7-7~+rc2/lib/Target/PowerPC/PPCISelLowering.cpp
seenFloatArg |= VA.getLocVT().isFloatingPoint();
// Put argument in a physical register.
RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
Index: llvm-toolchain-7-7~+rc2/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
===================================================================
--- /dev/null
+++ llvm-toolchain-7-7~+rc2/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
@@ -0,0 +1,24 @@
+; RUN: llc -verify-machineinstrs < %s -mcpu=ppc32 -mattr=+crbits | FileCheck %s
+target triple = "powerpc-unknown-linux-gnu"

View File

@ -4,9 +4,11 @@
clang/tools/clang-format/clang-format.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -55,7 +55,7 @@ def main():
Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format-diff.py
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format-diff.py
@@ -57,7 +57,7 @@ def main():
parser.add_argument('-style',
help='formatting style to apply (LLVM, Google, Chromium, '
'Mozilla, WebKit)')
@ -15,8 +17,10 @@
help='location of binary to use for clang-format')
args = parser.parse_args()
--- a/clang/tools/clang-format/clang-format.el
+++ b/clang/tools/clang-format/clang-format.el
Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.el
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format.el
+++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.el
@@ -36,7 +36,7 @@
:group 'tools)
@ -26,9 +30,11 @@
"clang-format")
"Location of the clang-format executable.
--- a/clang/tools/clang-format/clang-format.py
+++ b/clang/tools/clang-format/clang-format.py
@@ -35,7 +35,7 @@ import vim
Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.py
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format.py
+++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.py
@@ -36,7 +36,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path.

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_8.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
Index: llvm-toolchain-snapshot_8~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
===================================================================
--- llvm-toolchain-snapshot_8.0~svn309541.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_8.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -157,10 +157,10 @@ def main():
--- llvm-toolchain-snapshot_8~svn342269.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_8~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -179,10 +179,10 @@ def main():
'clang-tidy and clang-apply-replacements in '
'$PATH.')
parser.add_argument('-clang-tidy-binary', metavar='PATH',

View File

@ -2,9 +2,11 @@
lib/Support/Unix/Memory.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/Support/Unix/Memory.inc
+++ b/lib/Support/Unix/Memory.inc
@@ -319,7 +319,7 @@ void Memory::InvalidateInstructionCache(
Index: llvm-toolchain-snapshot_8~svn342269/lib/Support/Unix/Memory.inc
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/lib/Support/Unix/Memory.inc
+++ llvm-toolchain-snapshot_8~svn342269/lib/Support/Unix/Memory.inc
@@ -237,7 +237,7 @@ void Memory::InvalidateInstructionCache(
// FIXME: Can we safely always call this for __GNUC__ everywhere?
const char *Start = static_cast<const char *>(Addr);
const char *End = Start + Len;

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_7~svn334230/unittests/Support/Path.cpp
Index: llvm-toolchain-snapshot_8~svn342269/unittests/Support/Path.cpp
===================================================================
--- llvm-toolchain-snapshot_7~svn334230.orig/unittests/Support/Path.cpp
+++ llvm-toolchain-snapshot_7~svn334230/unittests/Support/Path.cpp
@@ -465,7 +465,7 @@ protected:
--- llvm-toolchain-snapshot_8~svn342269.orig/unittests/Support/Path.cpp
+++ llvm-toolchain-snapshot_8~svn342269/unittests/Support/Path.cpp
@@ -466,7 +466,7 @@ protected:
sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
}
@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_7~svn334230/unittests/Support/Path.cpp
};
TEST_F(FileSystemTest, Unique) {
@@ -545,13 +545,13 @@ TEST_F(FileSystemTest, RealPath) {
@@ -546,13 +546,13 @@ TEST_F(FileSystemTest, RealPath) {
SmallString<64> HomeDir;
bool Result = llvm::sys::path::home_directory(HomeDir);

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.9~svn268880/utils/lit/lit/Test.py
Index: llvm-toolchain-snapshot_8~svn342269/utils/lit/lit/Test.py
===================================================================
--- llvm-toolchain-snapshot_3.9~svn268880.orig/utils/lit/lit/Test.py
+++ llvm-toolchain-snapshot_3.9~svn268880/utils/lit/lit/Test.py
@@ -30,7 +30,7 @@ PASS = ResultCode('PASS', False)
--- llvm-toolchain-snapshot_8~svn342269.orig/utils/lit/lit/Test.py
+++ llvm-toolchain-snapshot_8~svn342269/utils/lit/lit/Test.py
@@ -32,7 +32,7 @@ PASS = ResultCode('PASS', False)
FLAKYPASS = ResultCode('FLAKYPASS', False)
XFAIL = ResultCode('XFAIL', False)
FAIL = ResultCode('FAIL', True)

View File

@ -2,10 +2,10 @@
clang/lib/Driver/ToolChains.cpp | 2 ++
1 file changed, 2 insertions(+)
Index: llvm-toolchain-snapshot_7~svn329789/clang/lib/Driver/ToolChains/Gnu.cpp
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Gnu.cpp
===================================================================
--- llvm-toolchain-snapshot_7~svn329789.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-snapshot_7~svn329789/clang/lib/Driver/ToolChains/Gnu.cpp
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -17,6 +17,7 @@
#include "CommonArgs.h"
#include "Linux.h"
@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_7~svn329789/clang/lib/Driver/ToolChains/Gnu.cpp
#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
@@ -2399,6 +2400,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
@@ -2437,6 +2438,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
addLibStdCxxIncludePaths(DriverArgs, CC1Args);
break;
}

View File

@ -2,11 +2,11 @@
tools/llvm-config/llvm-config.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-config/llvm-config.cpp
Index: llvm-toolchain-snapshot_8~svn342269/tools/llvm-config/llvm-config.cpp
===================================================================
--- llvm-toolchain-snapshot_5.0~svn298810.orig/tools/llvm-config/llvm-config.cpp
+++ llvm-toolchain-snapshot_5.0~svn298810/tools/llvm-config/llvm-config.cpp
@@ -555,9 +555,9 @@ int main(int argc, char **argv) {
--- llvm-toolchain-snapshot_8~svn342269.orig/tools/llvm-config/llvm-config.cpp
+++ llvm-toolchain-snapshot_8~svn342269/tools/llvm-config/llvm-config.cpp
@@ -558,9 +558,9 @@ int main(int argc, char **argv) {
} else if (Arg == "--shared-mode") {
PrintSharedMode = true;
} else if (Arg == "--obj-root") {

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_6.0~svn317126/clang/lib/Basic/FileManager.cpp
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Basic/FileManager.cpp
===================================================================
--- llvm-toolchain-snapshot_6.0~svn317126.orig/clang/lib/Basic/FileManager.cpp
+++ llvm-toolchain-snapshot_6.0~svn317126/clang/lib/Basic/FileManager.cpp
@@ -501,6 +501,12 @@ void FileManager::invalidateCache(const
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Basic/FileManager.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Basic/FileManager.cpp
@@ -511,6 +511,12 @@ void FileManager::invalidateCache(const
UniqueRealFiles.erase(Entry->getUniqueID());
}
@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/clang/lib/Basic/FileManager.cpp
void FileManager::GetUniqueIDMapping(
SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
UIDToFiles.clear();
Index: llvm-toolchain-snapshot_6.0~svn317126/lldb/include/lldb/lldb-defines.h
Index: llvm-toolchain-snapshot_8~svn342269/lldb/include/lldb/lldb-defines.h
===================================================================
--- llvm-toolchain-snapshot_6.0~svn317126.orig/lldb/include/lldb/lldb-defines.h
+++ llvm-toolchain-snapshot_6.0~svn317126/lldb/include/lldb/lldb-defines.h
--- llvm-toolchain-snapshot_8~svn342269.orig/lldb/include/lldb/lldb-defines.h
+++ llvm-toolchain-snapshot_8~svn342269/lldb/include/lldb/lldb-defines.h
@@ -28,6 +28,11 @@
#define INT32_MAX 2147483647
#endif
@ -31,11 +31,11 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/lldb/include/lldb/lldb-defines.h
#if !defined(UINT32_MAX)
#define UINT32_MAX 4294967295U
#endif
Index: llvm-toolchain-snapshot_6.0~svn317126/lib/Support/Unix/Path.inc
Index: llvm-toolchain-snapshot_8~svn342269/lib/Support/Unix/Path.inc
===================================================================
--- llvm-toolchain-snapshot_6.0~svn317126.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot_6.0~svn317126/lib/Support/Unix/Path.inc
@@ -64,6 +64,7 @@
--- llvm-toolchain-snapshot_8~svn342269.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot_8~svn342269/lib/Support/Unix/Path.inc
@@ -49,6 +49,7 @@
// For GNU Hurd
#if defined(__GNU__) && !defined(PATH_MAX)
# define PATH_MAX 4096
@ -43,11 +43,11 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/lib/Support/Unix/Path.inc
#endif
#include <sys/types.h>
Index: llvm-toolchain-snapshot_6.0~svn317126/tools/dsymutil/DwarfLinker.cpp
Index: llvm-toolchain-snapshot_8~svn342269/tools/dsymutil/DwarfLinker.cpp
===================================================================
--- llvm-toolchain-snapshot_6.0~svn317126.orig/tools/dsymutil/DwarfLinker.cpp
+++ llvm-toolchain-snapshot_6.0~svn317126/tools/dsymutil/DwarfLinker.cpp
@@ -93,6 +93,11 @@
--- llvm-toolchain-snapshot_8~svn342269.orig/tools/dsymutil/DwarfLinker.cpp
+++ llvm-toolchain-snapshot_8~svn342269/tools/dsymutil/DwarfLinker.cpp
@@ -100,6 +100,11 @@
#include <utility>
#include <vector>
@ -59,10 +59,10 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/tools/dsymutil/DwarfLinker.cpp
namespace llvm {
namespace dsymutil {
Index: llvm-toolchain-snapshot_6.0~svn317126/polly/lib/External/ppcg/cuda_common.c
Index: llvm-toolchain-snapshot_8~svn342269/polly/lib/External/ppcg/cuda_common.c
===================================================================
--- llvm-toolchain-snapshot_6.0~svn317126.orig/polly/lib/External/ppcg/cuda_common.c
+++ llvm-toolchain-snapshot_6.0~svn317126/polly/lib/External/ppcg/cuda_common.c
--- llvm-toolchain-snapshot_8~svn342269.orig/polly/lib/External/ppcg/cuda_common.c
+++ llvm-toolchain-snapshot_8~svn342269/polly/lib/External/ppcg/cuda_common.c
@@ -15,6 +15,11 @@
#include "cuda_common.h"
#include "ppcg.h"

View File

@ -7,11 +7,11 @@ sure their ABI stays in sync.
No known upstream bug about this.
Index: llvm-toolchain-snapshot_7svn337372/libcxxabi/src/cxa_exception.cpp
Index: llvm-toolchain-snapshot_8~svn342269/libcxxabi/src/cxa_exception.cpp
===================================================================
--- llvm-toolchain-snapshot_7svn337372.orig/libcxxabi/src/cxa_exception.cpp
+++ llvm-toolchain-snapshot_7svn337372/libcxxabi/src/cxa_exception.cpp
@@ -261,15 +261,16 @@ __cxa_throw(void *thrown_object, std::ty
--- llvm-toolchain-snapshot_8~svn342269.orig/libcxxabi/src/cxa_exception.cpp
+++ llvm-toolchain-snapshot_8~svn342269/libcxxabi/src/cxa_exception.cpp
@@ -262,15 +262,16 @@ __cxa_throw(void *thrown_object, std::ty
#ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
@ -30,7 +30,7 @@ Index: llvm-toolchain-snapshot_7svn337372/libcxxabi/src/cxa_exception.cpp
// 2.5.3 Exception Handlers
/*
The adjusted pointer is computed by the personality routine during phase 1
@@ -532,7 +533,11 @@ void __cxa_end_catch() {
@@ -533,7 +534,11 @@ void __cxa_end_catch() {
// to touch a foreign exception in any way, that is undefined
// behavior. They likely can't since the only way to catch
// a foreign exception is with catch (...)!
@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_7svn337372/libcxxabi/src/cxa_exception.cpp
globals->caughtExceptions = 0;
}
}
@@ -589,8 +594,10 @@ void __cxa_rethrow() {
@@ -590,8 +595,10 @@ void __cxa_rethrow() {
}
#ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
@ -54,7 +54,7 @@ Index: llvm-toolchain-snapshot_7svn337372/libcxxabi/src/cxa_exception.cpp
#endif
// If we get here, some kind of unwinding error has occurred.
@@ -714,8 +721,10 @@ __cxa_rethrow_primary_exception(void* th
@@ -715,8 +722,10 @@ __cxa_rethrow_primary_exception(void* th
dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup;
#ifdef __USING_SJLJ_EXCEPTIONS__
_Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader);
@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_7svn337372/libcxxabi/src/cxa_exception.cpp
#endif
// Some sort of unwinding error. Note that terminate is a handler.
__cxa_begin_catch(&dep_exception_header->unwindHeader);
Index: llvm-toolchain-snapshot_7svn337372/libcxxabi/src/cxa_exception.hpp
Index: llvm-toolchain-snapshot_8~svn342269/libcxxabi/src/cxa_exception.hpp
===================================================================
--- llvm-toolchain-snapshot_7svn337372.orig/libcxxabi/src/cxa_exception.hpp
+++ llvm-toolchain-snapshot_7svn337372/libcxxabi/src/cxa_exception.hpp
--- llvm-toolchain-snapshot_8~svn342269.orig/libcxxabi/src/cxa_exception.hpp
+++ llvm-toolchain-snapshot_8~svn342269/libcxxabi/src/cxa_exception.hpp
@@ -24,6 +24,45 @@ static const uint64_t kOurExceptionClass
static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; // CLNGC++\1
static const uint64_t get_vendor_and_language = 0xFFFFFFFFFFFFFF00; // mask for CLNGC++

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
incorrect test from running.
Index: llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/test_demangle.pass.cpp
Index: llvm-toolchain-snapshot_8~svn342269/libcxxabi/test/test_demangle.pass.cpp
===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/libcxxabi/test/test_demangle.pass.cpp
+++ llvm-toolchain-snapshot_7~svn337372svn337372/libcxxabi/test/test_demangle.pass.cpp
@@ -29648,7 +29648,7 @@ const char* invalid_cases[] =
--- llvm-toolchain-snapshot_8~svn342269.orig/libcxxabi/test/test_demangle.pass.cpp
+++ llvm-toolchain-snapshot_8~svn342269/libcxxabi/test/test_demangle.pass.cpp
@@ -29797,7 +29797,7 @@ const char* invalid_cases[] =
"NSoERj5E=Y1[uM:ga",
"Aon_PmKVPDk7?fg4XP5smMUL6;<WsI_mgbf23cCgsHbT<l8EE\0uVRkNOoXDrgdA4[8IU>Vl<>IL8ayHpiVDDDXTY;^o9;i",
"_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_",

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_6.0~svn319966/lldb/tools/argdumper/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn342269/lldb/tools/argdumper/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_6.0~svn319966.orig/lldb/tools/argdumper/CMakeLists.txt
+++ llvm-toolchain-snapshot_6.0~svn319966/lldb/tools/argdumper/CMakeLists.txt
--- llvm-toolchain-snapshot_8~svn342269.orig/lldb/tools/argdumper/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn342269/lldb/tools/argdumper/CMakeLists.txt
@@ -4,3 +4,7 @@ add_lldb_tool(lldb-argdumper INCLUDE_IN_
LINK_LIBS
lldbUtility
@ -10,11 +10,11 @@ Index: llvm-toolchain-snapshot_6.0~svn319966/lldb/tools/argdumper/CMakeLists.txt
+install(TARGETS lldb-argdumper
+ RUNTIME DESTINATION bin)
+
Index: llvm-toolchain-snapshot_6.0~svn319966/lldb/tools/lldb-server/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn342269/lldb/tools/lldb-server/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_6.0~svn319966.orig/lldb/tools/lldb-server/CMakeLists.txt
+++ llvm-toolchain-snapshot_6.0~svn319966/lldb/tools/lldb-server/CMakeLists.txt
@@ -55,3 +55,7 @@ add_lldb_tool(lldb-server INCLUDE_IN_FRA
--- llvm-toolchain-snapshot_8~svn342269.orig/lldb/tools/lldb-server/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn342269/lldb/tools/lldb-server/CMakeLists.txt
@@ -64,3 +64,7 @@ add_lldb_tool(lldb-server INCLUDE_IN_SUI
)
target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})

View File

@ -2,10 +2,10 @@
lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_8~svn339515/lldb/source/API/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn342269/lldb/source/API/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_8~svn339515.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn339515/lldb/source/API/CMakeLists.txt
--- llvm-toolchain-snapshot_8~svn342269.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn342269/lldb/source/API/CMakeLists.txt
@@ -4,7 +4,12 @@ endif()
get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS)
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_8~svn339515/lldb/source/API/CMakeLists.txt
)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -141,11 +141,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
@@ -136,11 +141,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
if (MSVC AND NOT LLDB_DISABLE_PYTHON)
target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
endif()

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Arch/Mips.cpp
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Arch/Mips.cpp
===================================================================
--- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+++ llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Arch/Mips.cpp
@@ -368,10 +368,10 @@ bool mips::isFP64ADefault(const llvm::Tr
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Arch/Mips.cpp
@@ -449,10 +449,10 @@ bool mips::isFP64ADefault(const llvm::Tr
bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
StringRef ABIName, mips::FloatABI FloatABI) {

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_7~svn335949/openmp/runtime/src/kmp_affinity.h
Index: llvm-toolchain-snapshot_8~svn342269/openmp/runtime/src/kmp_affinity.h
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/openmp/runtime/src/kmp_affinity.h
+++ llvm-toolchain-snapshot_7~svn335949/openmp/runtime/src/kmp_affinity.h
@@ -212,28 +212,29 @@ public:
--- llvm-toolchain-snapshot_8~svn342269.orig/openmp/runtime/src/kmp_affinity.h
+++ llvm-toolchain-snapshot_8~svn342269/openmp/runtime/src/kmp_affinity.h
@@ -211,28 +211,29 @@ public:
#elif __NR_sched_getaffinity != 223
#error Wrong code for getaffinity system call.
#endif /* __NR_sched_getaffinity */

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_7~svn335949/openmp/runtime/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn342269/openmp/runtime/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/openmp/runtime/CMakeLists.txt
+++ llvm-toolchain-snapshot_7~svn335949/openmp/runtime/CMakeLists.txt
@@ -357,7 +357,8 @@ else()
--- llvm-toolchain-snapshot_8~svn342269.orig/openmp/runtime/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn342269/openmp/runtime/CMakeLists.txt
@@ -355,7 +355,8 @@ else()
set(LIBOMP_INSTALL_KIND ARCHIVE)
endif()

View File

@ -2,9 +2,11 @@
clang/bindings/python/clang/cindex.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/clang/bindings/python/clang/cindex.py
+++ b/clang/bindings/python/clang/cindex.py
@@ -3851,7 +3851,7 @@ class Config:
Index: llvm-toolchain-snapshot_8~svn342269/clang/bindings/python/clang/cindex.py
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/bindings/python/clang/cindex.py
+++ llvm-toolchain-snapshot_8~svn342269/clang/bindings/python/clang/cindex.py
@@ -4144,7 +4144,7 @@ class Config:
elif name == 'Windows':
file = 'libclang.dll'
else:

View File

@ -2,9 +2,11 @@
clang/tools/scan-build/bin/scan-build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/clang/tools/scan-build/bin/scan-build
+++ b/clang/tools/scan-build/bin/scan-build
@@ -1432,7 +1432,7 @@ sub FindClang {
Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/scan-build/bin/scan-build
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/scan-build/bin/scan-build
+++ llvm-toolchain-snapshot_8~svn342269/clang/tools/scan-build/bin/scan-build
@@ -1442,7 +1442,7 @@ sub FindClang {
if (!defined $Options{AnalyzerDiscoveryMethod}) {
$Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
if (!defined $Clang || ! -x $Clang) {

View File

@ -52,7 +52,6 @@ remove-test-freezing.diff
0048-Set-html_static_path-_static-everywhere.patch
0049-Use-Debian-provided-MathJax-everywhere.patch
impl-path-hurd.diff
powerpcspe-add-missing-include-path.diff
x32-fix-driver-search-paths.diff
# OpenMP

View File

@ -15,10 +15,10 @@
test/tools/gold/X86/visibility.ll | 1 +
14 files changed, 19 insertions(+), 2 deletions(-)
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/common_thinlto.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/common_thinlto.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/common_thinlto.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/common_thinlto.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/common_thinlto.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/common_thinlto.ll
@@ -17,6 +17,7 @@
; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM
@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/common_thinlto.ll
source_filename = "common1.c"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/emit-llvm.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/emit-llvm.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/emit-llvm.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/emit-llvm.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/emit-llvm.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/emit-llvm.ll
@@ -21,6 +21,8 @@
; RUN: not test -a %t4.o
@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/emit-llvm.ll
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/parallel.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/parallel.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/parallel.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/parallel.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/parallel.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/parallel.ll
@@ -5,6 +5,7 @@
; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s
; RUN: llvm-nm %t.o | FileCheck --check-prefix=CHECK0 %s
@ -52,10 +52,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/parallel.ll
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/pr19901_thinlto.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/pr19901_thinlto.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/pr19901_thinlto.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/pr19901_thinlto.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/pr19901_thinlto.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/pr19901_thinlto.ll
@@ -4,6 +4,7 @@
; RUN: --plugin-opt=thinlto \
; RUN: -shared -m elf_x86_64 -o %t.so %t2.o %t.o
@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/pr19901_thinlto.l
; CHECK: Symbol {
; CHECK: Name: f
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/slp-vectorize.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/slp-vectorize.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/slp-vectorize.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/slp-vectorize.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/slp-vectorize.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/slp-vectorize.ll
@@ -7,6 +7,7 @@
; test that the vectorizer is run.
@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/slp-vectorize.ll
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/strip_names.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/strip_names.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/strip_names.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/strip_names.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/strip_names.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/strip_names.ll
@@ -25,6 +25,7 @@
; NONAME: %2 = load i32, i32* @GlobalValueName
; NONAME: %3 = add i32 %0, %2
@ -88,11 +88,11 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/strip_names.ll
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/thinlto.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto.ll
@@ -127,6 +127,8 @@
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/thinlto.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto.ll
@@ -140,6 +140,8 @@
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@ -101,10 +101,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto.ll
declare void @g(...)
define void @f() {
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_archive.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto_archive.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/thinlto_archive.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_archive.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/thinlto_archive.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto_archive.ll
@@ -15,6 +15,7 @@
; RUN: --plugin-opt=jobs=1 \
; RUN: -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s
@ -113,10 +113,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_archive.l
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_internalize.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto_internalize.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/thinlto_internalize.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_internalize.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/thinlto_internalize.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto_internalize.ll
@@ -14,6 +14,8 @@
; h() should be internalized after promotion, and eliminated after inlining
; CHECK-NOT: @h.llvm.
@ -126,10 +126,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_internali
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @g() {
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_linkonceresolution.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto_linkonceresolution.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_linkonceresolution.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto_linkonceresolution.ll
@@ -23,6 +23,8 @@
; OPT-NOT: @f()
; OPT2: define weak_odr hidden void @f()
@ -139,10 +139,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_linkoncer
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @g() {
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_weak_resolution.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto_weak_resolution.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/thinlto_weak_resolution.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_weak_resolution.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/thinlto_weak_resolution.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/thinlto_weak_resolution.ll
@@ -9,6 +9,7 @@
; RUN: --plugin-opt=save-temps \
; RUN: -shared \
@ -151,10 +151,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/thinlto_weak_reso
; RUN: llvm-nm %t3.o | FileCheck %s
; CHECK: weakfunc
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/type-merge2.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/type-merge2.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/type-merge2.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/type-merge2.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/type-merge2.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/type-merge2.ll
@@ -6,6 +6,8 @@
; RUN: -shared %t.o %t2.o -o %t3.o
; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s
@ -164,10 +164,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/type-merge2.ll
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/vectorize.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/vectorize.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/vectorize.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/vectorize.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/vectorize.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/vectorize.ll
@@ -7,6 +7,7 @@
; test that the vectorizer is run.
@ -176,10 +176,10 @@ Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/vectorize.ll
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/visibility.ll
Index: llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/visibility.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn322880.orig/test/tools/gold/X86/visibility.ll
+++ llvm-toolchain-snapshot_7~svn322880/test/tools/gold/X86/visibility.ll
--- llvm-toolchain-snapshot_8~svn342269.orig/test/tools/gold/X86/visibility.ll
+++ llvm-toolchain-snapshot_8~svn342269/test/tools/gold/X86/visibility.ll
@@ -16,6 +16,7 @@
; CHECK-NEXT: Other [
; CHECK-NEXT: STV_PROTECTED

View File

@ -8,8 +8,10 @@
clang/lib/Headers/unwind.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- a/clang/lib/Headers/unwind.h
+++ b/clang/lib/Headers/unwind.h
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Headers/unwind.h
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Headers/unwind.h
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Headers/unwind.h
@@ -23,9 +23,6 @@
/* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
@ -30,7 +32,7 @@
#include <stdint.h>
#ifdef __cplusplus
@@ -294,6 +294,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc
@@ -336,6 +336,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc
}
#endif

View File

@ -3,9 +3,11 @@ Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Forwarded: https://reviews.llvm.org/D52050
Last-Update: 2018-09-14
--- llvm-toolchain-7-7~+rc3.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-7-7~+rc3/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -1837,7 +1837,10 @@ void Generic_GCC::GCCInstallationDetecto
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Gnu.cpp
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -1830,7 +1830,10 @@ void Generic_GCC::GCCInstallationDetecto
"x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
"x86_64-slackware-linux", "x86_64-unknown-linux",
"x86_64-amazon-linux"};
@ -17,7 +19,7 @@ Last-Update: 2018-09-14
static const char *const X86LibDirs[] = {"/lib32", "/lib"};
static const char *const X86Triples[] = {
"i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu",
@@ -2031,14 +2034,16 @@ void Generic_GCC::GCCInstallationDetecto
@@ -2024,14 +2027,16 @@ void Generic_GCC::GCCInstallationDetecto
}
break;
case llvm::Triple::x86_64:
@ -37,8 +39,10 @@ Last-Update: 2018-09-14
BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
BiarchTripleAliases.append(begin(X86Triples), end(X86Triples));
}
--- llvm-toolchain-7-7~+rc3.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-7-7~+rc3/clang/lib/Driver/ToolChains/Linux.cpp
Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Linux.cpp
===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Driver/ToolChains/Linux.cpp
@@ -86,10 +86,13 @@ static std::string getMultiarchTriple(co
case llvm::Triple::x86_64:
if (IsAndroid)
@ -57,7 +61,7 @@ Last-Update: 2018-09-14
break;
case llvm::Triple::aarch64:
if (IsAndroid)
@@ -673,6 +676,8 @@ void Linux::AddClangSystemIncludeArgs(co
@@ -672,6 +675,8 @@ void Linux::AddClangSystemIncludeArgs(co
// in use in any released version of Debian, so we should consider
// removing them.
"/usr/include/i686-linux-gnu/64", "/usr/include/i486-linux-gnu/64"};
@ -66,7 +70,7 @@ Last-Update: 2018-09-14
const StringRef X86MultiarchIncludeDirs[] = {
"/usr/include/i386-linux-gnu",
@@ -715,7 +720,10 @@ void Linux::AddClangSystemIncludeArgs(co
@@ -714,7 +719,10 @@ void Linux::AddClangSystemIncludeArgs(co
ArrayRef<StringRef> MultiarchIncludeDirs;
switch (getTriple().getArch()) {
case llvm::Triple::x86_64: