llvm: update to 3.3.
This commit is contained in:
Juan RP
parent
6b344d0b8a
commit
4406a8ad4a
|
|
@ -914,7 +914,7 @@ libyaml-0.so.2 libyaml-0.1.4_1
|
|||
libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
|
||||
libyajl.so.2 yajl-2.0.1_1
|
||||
libconfuse.so.0 confuse-2.7_1
|
||||
libLLVM-3.2.so llvm-3.2_1
|
||||
libLLVM-3.3.so llvm-3.3_1
|
||||
libisofs.so.6 libisofs-0.6.24_1
|
||||
libbfd-2.22.so binutils-2.22_1<2.23_1
|
||||
libopcodes-2.22.so binutils-2.22_1<2.23_1
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- tools/clang/lib/Driver/Tools.cpp 2012-04-19 00:32:25.000000000 +0300
|
||||
+++ tools/clang/lib/Driver/Tools.cpp 2012-05-23 21:12:08.000000000 +0300
|
||||
@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain
|
||||
// libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
|
||||
// not supported by old linkers.
|
||||
std::string ProfileRT =
|
||||
- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a";
|
||||
+ std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a";
|
||||
|
||||
CmdArgs.push_back(Args.MakeArgString(ProfileRT));
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Longbons <b.r.longbons@gmail.com>
|
||||
Date: Fri, 29 Jun 2012 12:58:34 -0700
|
||||
Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue
|
||||
lines in a function."
|
||||
|
||||
This meants that the debugger could find meaningful line information.
|
||||
|
||||
This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
|
||||
---
|
||||
lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++-----
|
||||
test/DebugInfo/X86/ending-run.ll | 6 ++----
|
||||
2 files changed, 4 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
|
||||
index 3e79a6d..24aedfb 100644
|
||||
--- lib/CodeGen/AsmPrinter/DwarfDebug.cpp
|
||||
+++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp
|
||||
@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) {
|
||||
if (!MI->isDebugValue()) {
|
||||
DebugLoc DL = MI->getDebugLoc();
|
||||
if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
|
||||
- unsigned Flags = 0;
|
||||
+ unsigned Flags = DWARF2_FLAG_IS_STMT;
|
||||
PrevInstLoc = DL;
|
||||
if (DL == PrologEndLoc) {
|
||||
Flags |= DWARF2_FLAG_PROLOGUE_END;
|
||||
PrologEndLoc = DebugLoc();
|
||||
}
|
||||
- if (PrologEndLoc.isUnknown())
|
||||
- Flags |= DWARF2_FLAG_IS_STMT;
|
||||
-
|
||||
if (!DL.isUnknown()) {
|
||||
const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
|
||||
recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
|
||||
@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) {
|
||||
MF->getFunction()->getContext());
|
||||
recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(),
|
||||
FnStartDL.getScope(MF->getFunction()->getContext()),
|
||||
- 0);
|
||||
+ DWARF2_FLAG_IS_STMT);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll
|
||||
index 6935c47..0cd3de1 100644
|
||||
--- test/DebugInfo/X86/ending-run.ll
|
||||
+++ test/DebugInfo/X86/ending-run.ll
|
||||
@@ -1,11 +1,9 @@
|
||||
; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
|
||||
; RUN: llvm-dwarfdump %t | FileCheck %s
|
||||
|
||||
-; Check that the line table starts at 7, not 4, but that the first
|
||||
-; statement isn't until line 8.
|
||||
+; Check that the line table starts at 7, not 4.
|
||||
|
||||
-; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt
|
||||
-; CHECK: 0x0000000000000000 7 0 1 0
|
||||
+; CHECK: 0x0000000000000000 7 0 1 0 is_stmt
|
||||
; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end
|
||||
|
||||
define i32 @callee(i32 %x) nounwind uwtable ssp {
|
||||
--
|
||||
1.7.10
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Template file for 'llvm'
|
||||
pkgname=llvm
|
||||
version=3.2
|
||||
version=3.3
|
||||
wrksrc="llvm-${version}.src"
|
||||
revision=3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-expensive-checks --disable-debug-runtime
|
||||
--enable-targets=all --enable-bindings=none --enable-optimize
|
||||
|
|
@ -14,18 +14,12 @@ homepage="http://www.llvm.org"
|
|||
license="BSD"
|
||||
distfiles="
|
||||
http://www.llvm.org/releases/${version}/llvm-${version}.src.tar.gz
|
||||
http://www.llvm.org/releases/${version}/clang-${version}.src.tar.gz
|
||||
http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-${version}.src.tar.xz"
|
||||
http://www.llvm.org/releases/${version}/cfe-${version}.src.tar.gz
|
||||
http://www.llvm.org/releases/${version}/compiler-rt-${version}.src.tar.gz"
|
||||
checksum="
|
||||
125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343
|
||||
2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658
|
||||
a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1"
|
||||
|
||||
# Do not build huge debug pkgs.
|
||||
disable_debug=yes
|
||||
|
||||
# XXX gzip compressed wtf?!!
|
||||
skip_extraction="compiler-rt-${version}.src.tar.xz"
|
||||
68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578
|
||||
b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996
|
||||
0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423"
|
||||
|
||||
# XXX Investigate ocaml bindings.
|
||||
hostmakedepends="groff bsdtar perl python"
|
||||
|
|
@ -33,11 +27,9 @@ makedepends="libffi-devel"
|
|||
|
||||
post_extract() {
|
||||
# Move clang files into the llvm source.
|
||||
if [ -d ${XBPS_BUILDDIR}/clang-${version}.src ]; then
|
||||
mv ${XBPS_BUILDDIR}/clang-${version}.src ${wrksrc}/tools/clang
|
||||
if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then
|
||||
mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang
|
||||
fi
|
||||
# XXX unpack with bsdtar due to being gzip compressed!
|
||||
bsdtar xf ${XBPS_SRCDISTDIR}/compiler-rt-${version}.src.tar.xz -C ${XBPS_BUILDDIR}
|
||||
# Move compiler-rt files into the llvm source.
|
||||
if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then
|
||||
mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src \
|
||||
|
|
@ -55,9 +47,6 @@ pre_configure() {
|
|||
tools/llvm-config/llvm-config.cpp
|
||||
sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \
|
||||
autoconf/configure.ac configure
|
||||
|
||||
# Drop "svn" suffix from version string
|
||||
sed -i 's/3\.2svn/3.2/g' configure
|
||||
}
|
||||
|
||||
post_install() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue