From 5e2a96863bdec2770e6dda96e2b52bc64103c85f6ac4044e324463f132afd6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Tue, 10 Dec 2013 09:52:00 +0000
Subject: [PATCH] -

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=319
---
 compiler_rt-r196612.patch | 38 --------------------------------------
 llvm-3.3.93.tar.bz2       |  4 ++--
 llvm.changes              |  6 ++++++
 llvm.spec                 |  3 +--
 4 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 compiler_rt-r196612.patch

diff --git a/compiler_rt-r196612.patch b/compiler_rt-r196612.patch
deleted file mode 100644
index e5e5065..0000000
--- a/compiler_rt-r196612.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp
-===================================================================
---- lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp	(revision 196611)
-+++ lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp	(revision 196612)
-@@ -18,7 +18,7 @@
- 
- #ifdef ADD_I64
-   (void)(uint64_t(10000000000000000000ull) + uint64_t(9000000000000000000ull));
--  // CHECK-ADD_I64: 10000000000000000000 + 9000000000000000000 cannot be represented in type 'unsigned long'
-+  // CHECK-ADD_I64: 10000000000000000000 + 9000000000000000000 cannot be represented in type 'unsigned {{long( long)?}}'
- #endif
- 
- #ifdef ADD_I128
-Index: lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp
-===================================================================
---- lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp	(revision 196611)
-+++ lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp	(revision 196612)
-@@ -17,6 +17,6 @@
-   // ABORT: no-recover.cpp:[[@LINE-2]]:5: runtime error: unsigned integer overflow: 2271560481 + 3989547399 cannot be represented in type 'unsigned int'
- 
-   (void)(uint64_t(10000000000000000000ull) + uint64_t(9000000000000000000ull));
--  // RECOVER: 10000000000000000000 + 9000000000000000000 cannot be represented in type 'unsigned long'
-+  // RECOVER: 10000000000000000000 + 9000000000000000000 cannot be represented in type 'unsigned {{long( long)?}}'
-   // ABORT-NOT: runtime error
- }
-Index: lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp
-===================================================================
---- lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp	(revision 196611)
-+++ lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp	(revision 196612)
-@@ -17,7 +17,7 @@
- 
- #ifdef SUB_I64
-   (void)(uint64_t(8000000000000000000ll) - uint64_t(9000000000000000000ll));
--  // CHECK-SUB_I64: 8000000000000000000 - 9000000000000000000 cannot be represented in type 'unsigned long'
-+  // CHECK-SUB_I64: 8000000000000000000 - 9000000000000000000 cannot be represented in type 'unsigned {{long( long)?}}'
- #endif
- 
- #ifdef SUB_I128
diff --git a/llvm-3.3.93.tar.bz2 b/llvm-3.3.93.tar.bz2
index bfff395..2626bbd 100644
--- a/llvm-3.3.93.tar.bz2
+++ b/llvm-3.3.93.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65bebc09efe3737a6bb601a7bf4ce5b6024100b37bc70b245acd1e978842a37f
-size 27861316
+oid sha256:5046ba1175f271b0f178f69e694baebc9931979da74e78192a3e20755d7a5566
+size 27863933
diff --git a/llvm.changes b/llvm.changes
index 8f1ac99..527515c 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 10 09:48:59 UTC 2013 - idonmez@suse.com
+
+- Update to r196899 from release_34 branch
+- Remove compiler_rt-r196612.patch, merged upstream
+
 -------------------------------------------------------------------
 Mon Dec  9 11:42:44 UTC 2013 - idonmez@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index 48aa051..7e4adfe 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define _revision     196762
+%define _revision     196899
 %define _release_version 3.4
 
 Name:           llvm
@@ -45,7 +45,6 @@ Patch8:         aarch64-suse-support.patch
 Patch9:         arm-remove-xfails.diff
 # PATCH-FIX-OPENSUSE asan-disable-hugemalloctest.patch -- Disable ASAN HugeMallocTest
 Patch10:        asan-disable-hugemalloctest.patch
-Patch11:        compiler_rt-r196612.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake