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

- Update to version 3.7.0

Browse Source 
* No changelog upstream

- Update to version 3.7.0
  * See http://llvm.org/releases/3.7.0/docs/ReleaseNotes.html
- Merge aarch64-suse-support.patch into arm_suse_support.diff
- Refresh arm_suse_support.diff, llvm-fix-find-gcc5-install.patch
- Remove llvm-fix-parsearmarch.patch, upstream.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=419
This commit is contained in:
Ismail Dönmez 2015-09-03 09:44:07 +00:00 committed by Git OBS Bridge
parent 46660e6161
commit 5ee9c90c79
32 changed files with 132 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
aarch64-suse-support.patch
View File

@ -1,14 +0,0 @@
Index: cfe-3.6.1.src/lib/Driver/ToolChains.cpp
===================================================================
--- cfe-3.6.1.src.orig/lib/Driver/ToolChains.cpp
+++ cfe-3.6.1.src/lib/Driver/ToolChains.cpp
@@ -1315,7 +1315,8 @@ bool Generic_GCC::GCCInstallationDetecto
static const char *const AArch64Triples[] = { "aarch64-none-linux-gnu",
"aarch64-linux-gnu",
"aarch64-linux-android",
- "aarch64-redhat-linux" };
+ "aarch64-redhat-linux",
+ "aarch64-suse-linux"};
static const char *const AArch64beLibDirs[] = { "/lib" };
static const char *const AArch64beTriples[] = { "aarch64_be-none-linux-gnu",
"aarch64_be-linux-gnu" };

40
arm_suse_support.diff
View File

@ -1,18 +1,26 @@
Index: cfe-3.6.1.src/lib/Driver/ToolChains.cpp Index: cfe-3.7.0.src/lib/Driver/ToolChains.cpp
=================================================================== ===================================================================
--- cfe-3.6.1.src/lib/Driver/ToolChains.cpp --- cfe-3.7.0.src.orig/lib/Driver/ToolChains.cpp
+++ cfe-3.6.1.src/lib/Driver/ToolChains.cpp +++ cfe-3.7.0.src/lib/Driver/ToolChains.cpp
@@ -1322,9 +1322,11 @@ bool Generic_GCC::GCCInstallationDetecto @@ -1266,16 +1266,18 @@ bool Generic_GCC::GCCInstallationDetecto
static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
static const char *const AArch64Triples[] = {
"aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-linux-android",
- "aarch64-redhat-linux"};
+ "aarch64-redhat-linux", "aarch64-suse-linux"};
static const char *const AArch64beLibDirs[] = {"/lib"};
static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
"aarch64_be-linux-gnu"};
static const char *const ARMLibDirs[] = { "/lib" }; static const char *const ARMLibDirs[] = {"/lib"};
static const char *const ARMTriples[] = { "arm-linux-gnueabi", static const char *const ARMTriples[] = {"arm-linux-gnueabi",
- "arm-linux-androideabi" }; - "arm-linux-androideabi"};
+ "arm-linux-androideabi", + "arm-linux-androideabi",
+ "armv6hl-suse-linux-gnueabi"}; + "armv6hl-suse-linux-gnueabi"};
static const char *const ARMHFTriples[] = { "arm-linux-gnueabihf", static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
- "armv7hl-redhat-linux-gnueabi" }; - "armv7hl-redhat-linux-gnueabi"};
+ "armv7hl-redhat-linux-gnueabi", + "armv7hl-redhat-linux-gnueabi",
+ "armv7hl-suse-linux-gnueabi"}; + "armv7hl-suse-linux-gnueabi"};
static const char *const ARMebLibDirs[] = { "/lib" }; static const char *const ARMebLibDirs[] = {"/lib"};
static const char *const ARMebTriples[] = { "armeb-linux-gnueabi", static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
"armeb-linux-androideabi" }; "armeb-linux-androideabi"};

6
assume-opensuse.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.6.1.src/lib/Driver/ToolChains.cpp Index: cfe-3.7.0.src/lib/Driver/ToolChains.cpp
=================================================================== ===================================================================
--- cfe-3.6.1.src/lib/Driver/ToolChains.cpp --- cfe-3.7.0.src/lib/Driver/ToolChains.cpp
+++ cfe-3.6.1.src/lib/Driver/ToolChains.cpp +++ cfe-3.7.0.src/lib/Driver/ToolChains.cpp
@@ -2794,6 +2794,7 @@ static bool IsUbuntu(enum Distro Distro) @@ -2794,6 +2794,7 @@ static bool IsUbuntu(enum Distro Distro)
} }

3
cfe-3.6.1.src.tar.xz
View File

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

3
cfe-3.7.0.src.tar.xz Normal file
View File

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

3
cfe-docs-3.6.1.src.tar.xz
View File

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

3
cfe-docs-3.7.0.src.tar.xz Normal file
View File

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

6
clang-disable-ada-extension.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.6.1.src/lib/Driver/Types.cpp Index: cfe-3.7.0.src/lib/Driver/Types.cpp
=================================================================== ===================================================================
--- cfe-3.6.1.src/lib/Driver/Types.cpp --- cfe-3.7.0.src/lib/Driver/Types.cpp
+++ cfe-3.6.1.src/lib/Driver/Types.cpp +++ cfe-3.7.0.src/lib/Driver/Types.cpp
@@ -158,8 +158,6 @@ types::ID types::lookupTypeForExtension( @@ -158,8 +158,6 @@ types::ID types::lookupTypeForExtension(
.Case("hh", TY_CXXHeader) .Case("hh", TY_CXXHeader)
.Case("ll", TY_LLVM_IR) .Case("ll", TY_LLVM_IR)

6
clang-resourcedirs.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.6.1.src/lib/Driver/Driver.cpp Index: cfe-3.7.0.src/lib/Driver/Driver.cpp
=================================================================== ===================================================================
--- cfe-3.6.1.src/lib/Driver/Driver.cpp --- cfe-3.7.0.src/lib/Driver/Driver.cpp
+++ cfe-3.6.1.src/lib/Driver/Driver.cpp +++ cfe-3.7.0.src/lib/Driver/Driver.cpp
@@ -64,7 +64,7 @@ Driver::Driver(StringRef ClangExecutable @@ -64,7 +64,7 @@ Driver::Driver(StringRef ClangExecutable
// Compute the path to the resource directory. // Compute the path to the resource directory.

3
compiler-rt-3.6.1.src.tar.xz
View File

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

3
compiler-rt-3.7.0.src.tar.xz Normal file
View File

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

6
default-to-i586.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.6.1.src/lib/Driver/Tools.cpp Index: cfe-3.7.0.src/lib/Driver/Tools.cpp
=================================================================== ===================================================================
--- cfe-3.6.1.src/lib/Driver/Tools.cpp --- cfe-3.7.0.src/lib/Driver/Tools.cpp
+++ cfe-3.6.1.src/lib/Driver/Tools.cpp +++ cfe-3.7.0.src/lib/Driver/Tools.cpp
@@ -1322,8 +1322,8 @@ static const char *getX86TargetCPU(const @@ -1322,8 +1322,8 @@ static const char *getX86TargetCPU(const
case llvm::Triple::Bitrig: case llvm::Triple::Bitrig:
return "i686"; return "i686";

3
libcxx-3.6.1.src.tar.xz
View File

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

3
libcxx-3.7.0.src.tar.xz Normal file
View File

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

3
libcxxabi-3.6.1.src.tar.xz
View File

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

3
libcxxabi-3.7.0.src.tar.xz Normal file
View File

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

8
libcxxabi-exceptions.patch
View File

@ -1,7 +1,7 @@
Index: libcxxabi-3.6.1.src/src/CMakeLists.txt Index: libcxxabi-3.7.0.src/src/CMakeLists.txt
=================================================================== ===================================================================
--- libcxxabi-3.6.1.src/src/CMakeLists.txt --- libcxxabi-3.7.0.src/src/CMakeLists.txt
+++ libcxxabi-3.6.1.src/src/CMakeLists.txt +++ libcxxabi-3.7.0.src/src/CMakeLists.txt
@@ -52,7 +52,7 @@ append_if(libraries LIBCXXABI_HAS_PTHREA @@ -52,7 +52,7 @@ append_if(libraries LIBCXXABI_HAS_PTHREA
if (LIBCXXABI_USE_LLVM_UNWINDER) if (LIBCXXABI_USE_LLVM_UNWINDER)
list(APPEND libraries unwind) list(APPEND libraries unwind)
@ -10,4 +10,4 @@ Index: libcxxabi-3.6.1.src/src/CMakeLists.txt
+ append_if(libraries LIBCXXABI_HAS_GCC_EH_LIB gcc_s) + append_if(libraries LIBCXXABI_HAS_GCC_EH_LIB gcc_s)
endif() endif()
target_link_libraries(cxxabi ${libraries}) # Setup flags.

3
lldb-3.6.1.src.tar.xz
View File

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

3
lldb-3.7.0.src.tar.xz Normal file
View File

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

30
lldb-cmake.patch
View File

@ -1,7 +1,7 @@
Index: lldb-3.6.1.src/source/lldb.cpp Index: lldb-3.7.0.src/source/lldb.cpp
=================================================================== ===================================================================
--- lldb-3.6.1.src.orig/source/lldb.cpp --- lldb-3.7.0.src.orig/source/lldb.cpp
+++ lldb-3.6.1.src/source/lldb.cpp +++ lldb-3.7.0.src/source/lldb.cpp
@@ -325,11 +325,7 @@ extern "C" const unsigned char liblldb_c @@ -325,11 +325,7 @@ extern "C" const unsigned char liblldb_c
static const char * static const char *
GetLLDBRevision() GetLLDBRevision()
@ -14,10 +14,10 @@ Index: lldb-3.6.1.src/source/lldb.cpp
} }
static const char * static const char *
Index: lldb-3.6.1.src/source/Core/IOHandler.cpp Index: lldb-3.7.0.src/source/Core/IOHandler.cpp
=================================================================== ===================================================================
--- lldb-3.6.1.src.orig/source/Core/IOHandler.cpp --- lldb-3.7.0.src.orig/source/Core/IOHandler.cpp
+++ lldb-3.6.1.src/source/Core/IOHandler.cpp +++ lldb-3.7.0.src/source/Core/IOHandler.cpp
@@ -31,8 +31,8 @@ @@ -31,8 +31,8 @@
#include "lldb/Target/ThreadPlan.h" #include "lldb/Target/ThreadPlan.h"
@ -29,10 +29,10 @@ Index: lldb-3.6.1.src/source/Core/IOHandler.cpp
#endif #endif
using namespace lldb; using namespace lldb;
Index: lldb-3.6.1.src/CMakeLists.txt Index: lldb-3.7.0.src/CMakeLists.txt
=================================================================== ===================================================================
--- lldb-3.6.1.src.orig/CMakeLists.txt --- lldb-3.7.0.src.orig/CMakeLists.txt
+++ lldb-3.6.1.src/CMakeLists.txt +++ lldb-3.7.0.src/CMakeLists.txt
@@ -83,7 +83,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR @@ -83,7 +83,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
# Import CMake library targets from LLVM and Clang. # Import CMake library targets from LLVM and Clang.
@ -42,10 +42,10 @@ Index: lldb-3.6.1.src/CMakeLists.txt
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
Index: lldb-3.6.1.src/cmake/LLDBDependencies.cmake Index: lldb-3.7.0.src/cmake/LLDBDependencies.cmake
=================================================================== ===================================================================
--- lldb-3.6.1.src.orig/cmake/LLDBDependencies.cmake --- lldb-3.7.0.src.orig/cmake/LLDBDependencies.cmake
+++ lldb-3.6.1.src/cmake/LLDBDependencies.cmake +++ lldb-3.7.0.src/cmake/LLDBDependencies.cmake
@@ -132,7 +132,7 @@ set( CLANG_USED_LIBS @@ -132,7 +132,7 @@ set( CLANG_USED_LIBS
set(LLDB_SYSTEM_LIBS) set(LLDB_SYSTEM_LIBS)
@ -64,10 +64,10 @@ Index: lldb-3.6.1.src/cmake/LLDBDependencies.cmake
) )
if ( NOT LLDB_DISABLE_PYTHON ) if ( NOT LLDB_DISABLE_PYTHON )
Index: lldb-3.6.1.src/tools/lldb-mi/CMakeLists.txt Index: lldb-3.7.0.src/tools/lldb-mi/CMakeLists.txt
=================================================================== ===================================================================
--- lldb-3.6.1.src.orig/tools/lldb-mi/CMakeLists.txt --- lldb-3.7.0.src.orig/tools/lldb-mi/CMakeLists.txt
+++ lldb-3.6.1.src/tools/lldb-mi/CMakeLists.txt +++ lldb-3.7.0.src/tools/lldb-mi/CMakeLists.txt
@@ -164,7 +164,7 @@ add_lldb_executable(lldb-mi @@ -164,7 +164,7 @@ add_lldb_executable(lldb-mi
) )
endif () endif ()

6
lldb.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 2 08:23:08 UTC 2015 - idonmez@suse.com
- Update to version 3.7.0
* No changelog upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 22 09:45:33 UTC 2015 - idonmez@suse.com Mon Jun 22 09:45:33 UTC 2015 - idonmez@suse.com

4
lldb.spec
View File

@ -16,10 +16,10 @@
# #
%define _revision 238133 %define _revision 246586
Name: lldb Name: lldb
Version: 3.6.1 Version: 3.7.0
Release: 0 Release: 0
Summary: The LLDB Debugger Summary: The LLDB Debugger
License: NCSA License: NCSA

3
llvm-3.6.1.src.tar.xz
View File

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

3
llvm-3.7.0.src.tar.xz Normal file
View File

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

3
llvm-docs-3.6.1.src.tar.xz
View File

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

3
llvm-docs-3.7.0.src.tar.xz Normal file
View File

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

23
llvm-fix-find-gcc5-install.patch
View File

@ -1,19 +1,14 @@
Index: cfe-3.6.1.src/lib/Driver/ToolChains.cpp Index: cfe-3.7.0.src/lib/Driver/ToolChains.cpp
=================================================================== ===================================================================
--- cfe-3.6.1.src/lib/Driver/ToolChains.cpp.orig 2015-02-20 14:03:49.512242844 +0100 --- cfe-3.7.0.src/lib/Driver/ToolChains.cpp
+++ cfe-3.6.1.src/lib/Driver/ToolChains.cpp 2015-02-20 15:07:11.965048162 +0100 +++ cfe-3.7.0.src/lib/Driver/ToolChains.cpp
@@ -1135,10 +1135,11 @@ Generic_GCC::GCCVersion Linux::GCCVersio @@ -1091,7 +1091,8 @@ Generic_GCC::GCCVersion Linux::GCCVersio
GoodVersion.Major < 0) if (First.first.getAsInteger(10, GoodVersion.Major) || GoodVersion.Major < 0)
return BadVersion; return BadVersion;
GoodVersion.MajorStr = First.first.str(); GoodVersion.MajorStr = First.first.str();
- if (Second.first.getAsInteger(10, GoodVersion.Minor) || - if (Second.first.getAsInteger(10, GoodVersion.Minor) || GoodVersion.Minor < 0)
- GoodVersion.Minor < 0) + if (!Second.first.str().empty() &&
- return BadVersion; + (Second.first.getAsInteger(10, GoodVersion.Minor) || GoodVersion.Minor < 0))
return BadVersion;
GoodVersion.MinorStr = Second.first.str(); 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

16
llvm-fix-parsearmarch.patch
View File

@ -1,16 +0,0 @@
Index: llvm-3.6.1.src/lib/Support/Triple.cpp
===================================================================
--- llvm-3.6.1.src.orig/lib/Support/Triple.cpp
+++ llvm-3.6.1.src/lib/Support/Triple.cpp
@@ -270,9 +270,9 @@ static Triple::ArchType parseARMArch(Str
.Cases("v3", "v3m", isThumb ? Triple::UnknownArch : arch)
.Cases("v4", "v4t", arch)
.Cases("v5", "v5e", "v5t", "v5te", "v5tej", arch)
- .Cases("v6", "v6j", "v6k", "v6m", arch)
+ .Cases("v6", "v6hl", "v6j", "v6k", "v6m", arch)
.Cases("v6t2", "v6z", "v6zk", arch)
- .Cases("v7", "v7a", "v7em", "v7l", arch)
+ .Cases("v7", "v7a", "v7em", "v7hl", "v7l", arch)
.Cases("v7m", "v7r", "v7s", arch)
.Cases("v8", "v8a", arch)
.Default(Triple::UnknownArch);

6
llvm-remove-clang-only-flags.patch
View File

@ -1,7 +1,7 @@
Index: llvm-3.6.1.src/cmake/modules/HandleLLVMOptions.cmake Index: llvm-3.7.0.src/cmake/modules/HandleLLVMOptions.cmake
=================================================================== ===================================================================
--- llvm-3.6.1.src.orig/cmake/modules/HandleLLVMOptions.cmake --- llvm-3.7.0.src.orig/cmake/modules/HandleLLVMOptions.cmake
+++ llvm-3.6.1.src/cmake/modules/HandleLLVMOptions.cmake +++ llvm-3.7.0.src/cmake/modules/HandleLLVMOptions.cmake
@@ -302,9 +302,6 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE @@ -302,9 +302,6 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE
endif() endif()
endif (LLVM_ENABLE_WARNINGS) endif (LLVM_ENABLE_WARNINGS)

9
llvm.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 2 08:14:39 UTC 2015 - idonmez@suse.com
- Update to version 3.7.0
* See http://llvm.org/releases/3.7.0/docs/ReleaseNotes.html
- Merge aarch64-suse-support.patch into arm_suse_support.diff
- Refresh arm_suse_support.diff, llvm-fix-find-gcc5-install.patch
- Remove llvm-fix-parsearmarch.patch, upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 26 11:54:49 CEST 2015 - ro@suse.de Tue May 26 11:54:49 CEST 2015 - ro@suse.de

43
llvm.spec
View File

@ -16,8 +16,8 @@
# #
%define _revision 238133 %define _revision 246586
%define _release_version 3.6.1 %define _release_version 3.7.0
%define build_libcxx 0 %define build_libcxx 0
@ -26,7 +26,7 @@
%endif %endif
Name: llvm Name: llvm
Version: 3.6.1 Version: 3.7.0
Release: 0 Release: 0
Summary: Low Level Virtual Machine Summary: Low Level Virtual Machine
License: NCSA License: NCSA
@ -41,7 +41,7 @@ Source4: http://llvm.org/releases/%{version}/libcxxabi-%{version}.src.tar
# cd docs # cd docs
# make -f Makefile.sphinx man html # make -f Makefile.sphinx man html
# cd .. # cd ..
# tar cvJf llvm-docs-3.6.1.src.tar.xz llvm-3.6.1.src/docs/_build/{man,html} # tar cvJf llvm-docs-3.7.0.src.tar.xz llvm-3.7.0.src/docs/_build/{man,html}
Source5: llvm-docs-%{version}.src.tar.xz Source5: llvm-docs-%{version}.src.tar.xz
Source6: cfe-docs-%{version}.src.tar.xz Source6: cfe-docs-%{version}.src.tar.xz
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
@ -57,13 +57,10 @@ Patch4: default-to-i586.patch
# PATCH-FIX-OPENSUSE arm_suse_support.diff --Enable ARM suse toolchain support # PATCH-FIX-OPENSUSE arm_suse_support.diff --Enable ARM suse toolchain support
Patch6: arm_suse_support.diff Patch6: arm_suse_support.diff
Patch7: cmake-host-triple.patch Patch7: cmake-host-triple.patch
# PATCH-FIX-OPENSUSE aarch64-suse-support.patch -- Enable AArch64 suse toolchain support
Patch8: aarch64-suse-support.patch
Patch10: clang-resourcedirs.patch Patch10: clang-resourcedirs.patch
Patch11: libcxxabi-exceptions.patch Patch11: libcxxabi-exceptions.patch
Patch13: llvm-remove-clang-only-flags.patch Patch13: llvm-remove-clang-only-flags.patch
Patch15: llvm-fix-find-gcc5-install.patch Patch15: llvm-fix-find-gcc5-install.patch
Patch16: llvm-fix-parsearmarch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: binutils-devel >= 2.21.90 BuildRequires: binutils-devel >= 2.21.90
BuildRequires: bison BuildRequires: bison
@ -80,8 +77,8 @@ BuildRequires: ninja
BuildRequires: python-base BuildRequires: python-base
BuildRequires: python-xml BuildRequires: python-xml
Requires: libLLVM = %{version}-%{release} Requires: libLLVM = %{version}-%{release}
# llvm does not work on ppc, only ppc64 # llvm does not work on ppc or s390
ExcludeArch: ppc ExcludeArch: ppc s390
%description %description
LLVM is a compiler infrastructure designed for compile-time, LLVM is a compiler infrastructure designed for compile-time,
@ -162,12 +159,10 @@ This package contains the Python bindings to clang (C language) frontend for LLV
%patch4 %patch4
%patch6 %patch6
%patch7 -p1 %patch7 -p1
%patch8
%patch10 %patch10
%patch11 %patch11
%patch13 -p1 %patch13 -p1
%patch15 %patch15
%patch16 -p1
# Move into right place # Move into right place
mv cfe-%{version}.src tools/clang mv cfe-%{version}.src tools/clang
@ -176,10 +171,14 @@ mv compiler-rt-%{version}.src projects/compiler-rt
%if %{build_libcxx} %if %{build_libcxx}
mv libcxx-%{version}.src projects/libcxx mv libcxx-%{version}.src projects/libcxx
mv libcxxabi-%{version}.src projects/libcxxabi mv libcxxabi-%{version}.src projects/libcxxabi
rm projects/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
rm projects/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
%endif %endif
# We hardcode i586 # We hardcode i586
rm tools/clang/test/Driver/x86_features.c rm tools/clang/test/Driver/x86_features.c
rm tools/clang/test/Driver/nacl-direct.c
sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
@ -264,7 +263,7 @@ cmake -G "Ninja" \
-DLLVM_ENABLE_PIC=ON \ -DLLVM_ENABLE_PIC=ON \
-DLLVM_BINUTILS_INCDIR=/usr/include \ -DLLVM_BINUTILS_INCDIR=/usr/include \
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
-DLLVM_TARGETS_TO_BUILD="host;R600" \ -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
%else %else
-DLLVM_TARGETS_TO_BUILD=host \ -DLLVM_TARGETS_TO_BUILD=host \
%endif %endif
@ -311,7 +310,7 @@ cmake -G "Ninja" \
-DLLVM_ENABLE_PIC=ON \ -DLLVM_ENABLE_PIC=ON \
-DLLVM_BINUTILS_INCDIR=/usr/include \ -DLLVM_BINUTILS_INCDIR=/usr/include \
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
-DLLVM_TARGETS_TO_BUILD="host;R600" \ -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
%else %else
-DLLVM_TARGETS_TO_BUILD=host \ -DLLVM_TARGETS_TO_BUILD=host \
%endif %endif
@ -324,8 +323,7 @@ ninja check
ninja clang-test ninja clang-test
%if %{build_libcxx} %if %{build_libcxx}
# Uncomment when llvm 3.6 hits ninja check-libcxx
#ninja check-libcxx
ninja check-libcxxabi ninja check-libcxxabi
%endif %endif
@ -410,8 +408,10 @@ sed -i 's,$RealBin/scanview.css,%{_datadir}/clang/scanview.css,' \
sed -i 's,RealBin/bin,RealBin,' \ sed -i 's,RealBin/bin,RealBin,' \
%{buildroot}%{_bindir}/scan-build %{buildroot}%{_bindir}/scan-build
install -m 755 -d %{buildroot}%{_datadir}/vim/site/syntax/ install -m 755 -d %{buildroot}%{_datadir}/vim/site/
install -m 644 utils/vim/*.vim %{buildroot}%{_datadir}/vim/site/syntax/ for i in ftdetect ftplugin indent syntax; do
cp -r utils/vim/$i %{buildroot}%{_datadir}/vim/site/
done
mv utils/vim/README utils/vim/README.vim mv utils/vim/README utils/vim/README.vim
# Stuff we don't want to include # Stuff we don't want to include
@ -463,7 +463,7 @@ EOF
%files -n libLLVM %files -n libLLVM
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libLLVM* %{_libdir}/libLLVM*.so.*
%files clang %files clang
%defattr(-,root,root) %defattr(-,root,root)
@ -496,13 +496,11 @@ EOF
%files -n libclang %files -n libclang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%exclude %{_libdir}/libclang.so %{_libdir}/libclang*.so.*
%{_libdir}/libclang*.so
%{_libdir}/libclang.so.*
%files clang-devel %files clang-devel
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libclang.so %{_libdir}/libclang*.so
%{_includedir}/clang %{_includedir}/clang
%{_includedir}/clang-c %{_includedir}/clang-c
%doc %{_docdir}/llvm-clang %doc %{_docdir}/llvm-clang
@ -510,6 +508,7 @@ EOF
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/%{name}-config %{_bindir}/%{name}-config
%{_libdir}/libLLVM*.so
%{_libdir}/BugpointPasses.* %{_libdir}/BugpointPasses.*
%{_libdir}/LLVMHello.* %{_libdir}/LLVMHello.*
%doc %{_mandir}/man1/%{name}-config.1%{ext_man} %doc %{_mandir}/man1/%{name}-config.1%{ext_man}

6
set-revision.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.6.1.src/lib/Basic/Version.cpp Index: cfe-3.7.0.src/lib/Basic/Version.cpp
=================================================================== ===================================================================
--- cfe-3.6.1.src/lib/Basic/Version.cpp --- cfe-3.7.0.src/lib/Basic/Version.cpp
+++ cfe-3.6.1.src/lib/Basic/Version.cpp +++ cfe-3.7.0.src/lib/Basic/Version.cpp
@@ -66,19 +66,11 @@ std::string getLLVMRepositoryPath() { @@ -66,19 +66,11 @@ std::string getLLVMRepositoryPath() {
} }