- Update to r196487 from release_34 branch to get compiler_rt fixes
- Depend on glibc-devel-32bit on x86 to fix test-suite failures - Ship cmake files for llvm (needed for lldb and such) OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=313
This commit is contained in:
parent
19733f4c44
commit
519f6712cb
@ -1,29 +0,0 @@
|
|||||||
Index: llvm/projects/compiler-rt/lib/asan/tests/asan_test.cc
|
|
||||||
===================================================================
|
|
||||||
--- llvm.orig/projects/compiler-rt/lib/asan/tests/asan_test.cc
|
|
||||||
+++ llvm/projects/compiler-rt/lib/asan/tests/asan_test.cc
|
|
||||||
@@ -669,7 +669,8 @@ TEST(AddressSanitizer, ThreadStackReuseT
|
|
||||||
PTHREAD_JOIN(t, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if defined(__i386__) || defined(__x86_64__)
|
|
||||||
+#if defined(__i686__) || defined(__x86_64__)
|
|
||||||
+#include <emmintrin.h>
|
|
||||||
TEST(AddressSanitizer, Store128Test) {
|
|
||||||
char *a = Ident((char*)malloc(Ident(12)));
|
|
||||||
char *p = a;
|
|
||||||
Index: llvm/projects/compiler-rt/lib/asan/tests/asan_test_utils.h
|
|
||||||
===================================================================
|
|
||||||
--- llvm.orig/projects/compiler-rt/lib/asan/tests/asan_test_utils.h
|
|
||||||
+++ llvm/projects/compiler-rt/lib/asan/tests/asan_test_utils.h
|
|
||||||
@@ -41,10 +41,6 @@
|
|
||||||
#include <unistd.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if defined(__i386__) || defined(__x86_64__)
|
|
||||||
-#include <emmintrin.h>
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#ifndef __APPLE__
|
|
||||||
#include <malloc.h>
|
|
||||||
#endif
|
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:9f31958526087b06cc6ddc5b25ae33792588af959ec2c648459583f346a5a616
|
oid sha256:a21a552977dd4eee5c813d316e75d7ab8652c782feee25565a4e35a6eef2de05
|
||||||
size 27881010
|
size 27881773
|
||||||
|
11
llvm.changes
11
llvm.changes
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 5 08:31:52 UTC 2013 - idonmez@suse.com
|
||||||
|
|
||||||
|
- Update to r196487 from release_34 branch to get compiler_rt fixes
|
||||||
|
- Depend on glibc-devel-32bit on x86 to fix test-suite failures
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 4 13:33:55 UTC 2013 - idonmez@suse.com
|
||||||
|
|
||||||
|
- Ship cmake files for llvm (needed for lldb and such)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 4 10:07:59 UTC 2013 - idonmez@suse.com
|
Wed Dec 4 10:07:59 UTC 2013 - idonmez@suse.com
|
||||||
|
|
||||||
|
12
llvm.spec
12
llvm.spec
@ -16,7 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define _revision 196371
|
%define _revision 196487
|
||||||
%define _release_version 3.4
|
%define _release_version 3.4
|
||||||
|
|
||||||
Name: llvm
|
Name: llvm
|
||||||
@ -45,7 +45,6 @@ Patch8: aarch64-suse-support.patch
|
|||||||
Patch9: arm-remove-xfails.diff
|
Patch9: arm-remove-xfails.diff
|
||||||
# PATCH-FIX-OPENSUSE asan-disable-hugemalloctest.patch -- Disable ASAN HugeMallocTest
|
# PATCH-FIX-OPENSUSE asan-disable-hugemalloctest.patch -- Disable ASAN HugeMallocTest
|
||||||
Patch10: asan-disable-hugemalloctest.patch
|
Patch10: asan-disable-hugemalloctest.patch
|
||||||
Patch11: asan-sse2.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -64,6 +63,10 @@ BuildRequires: groff
|
|||||||
BuildRequires: libffi-devel
|
BuildRequires: libffi-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: python-base
|
BuildRequires: python-base
|
||||||
|
%ifarch %{ix86}
|
||||||
|
# Needed for compiler_rt tests
|
||||||
|
BuildRequires: glibc-devel-32bit
|
||||||
|
%endif
|
||||||
Requires: libLLVM = %{version}-%{release}
|
Requires: libLLVM = %{version}-%{release}
|
||||||
# llvm does not work on ppc, only ppc64
|
# llvm does not work on ppc, only ppc64
|
||||||
ExcludeArch: ppc
|
ExcludeArch: ppc
|
||||||
@ -164,7 +167,6 @@ This package contains the Python bindings to clang (C language) frontend for LLV
|
|||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
%patch9
|
%patch9
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch11 -p1
|
|
||||||
|
|
||||||
# We hardcode i586
|
# We hardcode i586
|
||||||
rm tools/clang/test/Driver/x86_features.c
|
rm tools/clang/test/Driver/x86_features.c
|
||||||
@ -396,9 +398,6 @@ rm %{buildroot}%{_libdir}/LLVMHello.*
|
|||||||
rm %{buildroot}%{_libdir}/libgtest*
|
rm %{buildroot}%{_libdir}/libgtest*
|
||||||
rm %{buildroot}%{_mandir}/man1/lit.1
|
rm %{buildroot}%{_mandir}/man1/lit.1
|
||||||
|
|
||||||
# Remove cmake files
|
|
||||||
rm -rf %{buildroot}/usr/share/llvm/cmake
|
|
||||||
|
|
||||||
%fdupes -s %{buildroot}%{_docdir}/%{name}
|
%fdupes -s %{buildroot}%{_docdir}/%{name}
|
||||||
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc
|
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc
|
||||||
|
|
||||||
@ -483,6 +482,7 @@ rm -rf %{buildroot}/usr/share/llvm/cmake
|
|||||||
%doc %{_mandir}/man1/%{name}-config.1%{ext_man}
|
%doc %{_mandir}/man1/%{name}-config.1%{ext_man}
|
||||||
%{_includedir}/%{name}/
|
%{_includedir}/%{name}/
|
||||||
%{_includedir}/%{name}-c/
|
%{_includedir}/%{name}-c/
|
||||||
|
%{_datadir}/%{name}/cmake/
|
||||||
%doc %{_docdir}/%{name}
|
%doc %{_docdir}/%{name}
|
||||||
|
|
||||||
%files vim-plugins
|
%files vim-plugins
|
||||||
|
Loading…
Reference in New Issue
Block a user