From 2dbb8b9ec60d8535fc4eff7bb28174e1c265e245 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 10 Apr 2016 17:24:22 +0000 Subject: [PATCH] rebase of the patches --- debian/patches/atomic_library_1.diff | 18 +++++++++--------- debian/patches/removeduplicatedeclaration.diff | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff index af7f763d..708c5063 100644 --- a/debian/patches/atomic_library_1.diff +++ b/debian/patches/atomic_library_1.diff @@ -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~svn265871/clang/lib/Basic/Targets.cpp -@@ -4021,6 +4021,20 @@ protected: +--- llvm-toolchain-snapshot_3.9~svn265903.orig/clang/lib/Basic/Targets.cpp ++++ llvm-toolchain-snapshot_3.9~svn265903/clang/lib/Basic/Targets.cpp +@@ -4041,6 +4041,20 @@ protected: Builder.defineMacro("__ELF__"); } @@ -21,12 +21,12 @@ Index: llvm-toolchain-snapshot_3.9~svn265871/clang/lib/Basic/Targets.cpp + } + public: - RTEMSTargetInfo(const llvm::Triple &Triple) : OSTargetInfo(Triple) { - switch (Triple.getArch()) { -Index: llvm-toolchain-snapshot_3.9~svn265871/clang/test/CodeGen/linux-arm-atomic.c + RTEMSTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) + : OSTargetInfo(Triple, Opts) { +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~svn265871/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~svn265903/clang/test/CodeGen/linux-arm-atomic.c @@ -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 diff --git a/debian/patches/removeduplicatedeclaration.diff b/debian/patches/removeduplicatedeclaration.diff index ee0c5709..ec3ec044 100644 --- a/debian/patches/removeduplicatedeclaration.diff +++ b/debian/patches/removeduplicatedeclaration.diff @@ -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~svn265871/clang/lib/Basic/Targets.cpp -@@ -4021,33 +4021,6 @@ protected: +--- llvm-toolchain-snapshot_3.9~svn265903.orig/clang/lib/Basic/Targets.cpp ++++ llvm-toolchain-snapshot_3.9~svn265903/clang/lib/Basic/Targets.cpp +@@ -4041,33 +4041,6 @@ protected: Builder.defineMacro("__ELF__"); } @@ -35,4 +35,4 @@ Index: llvm-toolchain-snapshot_3.9~svn265871/clang/lib/Basic/Targets.cpp - } public: - RTEMSTargetInfo(const llvm::Triple &Triple) : OSTargetInfo(Triple) { + RTEMSTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)