rpm/llvm
SHA256
1
0
Fork 0
forked from pool/llvm
Code Pull Requests Activity

Accepting request 286987 from home:rguenther:branches:devel:tools:compiler

Browse Source 
- Add llvm-fix-intrusiverefcntptr.patch to fix build of LLVM tools
  with GCC 5.
- Add llvm-fix-find-gcc5-install.patch to properly find installed GCC 5.

OBS-URL: https://build.opensuse.org/request/show/286987
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=398
This commit is contained in:
Ismail Dönmez 2015-02-20 14:48:13 +00:00 committed by Git OBS Bridge
parent f086429bfc
commit 4d07e73cc1
5 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package lldb
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

19
llvm-fix-find-gcc5-install.patch Normal file
View File

@ -0,0 +1,19 @@
Index: cfe-3.5.0.src/lib/Driver/ToolChains.cpp
===================================================================
--- cfe-3.5.0.src/lib/Driver/ToolChains.cpp.orig 2015-02-20 14:03:49.512242844 +0100
+++ cfe-3.5.0.src/lib/Driver/ToolChains.cpp 2015-02-20 15:07:11.965048162 +0100
@@ -1135,10 +1135,11 @@ Generic_GCC::GCCVersion Linux::GCCVersio
GoodVersion.Major < 0)
return BadVersion;
GoodVersion.MajorStr = First.first.str();
- if (Second.first.getAsInteger(10, GoodVersion.Minor) ||
- GoodVersion.Minor < 0)
- return BadVersion;
GoodVersion.MinorStr = Second.first.str();
+ if (!Second.first.str().empty () &&
+ (Second.first.getAsInteger(10, GoodVersion.Minor) ||
+ GoodVersion.Minor < 0))
+ return BadVersion;
// First look for a number prefix and parse that if present. Otherwise just
// stash the entire patch string in the suffix, and leave the number

14
llvm-fix-intrusiverefcntptr.patch Normal file
View File

@ -0,0 +1,14 @@
Index: include/llvm/ADT/IntrusiveRefCntPtr.h
===================================================================
--- include/llvm/ADT/IntrusiveRefCntPtr.h.orig 2014-07-06 00:20:59.000000000 +0200
+++ include/llvm/ADT/IntrusiveRefCntPtr.h 2015-02-20 14:05:08.687151938 +0100
@@ -197,6 +197,9 @@ public:
private:
void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); }
void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); }
+
+ template <typename X>
+ friend class IntrusiveRefCntPtr;
};
template<class T, class U>

7
llvm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 20 13:40:11 UTC 2015 - rguenther@suse.com
- Add llvm-fix-intrusiverefcntptr.patch to fix build of LLVM tools
with GCC 5.
- Add llvm-fix-find-gcc5-install.patch to properly find installed GCC 5.
-------------------------------------------------------------------
Wed Jan 28 10:08:43 UTC 2015 - idonmez@suse.com

6
llvm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package llvm
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -65,6 +65,8 @@ Patch10: clang-resourcedirs.patch
Patch11: libcxxabi-exceptions.patch
Patch12: libcxx-libdir.patch
Patch13: llvm-remove-clang-only-flags.patch
Patch14: llvm-fix-intrusiverefcntptr.patch
Patch15: llvm-fix-find-gcc5-install.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: binutils-devel >= 2.21.90
BuildRequires: bison
@ -171,6 +173,8 @@ This package contains the Python bindings to clang (C language) frontend for LLV
%patch11
%patch12
%patch13 -p1
%patch14
%patch15
# Move into right place
mv cfe-%{version}.src tools/clang