From 16a9c5a20bc367694a5d672b0fa16de50632a47f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 20 Jul 2015 20:32:06 +0000 Subject: [PATCH] refresh of the patch --- debian/patches/atomic_library_1.diff | 16 ++++++++-------- debian/patches/removeduplicatedeclaration.diff | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff index 256cf709..ae899064 100644 --- a/debian/patches/atomic_library_1.diff +++ b/debian/patches/atomic_library_1.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/lib/Basic/Targets.cpp 2014-03-29 12:14:58.543982773 +0100 -+++ llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp 2014-03-29 12:14:58.543982773 +0100 -@@ -3843,6 +3843,20 @@ - // FIXME: Override "preferred align" for double and long long. +--- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/lib/Basic/Targets.cpp ++++ llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp +@@ -4325,6 +4325,20 @@ class ARMTargetInfo : public TargetInfo + } } + static bool shouldUseInlineAtomic(const llvm::Triple &T) { @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp public: ARMTargetInfo(const llvm::Triple &Triple, bool IsBigEndian) : TargetInfo(Triple), CPU("arm1136j-s"), FPMath(FP_Default), -Index: llvm-toolchain-snapshot_3.5~svn205090/clang/test/CodeGen/linux-arm-atomic.c +Index: llvm-toolchain-snapshot_3.8~svn242701/clang/test/CodeGen/linux-arm-atomic.c =================================================================== ---- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-03-29 12:14:58.543982773 +0100 -+++ llvm-toolchain-snapshot_3.5~svn205090/clang/test/CodeGen/linux-arm-atomic.c 2014-03-29 12:14:58.543982773 +0100 +--- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/test/CodeGen/linux-arm-atomic.c ++++ llvm-toolchain-snapshot_3.8~svn242701/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 b66d3df7..19c733ef 100644 --- a/debian/patches/removeduplicatedeclaration.diff +++ b/debian/patches/removeduplicatedeclaration.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/lib/Basic/Targets.cpp 2014-03-29 12:15:16.884486206 +0100 -+++ llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp 2014-03-29 12:15:16.884486206 +0100 -@@ -3843,33 +3843,6 @@ - // FIXME: Override "preferred align" for double and long long. +--- 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 + } } - static bool shouldUseInlineAtomic(const llvm::Triple &T) {