rebase of the patches

This commit is contained in:
Sylvestre Ledru 2018-11-17 09:30:02 +01:00
parent 8d271f38a9
commit 7ac1a71237
3 changed files with 16 additions and 17 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_8~svn342269/unittests/Support/Path.cpp Index: llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8~svn342269.orig/unittests/Support/Path.cpp --- llvm-toolchain-snapshot_8~svn347135.orig/unittests/Support/Path.cpp
+++ llvm-toolchain-snapshot_8~svn342269/unittests/Support/Path.cpp +++ llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
@@ -466,7 +466,7 @@ protected: @@ -437,7 +437,7 @@ protected:
sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0"); sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
} }
@ -11,9 +11,9 @@ Index: llvm-toolchain-snapshot_8~svn342269/unittests/Support/Path.cpp
}; };
TEST_F(FileSystemTest, Unique) { TEST_F(FileSystemTest, Unique) {
@@ -546,13 +546,13 @@ TEST_F(FileSystemTest, RealPath) { @@ -519,13 +519,13 @@ TEST_F(FileSystemTest, RealPath) {
SmallString<64> HomeDir; // This can fail if $HOME is not set and getpwuid fails.
bool Result = llvm::sys::path::home_directory(HomeDir); bool Result = llvm::sys::path::home_directory(HomeDir);
- if (Result) { - if (Result) {
+/* if (Result) { +/* if (Result) {

View File

@ -12,19 +12,18 @@ which could then break something else.
This probably should have upstream bug but I couldn't find any existing report. This probably should have upstream bug but I couldn't find any existing report.
Index: llvm-toolchain-snapshot_8.0~svn293998/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp Index: llvm-toolchain-snapshot_8~svn347135/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8.0~svn293998.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp --- llvm-toolchain-snapshot_8~svn347135.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_8.0~svn293998/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ llvm-toolchain-snapshot_8~svn347135/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -32,6 +32,7 @@ @@ -33,13 +33,14 @@
#include "lldb/Utility/StreamString.h" #include "lldb/Utility/StreamString.h"
#include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallString.h"
#include "llvm/Support/ScopedPrinter.h" #include "llvm/Support/ScopedPrinter.h"
+#include "llvm/Config/llvm-config.h" +#include "llvm/Config/llvm-config.h"
// Project includes
#include "ProcessGDBRemoteLog.h" #include "ProcessGDBRemoteLog.h"
@@ -39,7 +40,7 @@
#if defined(__APPLE__) #if defined(__APPLE__)
#define DEBUGSERVER_BASENAME "debugserver" #define DEBUGSERVER_BASENAME "debugserver"
#else #else

View File

@ -1,10 +1,10 @@
Index: llvm-toolchain-snapshot_8~svn345705/test/MC/AMDGPU/hsa.s Index: llvm-toolchain-snapshot_8~svn347135/test/MC/AMDGPU/hsa.s
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_8~svn345705.orig/test/MC/AMDGPU/hsa.s --- llvm-toolchain-snapshot_8~svn347135.orig/test/MC/AMDGPU/hsa.s
+++ llvm-toolchain-snapshot_8~svn345705/test/MC/AMDGPU/hsa.s +++ llvm-toolchain-snapshot_8~svn347135/test/MC/AMDGPU/hsa.s
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
// RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -show-encoding %s | FileCheck %s --check-prefix=ASM // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM
// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF // RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF
+// XFAIL: * +// XFAIL: *
// ELF: Section { // ELF: Section {