refresh of all patches

This commit is contained in:
Sylvestre Ledru 2013-11-04 08:48:10 +00:00
parent f36c93e094
commit cf08ce0b44
10 changed files with 49 additions and 49 deletions

View File

@ -1,10 +1,10 @@
Index: llvm-toolchain-snapshot_3.4~svn188990/tools/llvm-shlib/Makefile
Index: llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.4~svn188990.orig/tools/llvm-shlib/Makefile 2013-08-22 09:07:26.632608808 +0200
+++ llvm-toolchain-snapshot_3.4~svn188990/tools/llvm-shlib/Makefile 2013-08-22 09:07:26.624608808 +0200
--- llvm-toolchain-snapshot_3.4~svn193982.orig/tools/llvm-shlib/Makefile 2013-11-04 09:46:03.312667676 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile 2013-11-04 09:46:03.308667675 +0100
@@ -76,7 +76,7 @@
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD GNU))
ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU))
# Add soname to the library.
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions

View File

@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
test/DebugInfo/X86/ending-run.ll | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
Index: llvm-toolchain-snapshot_3.4~svn193603/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
Index: llvm-toolchain-snapshot_3.4~svn193982/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-10-29 12:26:12.986137235 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-10-29 12:26:12.982137234 +0100
@@ -1473,15 +1473,12 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-11-04 09:46:30.604668670 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-11-04 09:46:30.604668670 +0100
@@ -1474,15 +1474,12 @@
if (!MI->isDebugValue()) {
DebugLoc DL = MI->getDebugLoc();
if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
@ -33,10 +33,10 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/lib/CodeGen/AsmPrinter/DwarfDebug.c
if (!DL.isUnknown()) {
const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
Index: llvm-toolchain-snapshot_3.4~svn193603/test/DebugInfo/X86/ending-run.ll
Index: llvm-toolchain-snapshot_3.4~svn193982/test/DebugInfo/X86/ending-run.ll
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/test/DebugInfo/X86/ending-run.ll 2013-10-29 12:26:12.986137235 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/test/DebugInfo/X86/ending-run.ll 2013-10-29 12:26:12.986137235 +0100
--- llvm-toolchain-snapshot_3.4~svn193982.orig/test/DebugInfo/X86/ending-run.ll 2013-11-04 09:46:30.604668670 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/test/DebugInfo/X86/ending-run.ll 2013-11-04 09:46:30.604668670 +0100
@@ -1,11 +1,9 @@
; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:25:51.978136469 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:25:51.978136469 +0100
@@ -2521,6 +2521,11 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:47:04.468669903 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:47:04.464669903 +0100
@@ -2529,6 +2529,11 @@
addSystemInclude(DriverArgs, CC1Args, P.str());
}

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_3.4~svn193603/clang/lib/Driver/Tools.cpp
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/Tools.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Driver/Tools.cpp 2013-10-29 12:25:57.426136669 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/Tools.cpp 2013-10-29 12:26:01.000000000 +0100
@@ -721,7 +721,7 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Driver/Tools.cpp 2013-11-04 09:47:08.640670055 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/Tools.cpp 2013-11-04 09:47:08.636670055 +0100
@@ -741,7 +741,7 @@
FloatABI = "hard";
break;
case llvm::Triple::GNUEABI:

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Basic/Targets.cpp 2013-10-29 12:27:55.278140961 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp 2013-10-29 12:27:55.274140961 +0100
@@ -3667,6 +3667,20 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Basic/Targets.cpp 2013-11-04 09:46:46.696669256 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp 2013-11-04 09:46:46.692669256 +0100
@@ -3679,6 +3679,20 @@
return Version >= 7;
}
@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp
public:
ARMTargetInfo(const llvm::Triple &Triple)
: TargetInfo(Triple), ABI("aapcs-linux"), CPU("arm1136j-s"),
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/test/CodeGen/linux-arm-atomic.c
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/test/CodeGen/linux-arm-atomic.c
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-10-29 12:27:55.278140961 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/test/CodeGen/linux-arm-atomic.c 2013-10-29 12:27:55.278140961 +0100
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-11-04 09:46:46.696669256 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/test/CodeGen/linux-arm-atomic.c 2013-11-04 09:46:46.692669256 +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.4~svn193603/clang/test/CodeGen/linux-arm-atomic.c
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/test/CodeGen/linux-arm-atomic.c
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-10-29 12:27:57.410141039 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/test/CodeGen/linux-arm-atomic.c 2013-10-29 12:27:57.410141039 +0100
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-11-04 09:46:48.988669339 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/test/CodeGen/linux-arm-atomic.c 2013-11-04 09:46:48.988669339 +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.4~svn193603/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.4~svn193603/clang/lib/Basic/Targets.cpp
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Basic/Targets.cpp 2013-10-29 12:27:57.410141039 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp 2013-10-29 12:27:57.410141039 +0100
@@ -3676,9 +3676,23 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Basic/Targets.cpp 2013-11-04 09:46:48.988669339 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp 2013-11-04 09:46:48.988669339 +0100
@@ -3688,9 +3688,23 @@
if (T.getOS() != llvm::Triple::Linux)
return false;
StringRef ArchName = T.getArchName();

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.4~svn192346/lldb/source/Core/Mangled.cpp
Index: llvm-toolchain-snapshot_3.4~svn193982/lldb/source/Core/Mangled.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn192346.orig/lldb/source/Core/Mangled.cpp 2013-10-10 13:38:28.078082548 +0200
+++ llvm-toolchain-snapshot_3.4~svn192346/lldb/source/Core/Mangled.cpp 2013-10-10 13:38:28.070082547 +0200
@@ -25,6 +25,7 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/lldb/source/Core/Mangled.cpp 2013-11-04 09:46:37.000668903 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/lldb/source/Core/Mangled.cpp 2013-11-04 09:46:36.996668902 +0100
@@ -4712,6 +4712,7 @@
#include <ctype.h>
#include <string.h>
#include <stdlib.h>

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:26:35.270138047 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:27:25.930139892 +0100
@@ -2707,6 +2707,12 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:46:43.636669144 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:46:43.636669144 +0100
@@ -2715,6 +2715,12 @@
StringRef BiarchSuffix = GCCInstallation.getBiarchSuffix();
const GCCVersion &Version = GCCInstallation.getVersion();

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/bindings/python/clang/cindex.py
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/bindings/python/clang/cindex.py
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/bindings/python/clang/cindex.py 2013-10-29 12:27:59.218141104 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/bindings/python/clang/cindex.py 2013-10-29 12:27:59.218141104 +0100
@@ -3335,7 +3335,7 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/bindings/python/clang/cindex.py 2013-11-04 09:46:51.136669417 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/bindings/python/clang/cindex.py 2013-11-04 09:46:51.136669417 +0100
@@ -3358,7 +3358,7 @@
elif name == 'Windows':
file = 'libclang.dll'
else:

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Basic/Targets.cpp 2013-10-29 12:28:01.158141175 +0100
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp 2013-10-29 12:28:01.158141175 +0100
@@ -3667,33 +3667,6 @@
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Basic/Targets.cpp 2013-11-04 09:46:53.320669497 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp 2013-11-04 09:46:53.320669497 +0100
@@ -3679,33 +3679,6 @@
return Version >= 7;
}