mirror of
https://abf.rosa.ru/djam/llvm.git
synced 2025-02-23 16:22:50 +00:00
Updated to 6.0.1
This commit is contained in:
parent
d3c30c6d15
commit
0afb3031f4
4 changed files with 10 additions and 89 deletions
10
.abf.yml
10
.abf.yml
|
@ -1,6 +1,6 @@
|
|||
sources:
|
||||
cfe-6.0.0.src.tar.xz: 4cc7bef72fda70ac5e065ca0ae2d66957abe6f2a
|
||||
clang-tools-extra-6.0.0.src.tar.xz: c960a0d565e46e4c4f6976fac389f753076ca72e
|
||||
compiler-rt-6.0.0.src.tar.xz: 5725f19be611034e77196461cdb4989f4258cfa4
|
||||
llvm-6.0.0.src.tar.xz: f61e0a35feb76644ba160a413ee209dd24c88f47
|
||||
polly-6.0.0.src.tar.xz: 118be6f5e0ddddc3f3510df82b02bcfb485ee590
|
||||
cfe-6.0.1.src.tar.xz: d93d8f3e3d7eb549ac58507383f7fcbdd78804d7
|
||||
clang-tools-extra-6.0.1.src.tar.xz: 0e4077e46dba66f9db17eb55b1e913b44cb19fd3
|
||||
compiler-rt-6.0.1.src.tar.xz: 4a61bd09f31d3079e921205bb93fb7d05a95946b
|
||||
llvm-6.0.1.src.tar.xz: 09a6316c5225cab255ba12391e7abe5ff4d28935
|
||||
polly-6.0.1.src.tar.xz: ace57e113a26c1244cf28c79012ff5e3f73ff076
|
||||
|
|
|
@ -1,73 +0,0 @@
|
|||
--- llvm-3.5/tools/clang/lib/Driver/Driver.cpp.gcc49~ 2014-08-22 22:54:39.000000000 +0200
|
||||
+++ llvm-3.5/tools/clang/lib/Driver/Driver.cpp 2014-08-25 22:24:57.688608644 +0200
|
||||
@@ -910,7 +910,7 @@
|
||||
// If we want to return a more correct answer some day, then we should
|
||||
// introduce a non-pedantically GCC compatible mode to Clang in which we
|
||||
// provide sensible definitions for -dumpversion, __VERSION__, etc.
|
||||
- llvm::outs() << "4.2.1\n";
|
||||
+ llvm::outs() << "4.9.1\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
--- llvm-3.5/tools/clang/lib/Frontend/InitPreprocessor.cpp.gcc49~ 2014-08-22 22:54:39.000000000 +0200
|
||||
+++ llvm-3.5/tools/clang/lib/Frontend/InitPreprocessor.cpp 2014-08-25 22:24:57.689608632 +0200
|
||||
@@ -522,9 +522,9 @@
|
||||
#undef TOSTR
|
||||
#undef TOSTR2
|
||||
if (!LangOpts.MSVCCompat) {
|
||||
- // Currently claim to be compatible with GCC 4.2.1-5621, but only if we're
|
||||
+ // Currently claim to be compatible with GCC 4.9.1, but only if we're
|
||||
// not compiling for MSVC compatibility
|
||||
- Builder.defineMacro("__GNUC_MINOR__", "2");
|
||||
+ Builder.defineMacro("__GNUC_MINOR__", "9");
|
||||
Builder.defineMacro("__GNUC_PATCHLEVEL__", "1");
|
||||
Builder.defineMacro("__GNUC__", "4");
|
||||
Builder.defineMacro("__GXX_ABI_VERSION", "1002");
|
||||
@@ -542,9 +542,9 @@
|
||||
Builder.defineMacro("__PRAGMA_REDEFINE_EXTNAME", "1");
|
||||
|
||||
// As sad as it is, enough software depends on the __VERSION__ for version
|
||||
- // checks that it is necessary to report 4.2.1 (the base GCC version we claim
|
||||
+ // checks that it is necessary to report 4.9.1 (the base GCC version we claim
|
||||
// compatibility with) first.
|
||||
- Builder.defineMacro("__VERSION__", "\"4.2.1 Compatible " +
|
||||
+ Builder.defineMacro("__VERSION__", "\"4.9.1 Compatible " +
|
||||
Twine(getClangFullCPPVersion()) + "\"");
|
||||
|
||||
// Initialize language-specific preprocessor defines.
|
||||
|
||||
--- llvm-3.5/tools/clang/test/Driver/immediate-options.c.gcc49~ 2014-08-22 22:54:39.000000000 +0200
|
||||
+++ llvm-3.5/tools/clang/test/Driver/immediate-options.c 2014-08-25 22:24:57.690608619 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
// HELP-HIDDEN: driver-mode
|
||||
|
||||
// RUN: %clang -dumpversion | FileCheck %s -check-prefix=DUMPVERSION
|
||||
-// DUMPVERSION: 4.2.1
|
||||
+// DUMPVERSION: 4.9.1
|
||||
|
||||
// RUN: %clang -print-search-dirs | FileCheck %s -check-prefix=PRINT-SEARCH-DIRS
|
||||
// PRINT-SEARCH-DIRS: programs: ={{.*}}
|
||||
|
||||
--- llvm-3.5/tools/clang/test/Preprocessor/init.c.gcc49~ 2014-08-25 22:24:57.691608607 +0200
|
||||
+++ llvm-3.5/tools/clang/test/Preprocessor/init.c 2014-08-25 22:25:27.754232772 +0200
|
||||
@@ -7025,7 +7025,7 @@
|
||||
// SPARC:#define __UINT_LEAST8_MAX__ 255
|
||||
// SPARC:#define __UINT_LEAST8_TYPE__ unsigned char
|
||||
// SPARC:#define __USER_LABEL_PREFIX__
|
||||
-// SPARC:#define __VERSION__ "4.2.1 Compatible{{.*}}
|
||||
+// SPARC:#define __VERSION__ "4.9.1 Compatible{{.*}}
|
||||
// SPARC:#define __WCHAR_MAX__ 2147483647
|
||||
// SPARC:#define __WCHAR_TYPE__ int
|
||||
// SPARC:#define __WCHAR_WIDTH__ 32
|
||||
--- llvm-3.6.0.src/include/llvm/Support/Compiler.h.omv~ 2014-10-28 18:09:47.260731249 +0100
|
||||
+++ llvm-3.6.0.src/include/llvm/Support/Compiler.h 2014-10-28 18:09:59.930572854 +0100
|
||||
@@ -288,7 +288,7 @@
|
||||
|
||||
/// \macro LLVM_ASSUME_ALIGNED
|
||||
/// \brief Returns a pointer with an assumed alignment.
|
||||
-#if __has_builtin(__builtin_assume_aligned) || LLVM_GNUC_PREREQ(4, 7, 0)
|
||||
+#if __has_builtin(__builtin_assume_aligned) || (!defined(__clang__) && LLVM_GNUC_PREREQ(4, 7, 0))
|
||||
# define LLVM_ASSUME_ALIGNED(p, a) __builtin_assume_aligned(p, a)
|
||||
#elif defined(LLVM_BUILTIN_UNREACHABLE)
|
||||
// As of today, clang does not support __builtin_assume_aligned.
|
|
@ -1,2 +1,5 @@
|
|||
addFilter("E: hardcoded-library-path")
|
||||
addFilter("E: incoherent-version-in-name")
|
||||
# 202 warnings
|
||||
addFilter("W: devel-file-in-non-devel-package")
|
||||
addFilter("W: invalid-license")
|
||||
|
|
13
llvm.spec
13
llvm.spec
|
@ -13,7 +13,7 @@
|
|||
|
||||
%define maj_ver 6
|
||||
%define major_ver %{maj_ver}.0
|
||||
%define minor_ver 0
|
||||
%define minor_ver 1
|
||||
|
||||
%define major %{major_ver}
|
||||
%define lto_major %{maj_ver}
|
||||
|
@ -28,7 +28,7 @@
|
|||
Summary: Low Level Virtual Machine (LLVM)
|
||||
Name: llvm
|
||||
Version: %{major_ver}.%{minor_ver}
|
||||
Release: 3
|
||||
Release: 1
|
||||
License: NCSA
|
||||
Group: Development/Other
|
||||
Url: http://llvm.org/
|
||||
|
@ -45,10 +45,6 @@ Source1000: llvm.rpmlintrc
|
|||
#Patch1: clang-rosa.patch
|
||||
#
|
||||
Patch2: cfe-6.0.0-i586-unknown-linux-gnu.patch
|
||||
# Claim compatibility with gcc 4.9.1 rather than 4.2.1, it's
|
||||
# much much closer in terms of standards supported etc.
|
||||
Patch7: clang-gcc-compat.patch
|
||||
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: bison
|
||||
|
@ -62,8 +58,6 @@ BuildRequires: sed
|
|||
BuildRequires: tcl
|
||||
BuildRequires: zip
|
||||
BuildRequires: libstdc++-devel
|
||||
#BuildRequires: pkgconfig(cloog-isl)
|
||||
#BuildRequires: pkgconfig(isl) >= 0.13
|
||||
BuildRequires: pkgconfig(libffi)
|
||||
BuildRequires: pkgconfig(libtirpc)
|
||||
%if %{compile_apidox}
|
||||
|
@ -352,7 +346,6 @@ cd tools/clang
|
|||
%patch2 -p1 -b .gnu~
|
||||
cd -
|
||||
%endif
|
||||
#%patch7 -p1 -b .gcc49~
|
||||
|
||||
|
||||
%build
|
||||
|
@ -436,5 +429,3 @@ chmod 0755 %{buildroot}%{_bindir}/pollycc %{buildroot}%{_bindir}/pollyc++
|
|||
ln -s %{_libdir}/libclang.so.%{clang_major} %{buildroot}%{_libdir}/libclang-%{clang_major}.so
|
||||
ln -s %{_libdir}/libclang.so.%{clang_major} %{buildroot}%{_libdir}/libclang-%{clang_major}.%{minor_ver}.so
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
|
Loading…
Add table
Reference in a new issue