rebase of the patches

This commit is contained in:
Sylvestre Ledru 2016-04-10 17:24:22 +00:00
parent 8826de3cce
commit 2dbb8b9ec6
2 changed files with 14 additions and 14 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.9~svn265871/clang/lib/Basic/Targets.cpp Index: llvm-toolchain-snapshot_3.9~svn265903/clang/lib/Basic/Targets.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.9~svn265871.orig/clang/lib/Basic/Targets.cpp --- llvm-toolchain-snapshot_3.9~svn265903.orig/clang/lib/Basic/Targets.cpp
+++ llvm-toolchain-snapshot_3.9~svn265871/clang/lib/Basic/Targets.cpp +++ llvm-toolchain-snapshot_3.9~svn265903/clang/lib/Basic/Targets.cpp
@@ -4021,6 +4021,20 @@ protected: @@ -4041,6 +4041,20 @@ protected:
Builder.defineMacro("__ELF__"); Builder.defineMacro("__ELF__");
} }
@ -21,12 +21,12 @@ Index: llvm-toolchain-snapshot_3.9~svn265871/clang/lib/Basic/Targets.cpp
+ } + }
+ +
public: public:
RTEMSTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) { RTEMSTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
switch (Triple.getArch()) { : OSTargetInfo<Target>(Triple, Opts) {
Index: llvm-toolchain-snapshot_3.9~svn265871/clang/test/CodeGen/linux-arm-atomic.c Index: llvm-toolchain-snapshot_3.9~svn265903/clang/test/CodeGen/linux-arm-atomic.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.9~svn265871.orig/clang/test/CodeGen/linux-arm-atomic.c --- llvm-toolchain-snapshot_3.9~svn265903.orig/clang/test/CodeGen/linux-arm-atomic.c
+++ llvm-toolchain-snapshot_3.9~svn265871/clang/test/CodeGen/linux-arm-atomic.c +++ llvm-toolchain-snapshot_3.9~svn265903/clang/test/CodeGen/linux-arm-atomic.c
@@ -1,5 +1,15 @@ @@ -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=armv7-unknown-linux | FileCheck %s
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.9~svn265871/clang/lib/Basic/Targets.cpp Index: llvm-toolchain-snapshot_3.9~svn265903/clang/lib/Basic/Targets.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.9~svn265871.orig/clang/lib/Basic/Targets.cpp --- llvm-toolchain-snapshot_3.9~svn265903.orig/clang/lib/Basic/Targets.cpp
+++ llvm-toolchain-snapshot_3.9~svn265871/clang/lib/Basic/Targets.cpp +++ llvm-toolchain-snapshot_3.9~svn265903/clang/lib/Basic/Targets.cpp
@@ -4021,33 +4021,6 @@ protected: @@ -4041,33 +4041,6 @@ protected:
Builder.defineMacro("__ELF__"); Builder.defineMacro("__ELF__");
} }
@ -35,4 +35,4 @@ Index: llvm-toolchain-snapshot_3.9~svn265871/clang/lib/Basic/Targets.cpp
- } - }
public: public:
RTEMSTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) { RTEMSTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)