From dd8713fa0e313acfef030a7ca16809c46c68b484 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 7 Apr 2016 14:12:27 +0000 Subject: [PATCH] rebase the patches --- debian/patches/atomic_library_1.diff | 20 +++++++++---------- .../patches/removeduplicatedeclaration.diff | 12 +++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff index 337a2a17..c6b8cc4a 100644 --- a/debian/patches/atomic_library_1.diff +++ b/debian/patches/atomic_library_1.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_3.8~svn249699/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.9~svn265666/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.8~svn249699.orig/clang/lib/Basic/Targets.cpp -+++ llvm-toolchain-snapshot_3.8~svn249699/clang/lib/Basic/Targets.cpp -@@ -4330,6 +4330,20 @@ class ARMTargetInfo : public TargetInfo - } +--- llvm-toolchain-snapshot_3.9~svn265666.orig/clang/lib/Basic/Targets.cpp ++++ llvm-toolchain-snapshot_3.9~svn265666/clang/lib/Basic/Targets.cpp +@@ -4052,6 +4052,20 @@ protected: + Builder.defineMacro("__ELF__"); } + static bool shouldUseInlineAtomic(const llvm::Triple &T) { @@ -21,12 +21,12 @@ Index: llvm-toolchain-snapshot_3.8~svn249699/clang/lib/Basic/Targets.cpp + } + public: - ARMTargetInfo(const llvm::Triple &Triple, bool IsBigEndian) - : TargetInfo(Triple), FPMath(FP_Default), -Index: llvm-toolchain-snapshot_3.8~svn249699/clang/test/CodeGen/linux-arm-atomic.c + RTEMSTargetInfo(const llvm::Triple &Triple, const CodeGenOptions &CGOpts) + : OSTargetInfo(Triple, CGOpts) { +Index: llvm-toolchain-snapshot_3.9~svn265666/clang/test/CodeGen/linux-arm-atomic.c =================================================================== ---- llvm-toolchain-snapshot_3.8~svn249699.orig/clang/test/CodeGen/linux-arm-atomic.c -+++ llvm-toolchain-snapshot_3.8~svn249699/clang/test/CodeGen/linux-arm-atomic.c +--- llvm-toolchain-snapshot_3.9~svn265666.orig/clang/test/CodeGen/linux-arm-atomic.c ++++ llvm-toolchain-snapshot_3.9~svn265666/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 19c733ef..d76638d8 100644 --- a/debian/patches/removeduplicatedeclaration.diff +++ b/debian/patches/removeduplicatedeclaration.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.9~svn265666/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/lib/Basic/Targets.cpp -+++ llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp -@@ -4325,33 +4325,6 @@ class ARMTargetInfo : public TargetInfo - } +--- llvm-toolchain-snapshot_3.9~svn265666.orig/clang/lib/Basic/Targets.cpp ++++ llvm-toolchain-snapshot_3.9~svn265666/clang/lib/Basic/Targets.cpp +@@ -4052,33 +4052,6 @@ protected: + Builder.defineMacro("__ELF__"); } - static bool shouldUseInlineAtomic(const llvm::Triple &T) { @@ -35,4 +35,4 @@ Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp - } public: - ARMTargetInfo(const llvm::Triple &Triple, bool IsBigEndian) + RTEMSTargetInfo(const llvm::Triple &Triple, const CodeGenOptions &CGOpts)