packages: llvm/llvm-pld.patch, llvm/llvm.spec, llvm/llvm-bug11177.patch (RE...
pluto
pluto at pld-linux.org
Wed May 23 14:51:40 CEST 2012
Author: pluto Date: Wed May 23 12:51:39 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.1.
---- Files affected:
packages/llvm:
llvm-pld.patch (1.2 -> 1.3) , llvm.spec (1.31 -> 1.32) , llvm-bug11177.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/llvm/llvm-pld.patch
diff -u packages/llvm/llvm-pld.patch:1.2 packages/llvm/llvm-pld.patch:1.3
--- packages/llvm/llvm-pld.patch:1.2 Thu Feb 9 15:27:18 2012
+++ packages/llvm/llvm-pld.patch Wed May 23 14:51:34 2012
@@ -1,6 +1,23 @@
--- llvm-3.0./tools/clang/lib/Driver/ToolChains.cpp.orig 2012-02-09 11:41:41.000000000 +0100
+++ llvm-3.0./tools/clang/lib/Driver/ToolChains.cpp 2012-02-09 12:25:54.844008378 +0100
-@@ -1378,6 +1378,7 @@
+@@ -1190,6 +1190,7 @@
+
+ static const char *const X86_64LibDirs[] = { "/lib64", "/lib" };
+ static const char *const X86_64Triples[] = {
++ "x86_64-pld-linux",
+ "x86_64-linux-gnu",
+ "x86_64-unknown-linux-gnu",
+ "x86_64-pc-linux-gnu",
+@@ -1202,6 +1203,8 @@
+ };
+ static const char *const X86LibDirs[] = { "/lib32", "/lib" };
+ static const char *const X86Triples[] = {
++ "i686-pld-linux",
++ "i486-pld-linux",
+ "i686-linux-gnu",
+ "i686-pc-linux-gnu",
+ "i486-linux-gnu",
+@@ -1815,6 +1818,7 @@
enum LinuxDistro {
ArchLinux,
@@ -8,8 +25,8 @@
DebianLenny,
DebianSqueeze,
DebianWheezy,
-@@ -1426,6 +1427,10 @@
- Distro == UbuntuNatty || Distro == UbuntuOneiric;
+@@ -1860,6 +1864,10 @@
+ return Distro >= UbuntuHardy && Distro <= UbuntuPrecise;
}
+static bool IsPLD(enum LinuxDistro Distro) {
@@ -17,9 +34,9 @@
+}
+
static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
- llvm::OwningPtr<llvm::MemoryBuffer> File;
+ OwningPtr<llvm::MemoryBuffer> File;
if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) {
-@@ -1507,6 +1512,9 @@
+@@ -1936,6 +1944,9 @@
if (!llvm::sys::fs::exists("/etc/arch-release", Exists) && Exists)
return ArchLinux;
@@ -29,24 +46,7 @@
return UnknownDistro;
}
-@@ -1647,6 +1655,7 @@
- } else if (HostArch == llvm::Triple::x86_64) {
- static const char *const X86_64LibDirs[] = { "/lib64", "/lib" };
- static const char *const X86_64Triples[] = {
-+ "x86_64-pld-linux",
- "x86_64-linux-gnu",
- "x86_64-unknown-linux-gnu",
- "x86_64-pc-linux-gnu",
-@@ -1664,6 +1673,8 @@
- } else if (HostArch == llvm::Triple::x86) {
- static const char *const X86LibDirs[] = { "/lib32", "/lib" };
- static const char *const X86Triples[] = {
-+ "i486-pld-linux",
-+ "i686-pld-linux",
- "i686-linux-gnu",
- "i686-pc-linux-gnu",
- "i486-linux-gnu",
-@@ -1802,7 +1813,7 @@
+@@ -2003,7 +2014,7 @@
LinuxDistro Distro = DetectLinuxDistro(Arch);
@@ -55,17 +55,18 @@
ExtraOpts.push_back("-z");
ExtraOpts.push_back("relro");
}
-@@ -1811,18 +1822,18 @@
- ExtraOpts.push_back("-X");
+@@ -2024,7 +2035,7 @@
+ // ABI requires a mapping between the GOT and the symbol table.
+ // Android loader does not support .gnu.hash.
+ if (!IsMips && !IsAndroid) {
+- if (IsRedhat(Distro) || IsOpenSuse(Distro) ||
++ if (IsRedhat(Distro) || IsOpenSuse(Distro) || IsPLD(Distro) ||
+ (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
+ ExtraOpts.push_back("--hash-style=gnu");
- if (IsRedhat(Distro) || IsOpenSuse(Distro) || Distro == UbuntuMaverick ||
-- Distro == UbuntuNatty || Distro == UbuntuOneiric)
-+ Distro == UbuntuNatty || Distro == UbuntuOneiric || IsPLD(Distro))
- ExtraOpts.push_back("--hash-style=gnu");
-
- if (IsDebian(Distro) || IsOpenSuse(Distro) || Distro == UbuntuLucid ||
- Distro == UbuntuJaunty || Distro == UbuntuKarmic)
- ExtraOpts.push_back("--hash-style=both");
+@@ -2033,11 +2044,11 @@
+ ExtraOpts.push_back("--hash-style=both");
+ }
- if (IsRedhat(Distro))
+ if (IsRedhat(Distro) || IsPLD(Distro))
@@ -75,5 +76,5 @@
- IsOpenSuse(Distro) ||
+ IsOpenSuse(Distro) || IsPLD(Distro) ||
(IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) ||
- Distro == UbuntuLucid ||
- Distro == UbuntuMaverick || Distro == UbuntuKarmic ||
+ (IsUbuntu(Distro) && Distro >= UbuntuKarmic))
+ ExtraOpts.push_back("--build-id");
================================================================
Index: packages/llvm/llvm.spec
diff -u packages/llvm/llvm.spec:1.31 packages/llvm/llvm.spec:1.32
--- packages/llvm/llvm.spec:1.31 Sun Mar 11 09:49:51 2012
+++ packages/llvm/llvm.spec Wed May 23 14:51:34 2012
@@ -13,18 +13,17 @@
Summary: The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
Summary(pl.UTF-8): Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
Name: llvm
-Version: 3.0
+Version: 3.1
Release: 1
License: University of Illinois/NCSA Open Source License
Group: Development/Languages
-Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a8e5f5f1c1adebae7b4a654c376a6005
-Source1: http://llvm.org/releases/%{version}/clang-%{version}.tar.gz
-# Source1-md5: 43350706ae6cf05d0068885792ea0591
+Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.gz
+# Source0-md5: 16eaa7679f84113f65b12760fdfe4ee1
+Source1: http://llvm.org/releases/%{version}/clang-%{version}.src.tar.gz
+# Source1-md5: 59bf2d3120a3805f27cafda3823caaf8
# Data files should be installed with timestamps preserved
Patch3: %{name}-2.6-timestamp.patch
Patch4: %{name}-pld.patch
-Patch5: %{name}-bug11177.patch
URL: http://llvm.org/
BuildRequires: bash
BuildRequires: bison
@@ -244,7 +243,6 @@
mv clang-*.* tools/clang
%patch3 -p1
%patch4 -p1
-%patch5 -p0
# configure does not properly specify libdir
sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in
@@ -367,8 +365,10 @@
%attr(755,root,root) %{_bindir}/llvm-objdump
%attr(755,root,root) %{_bindir}/llvm-prof
%attr(755,root,root) %{_bindir}/llvm-ranlib
+%attr(755,root,root) %{_bindir}/llvm-readobj
%attr(755,root,root) %{_bindir}/llvm-rtdyld
%attr(755,root,root) %{_bindir}/llvm-size
+%attr(755,root,root) %{_bindir}/llvm-stress
%attr(755,root,root) %{_bindir}/llvm-stub
%attr(755,root,root) %{_bindir}/llvm-tblgen
%attr(755,root,root) %{_bindir}/macho-dump
@@ -381,6 +381,7 @@
%{_mandir}/man1/llvm-ar.1*
%{_mandir}/man1/llvm-as.1*
%{_mandir}/man1/llvm-bcanalyzer.1*
+%{_mandir}/man1/llvm-cov.1*
%{_mandir}/man1/llvm-diff.1*
%{_mandir}/man1/llvm-dis.1*
%{_mandir}/man1/llvm-extract.1*
@@ -389,6 +390,7 @@
%{_mandir}/man1/llvm-nm.1*
%{_mandir}/man1/llvm-prof.1*
%{_mandir}/man1/llvm-ranlib.1*
+%{_mandir}/man1/llvm-stress.1*
%{_mandir}/man1/opt.1*
%files devel
@@ -400,7 +402,6 @@
%ifarch %{x8664}
%attr(755,root,root) %{_libdir}/BugpointPasses.so
%attr(755,root,root) %{_libdir}/libLTO.so
-%{_libdir}/libEnhancedDisassembly.a
%{_libdir}/libLTO.a
%endif
%{_includedir}/llvm
@@ -488,6 +489,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2012/05/23 12:51:34 pluto
+- updated to 3.1.
+
Revision 1.31 2012/03/11 08:49:51 qboosh
- sorted disable/enable configure options
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/llvm/llvm-pld.patch?r1=1.2&r2=1.3
http://cvs.pld-linux.org/packages/llvm/llvm.spec?r1=1.31&r2=1.32
More information about the pld-cvs-commit
mailing list