[llvm] update to 3.2 with R600 patchset from tstellar's git repo
Jens Petersen
petersen at fedoraproject.org
Wed Feb 13 11:52:26 UTC 2013
commit 2f5517cd536b010c7640e7af791e45093714c2cc
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Feb 13 20:52:19 2013 +0900
update to 3.2 with R600 patchset from tstellar's git repo
- llvm-fix-ghc.patch is upstream
- llvm-3.1-docs-pod-markup-fixes.patch no longer needed
- add llvm-3.2-clang-driver-secondary-arch-triplets.patch (#803433)
- build with gcc/g++ even if clang is installed
- use gcc -dumpversion again to set gcc_version
- llvm-config.1 manpage is no longer
.gitignore | 3 +
0001-Add-r600-TargetInfo.patch | 100 ------------------
0001-r600-Add-some-intrinsic-definitions.patch | 64 -----------
...t_global_size-and-get_local_size-intrinsi.patch | 27 -----
0002-r600-Add-some-target-builtins.patch | 111 --------------------
...ad_global_size-and-read_local_size-builti.patch | 31 ------
...-3.2-clang-driver-secondary-arch-triplets.patch | 26 +++++
llvm.spec | 60 +++++------
sources | 5 +-
9 files changed, 57 insertions(+), 370 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 04b6431..2c6da01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
/clang-3.0.tar.gz
/clang-3.1.src.tar.gz
/llvm-3.1.src.tar.gz
+/llvm-3.2-R600-tstellar-git-b53ed46.patch.gz
+/llvm-3.2.src.tar.gz
+/clang-3.2.src.tar.gz
diff --git a/llvm-3.2-clang-driver-secondary-arch-triplets.patch b/llvm-3.2-clang-driver-secondary-arch-triplets.patch
new file mode 100644
index 0000000..cfbbd36
--- /dev/null
+++ b/llvm-3.2-clang-driver-secondary-arch-triplets.patch
@@ -0,0 +1,26 @@
+--- llvm-3.2.src/tools/clang/lib/Driver/ToolChains.cpp~ 2012-12-17 00:59:27.000000000 +0900
++++ llvm-3.2.src/tools/clang/lib/Driver/ToolChains.cpp 2013-02-12 19:18:00.755164292 +0900
+@@ -1054,10 +1054,12 @@
+ static const char *const ARMLibDirs[] = { "/lib" };
+ static const char *const ARMTriples[] = {
+ "arm-linux-gnueabi",
+- "arm-linux-androideabi"
++ "arm-linux-androideabi",
++ "armv5tel-redhat-linux-gnueabi",
+ };
+ static const char *const ARMHFTriples[] = {
+ "arm-linux-gnueabihf",
++ "armv7hl-redhat-linux-gnueabi",
+ };
+
+ static const char *const X86_64LibDirs[] = { "/lib64", "/lib" };
+@@ -1104,7 +1106,8 @@
+ "powerpc-linux-gnu",
+ "powerpc-unknown-linux-gnu",
+ "powerpc-suse-linux",
+- "powerpc-montavista-linuxspe"
++ "powerpc-montavista-linuxspe",
++ "ppc64-redhat-linux",
+ };
+ static const char *const PPC64LibDirs[] = { "/lib64", "/lib" };
+ static const char *const PPC64Triples[] = {
diff --git a/llvm.spec b/llvm.spec
index 49d7a9f..bd994ee 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -6,7 +6,7 @@
# clang header paths are hard-coded at compile time
# and need adjustment whenever there's a new GCC version
-%global gcc_version 4.8.0
+%global gcc_version %(gcc -dumpversion)
%ifarch s390 s390x sparc64
# No ocaml on these arches
@@ -35,8 +35,8 @@ ExcludeArch: s390 s390x ppc ppc64
%endif
Name: llvm
-Version: 3.1
-Release: 16%{?dist}
+Version: 3.2
+Release: 1%{?dist}
Summary: The Low Level Virtual Machine
Group: Development/Languages
@@ -48,23 +48,14 @@ Source1: %{downloadurl}/clang-%{version}%{?prerel:%{prerel}}.src.tar.gz
Source2: llvm-Config-config.h
Source3: llvm-Config-llvm-config.h
-
# Data files should be installed with timestamps preserved
Patch0: llvm-2.6-timestamp.patch
-# r600 llvm and clang patches
-Patch600: 0001-r600-Add-some-intrinsic-definitions.patch
-Patch601: 0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch
-
-Patch610: 0001-Add-r600-TargetInfo.patch
-Patch611: 0002-r600-Add-some-target-builtins.patch
-Patch612: 0003-r600-Add-read_global_size-and-read_local_size-builti.patch
-
-# ghc
-Patch700: llvm-fix-ghc.patch
+Patch10: llvm-3.2-clang-driver-secondary-arch-triplets.patch
-# doc
-Patch800: llvm-3.1-docs-pod-markup-fixes.patch
+# diff generated against http://cgit.freedesktop.org/~tstellar/llvm/
+# (includes committed http://people.freedesktop.org/~tstellar/llvm/3.2/bug-fixes/)
+Patch600: llvm-3.2-R600-tstellar-git-b53ed46.patch.gz
BuildRequires: bison
BuildRequires: chrpath
@@ -262,24 +253,11 @@ mv clang-%{version}%{?prerel}.src tools/clang
# llvm patches
%patch0 -p1 -b .timestamp
-#patch1 -p1 -b .link_llvmgold_to_lto
-# r600 llvm patch
-%patch600 -p1 -b .r600
-%patch601 -p1 -b .r601
+# clang triplets
+%patch10 -p1 -b .orig
-# clang patches
-%if %{with clang}
-pushd tools/clang
-%patch610 -p1 -b .r610
-%patch611 -p1 -b .r611
-%patch612 -p1 -b .r612
-popd
-%endif
-
-%patch700 -p0 -b .ghc
-
-%patch800 -p1 -b .r800
+%patch600 -p1 -b .orig
# fix ld search path
sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' \
@@ -291,6 +269,9 @@ sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' \
# https://bugzilla.redhat.com/show_bug.cgi?id=791365
%global optflags %(echo %{optflags} | sed 's/-O2 /-O2 -fno-tree-pre /')
+# building with clang failing
+export CC=gcc
+export CXX=c++
# Disabling assertions now, rec. by pure and needed for OpenGTL
%configure \
--prefix=%{_prefix} \
@@ -317,7 +298,8 @@ sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' \
--enable-jit \
--enable-libffi \
--enable-shared \
- --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/%{_target_cpu}*/%{gcc_version}/include)
+ --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/%{_target_cpu}*/%{gcc_version}/include) \
+ --enable-experimental-targets=R600
# FIXME file this
# configure does not properly specify libdir
@@ -487,7 +469,6 @@ exit 0
%exclude %{_mandir}/man1/clang.1.*
%endif
%doc %{_mandir}/man1/*.1.*
-%exclude %{_mandir}/man1/llvm-config.1.*
%files devel
%defattr(-,root,root,-)
@@ -495,7 +476,6 @@ exit 0
%{_includedir}/%{name}
%{_includedir}/%{name}-c
%{_libdir}/%{name}/*.a
-%doc %{_mandir}/man1/llvm-config.1.*
%files libs
%defattr(-,root,root,-)
@@ -567,6 +547,16 @@ exit 0
%endif
%changelog
+* Wed Feb 13 2013 Jens Petersen <petersen at redhat.com> - 3.2-1
+- update to 3.2
+- update R600 patches to Tom Stellard's git tree
+- llvm-fix-ghc.patch is upstream
+- llvm-3.1-docs-pod-markup-fixes.patch no longer needed
+- add llvm-3.2-clang-driver-secondary-arch-triplets.patch (#803433)
+- build with gcc/g++ even if clang is installed
+- use gcc -dumpversion again to set gcc_version
+- llvm-config.1 manpage is no longer
+
* Mon Feb 4 2013 Jens Petersen <petersen at redhat.com> - 3.1-16
- bring back configuration for gcc arch include dir (Yury Zaytsev, #893817)
which was dropped in 3.0-0.1.rc3
diff --git a/sources b/sources
index 7c21d05..15c790f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-59bf2d3120a3805f27cafda3823caaf8 clang-3.1.src.tar.gz
-16eaa7679f84113f65b12760fdfe4ee1 llvm-3.1.src.tar.gz
+3896ef4334df08563b05d0848ba80582 clang-3.2.src.tar.gz
+71610289bbc819e3e15fdd562809a2d7 llvm-3.2.src.tar.gz
+0c32fc1b5ccabe5470c0d1083f6d800c llvm-3.2-R600-tstellar-git-b53ed46.patch.gz
More information about the scm-commits
mailing list