Fix conflicts

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=50

llvm-2.9.99.git20110605.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6d81b74f0c34343f3a5385bddb96fa2e166dcc36fbb87b25ee37eb0e6221bc6
-size 11763840

llvm-2.9.99.svn20110707.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0b2a8653c9e57d8aa8de0857620536bff174f8067e6f287d55584bb42193404
+size 11961044

llvm.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jul  7 11:37:40 UTC 2011 - idonmez@novell.com
+
+- Enable RTTI support
+- Disable assertions because they are not thread safe
+- Update to r134611
+  * Many C++ fixes and speedups
+  * Updates for AVX instruction support 
+
 -------------------------------------------------------------------
 Sat Jul  2 19:31:38 UTC 2011 - idonmez@novell.com
 

llvm.spec

@@ -17,7 +17,7 @@
 
 
 %define _sharedir        %{_prefix}/share
-%define _revision        132667
+%define _revision        134611
 %define _release_version 3.0
 
 %if 0%{?suse_version} >= 1200
@@ -27,8 +27,8 @@
 %endif
 
 Name:           llvm
-Version:        2.9.99.git20110605
-Release:        1
+Version:        2.9.99.svn20110707
+Release:        0
 License:        NCSA
 Summary:        Low Level Virtual Machine
 Url:            http://www.llvm.org
@@ -149,10 +149,11 @@ ln -s lib lib64
 
 export CC=$TOPLEVEL/stage1/bin/clang
 export CXX=$TOPLEVEL/stage1/bin/clang++
+export CXXFLAGS="%{optflags} -frtti"
 
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-      -DLLVM_ENABLE_ASSERTIONS=TRUE \
+      -DLLVM_ENABLE_ASSERTIONS=FALSE \
       -DLLVM_ENABLE_PIC=TRUE \
       -DLLVM_ENABLE_TIMESTAMPS=FALSE \
       -DLLVM_TARGETS_TO_BUILD=X86 \