refresh of the patches

This commit is contained in:
Sylvestre Ledru 2014-02-19 08:47:31 +00:00
parent 6b05a64b00
commit c7f296301c
9 changed files with 57 additions and 58 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Basic/Targets.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:20.388719463 -0800
+++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:20.384719463 -0800
@@ -3746,6 +3746,20 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Basic/Targets.cpp 2014-02-03 18:28:04.000000000 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Basic/Targets.cpp 2014-02-19 09:46:27.872584164 +0100
@@ -3765,6 +3765,20 @@
// FIXME: Override "preferred align" for double and long long.
}
@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp
public:
ARMTargetInfo(const llvm::Triple &Triple)
: TargetInfo(Triple), CPU("arm1136j-s"), FPMath(FP_Default),
Index: llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic.c
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/test/CodeGen/linux-arm-atomic.c
===================================================================
--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-01-29 07:46:20.388719463 -0800
+++ llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic.c 2014-01-29 07:46:20.384719463 -0800
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-06-17 22:00:15.000000000 +0200
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/test/CodeGen/linux-arm-atomic.c 2014-02-19 09:46:27.872584164 +0100
@@ -1,5 +1,15 @@
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic.c
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/test/CodeGen/linux-arm-atomic.c
===================================================================
--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-01-29 07:46:27.220719249 -0800
+++ llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic.c 2014-01-29 07:46:27.180719250 -0800
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-02-19 09:46:27.872584164 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/test/CodeGen/linux-arm-atomic.c 2014-02-19 09:46:29.748703000 +0100
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic
typedef int _Atomic_word;
_Atomic_word exchange_and_add(volatile _Atomic_word *__mem, int __val) {
Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Basic/Targets.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:27.220719249 -0800
+++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:27.180719250 -0800
@@ -3755,9 +3755,23 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Basic/Targets.cpp 2014-02-19 09:46:27.872584164 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Basic/Targets.cpp 2014-02-19 09:46:29.748703000 +0100
@@ -3774,9 +3774,23 @@
if (T.getOS() != llvm::Triple::Linux)
return false;
StringRef ArchName = T.getArchName();

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn201231.orig/clang/lib/Driver/ToolChains.cpp 2014-02-12 13:13:12.789835837 +0100
+++ llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp 2014-02-12 13:13:12.789835837 +0100
@@ -1324,11 +1324,13 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:39.989351664 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:43.433569829 +0100
@@ -1322,11 +1322,13 @@
static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" };
static const char *const MIPS64Triples[] = { "mips64-linux-gnu",
@ -18,7 +18,7 @@ Index: llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp
static const char *const PPCLibDirs[] = { "/lib32", "/lib" };
static const char *const PPCTriples[] = {
@@ -2769,6 +2771,14 @@
@@ -2767,6 +2769,14 @@
if (llvm::sys::fs::exists(SysRoot + "/lib/mipsel-linux-gnu"))
return "mipsel-linux-gnu";
return TargetTriple.str();
@ -33,7 +33,7 @@ Index: llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp
case llvm::Triple::ppc:
if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc-linux-gnuspe"))
return "powerpc-linux-gnuspe";
@@ -3122,6 +3132,12 @@
@@ -3120,6 +3130,12 @@
const StringRef MIPSELMultiarchIncludeDirs[] = {
"/usr/include/mipsel-linux-gnu"
};
@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp
const StringRef PPCMultiarchIncludeDirs[] = {
"/usr/include/powerpc-linux-gnu"
};
@@ -3144,6 +3160,10 @@
@@ -3142,6 +3158,10 @@
MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
} else if (getTriple().getArch() == llvm::Triple::mipsel) {
MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:46:36.492718958 -0800
+++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:46:36.448718960 -0800
@@ -2107,6 +2107,8 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:23.400300812 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:35.377059510 +0100
@@ -2326,6 +2326,8 @@
DriverArgs.hasArg(options::OPT_nostdincxx))
return;

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:48:48.964714807 -0800
+++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:48:48.936714808 -0800
@@ -2839,6 +2839,11 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:43.433569829 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:45.621708435 +0100
@@ -3078,6 +3078,11 @@
return;
}

View File

@ -1,23 +1,22 @@
Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Basic/FileManager.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Basic/FileManager.cpp
===================================================================
--- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/Basic/FileManager.cpp 2013-11-26 15:06:44.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Basic/FileManager.cpp 2013-11-27 15:37:41.000000000 +0100
@@ -43,6 +43,11 @@
#if defined(LLVM_ON_UNIX)
#include <limits.h>
#endif
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Basic/FileManager.cpp 2014-02-19 01:10:30.000000000 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Basic/FileManager.cpp 2014-02-19 09:46:19.248037494 +0100
@@ -43,6 +43,10 @@
/// represent a filename that doesn't exist on the disk.
#define NON_EXISTENT_FILE reinterpret_cast<FileEntry*>((intptr_t)-1)
+// For GNU Hurd
+#if defined(__GNU__) && !defined(PATH_MAX)
+# define PATH_MAX 4096
+#endif
+
using namespace clang;
// FIXME: Enhance libsystem to support inode and other fields.
Index: llvm-toolchain-3.4-3.4~+rc1/lldb/include/lldb/lldb-defines.h
class FileManager::UniqueDirContainer {
/// UniqueDirs - Cache from ID's to existing directories/files.
Index: llvm-toolchain-snapshot_3.5~svn201651/lldb/include/lldb/lldb-defines.h
===================================================================
--- llvm-toolchain-3.4-3.4~+rc1.orig/lldb/include/lldb/lldb-defines.h 2013-11-26 15:06:44.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc1/lldb/include/lldb/lldb-defines.h 2013-11-27 15:37:41.000000000 +0100
--- llvm-toolchain-snapshot_3.5~svn201651.orig/lldb/include/lldb/lldb-defines.h 2013-10-18 07:55:24.000000000 +0200
+++ llvm-toolchain-snapshot_3.5~svn201651/lldb/include/lldb/lldb-defines.h 2014-02-19 09:45:50.222199382 +0100
@@ -12,6 +12,11 @@
#include "lldb/lldb-types.h"
@ -30,11 +29,11 @@ Index: llvm-toolchain-3.4-3.4~+rc1/lldb/include/lldb/lldb-defines.h
#if !defined(UINT32_MAX)
#define UINT32_MAX 4294967295U
#endif
Index: llvm-toolchain-3.4-3.4~+rc1/lib/Support/Unix/Path.inc
Index: llvm-toolchain-snapshot_3.5~svn201651/lib/Support/Unix/Path.inc
===================================================================
--- llvm-toolchain-3.4-3.4~+rc1.orig/lib/Support/Unix/Path.inc 2013-10-31 15:35:00.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc1/lib/Support/Unix/Path.inc 2013-11-27 17:31:18.478743021 +0100
@@ -59,6 +59,7 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/lib/Support/Unix/Path.inc 2014-02-13 14:45:45.000000000 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/lib/Support/Unix/Path.inc 2014-02-19 09:45:50.222199382 +0100
@@ -58,6 +58,7 @@
// For GNU Hurd
#if defined(__GNU__) && !defined(PATH_MAX)
# define PATH_MAX 4096

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn201236/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn201236.orig/clang/lib/Driver/ToolChains.cpp 2014-02-12 15:51:58.565602865 +0100
+++ llvm-toolchain-snapshot_3.5~svn201236/clang/lib/Driver/ToolChains.cpp 2014-02-12 15:52:29.329602113 +0100
@@ -3243,7 +3243,7 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:35.377059510 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:39.989351664 +0100
@@ -3241,7 +3241,7 @@
#ifdef __i386__
// clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn201231.orig/clang/lib/Driver/ToolChains.cpp 2014-02-12 13:12:51.069836368 +0100
+++ llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp 2014-02-12 13:12:51.065836368 +0100
@@ -3239,6 +3239,11 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp 2014-02-17 12:12:04.000000000 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:23.400300812 +0100
@@ -3237,6 +3237,11 @@
const Multilib &Multilib = GCCInstallation.getMultilib();
const GCCVersion &Version = GCCInstallation.getVersion();

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Basic/Targets.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:32.840719073 -0800
+++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:32.816719074 -0800
@@ -3746,33 +3746,6 @@
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Basic/Targets.cpp 2014-02-19 09:46:29.748703000 +0100
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Basic/Targets.cpp 2014-02-19 09:46:33.132917392 +0100
@@ -3765,33 +3765,6 @@
// FIXME: Override "preferred align" for double and long long.
}