proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-12 09:21:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refresh + integration of all patches

Browse Source
This commit is contained in:
Sylvestre Ledru 2013-01-12 14:42:43 +00:00
parent 512c45420d
commit 1f945ae6b4
27 changed files with 324 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debian/patches/0003-Debian-version-info-and-bugreport.patch vendored Normal file
View File

@ -0,0 +1,23 @@
Index: llvm-3.1-3.1/lib/Support/CommandLine.cpp
===================================================================
--- llvm-3.1-3.1.orig/lib/Support/CommandLine.cpp 2012-03-12 11:51:06.000000000 +0100
+++ llvm-3.1-3.1/lib/Support/CommandLine.cpp 2012-09-18 11:13:05.154409249 +0200
@@ -31,6 +31,7 @@
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Config/config.h"
+#include "../../debian.h"
#include <cerrno>
#include <cstdlib>
using namespace llvm;
@@ -1351,6 +1352,10 @@
OS << LLVM_VERSION_INFO;
#endif
OS << "\n ";
+#ifdef LLVM_DEBIAN_INFO
+ OS << LLVM_DEBIAN_INFO;
+#endif
+ OS << "\n ";
#ifndef __OPTIMIZE__
OS << "DEBUG build";
#else

26
debian/patches/0021-shared-lib-debian.patch vendored Normal file
View File

@ -0,0 +1,26 @@
Index: llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile
===================================================================
--- llvm-3.1-3.1~+rc3.orig/tools/llvm-shlib/Makefile 2012-05-20 16:17:40.498257510 +0200
+++ llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile 2012-05-20 16:17:53.926257341 +0200
@@ -39,6 +39,12 @@
LLVMLibsPaths := $(IncludeInLibLlvm)
$(LibName.SO): $(LLVMLibsPaths)
+ $(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
+ $(LIBRARYNAME)$(SHLIBEXT)
+ $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \
+ $(ProjLibsOptions) $(LLVMLibsOptions) $(LIBS)
+ mv $(LibName.SO) $(LibName.SO).1
+ ln -s $(notdir $(LibName.SO)).1 $(LibName.SO)
ifeq ($(HOST_OS),Darwin)
# set dylib internal version number to llvmCore submission number
@@ -71,7 +77,7 @@
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
# Add soname to the library.
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions
endif
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU))

33
debian/patches/0023-link-libopagent.patch vendored Normal file
View File

@ -0,0 +1,33 @@
Index: llvm-3.2-3.2~rc1/configure
===================================================================
--- llvm-3.2-3.2~rc1.orig/configure 2012-11-13 21:14:33.000000000 +0100
+++ llvm-3.2-3.2~rc1/configure 2012-11-15 11:03:52.000000000 +0100
@@ -13183,7 +13183,7 @@
case $llvm_cv_os_type in
Linux)
if test -n "$llvm_cv_oppath" ; then
- LIBS="$LIBS -lopagent -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}"
+ #LIBS="$LIBS -lopagent -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}"
{ echo "$as_me:$LINENO: checking for library containing bfd_init" >&5
echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; }
if test "${ac_cv_search_bfd_init+set}" = set; then
@@ -13279,7 +13279,7 @@
echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; }
ac_res=$ac_cv_search_bfd_init
if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ test "$ac_res" = "none required" || true
fi
@@ -13315,8 +13315,8 @@
if test -z "$ac_lib"; then
ac_res="none required"
else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ ac_res="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed"
+ LIBS="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed $ac_func_search_save_LIBS"
fi
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"

43
debian/patches/0041-undef-PPC-macro.diff vendored Normal file
View File

@ -0,0 +1,43 @@
Index: llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h
===================================================================
--- llvm-3.2-3.2~rc1.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2012-11-13 21:14:34.000000000 +0100
+++ llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2012-11-15 11:04:00.000000000 +0100
@@ -44,6 +44,10 @@
uint8_t OSABI);
} // End llvm namespace
+// Generated files will use "namespace PPC". To avoid symbol clash,
+// undefine PPC here. PPC may be predefined on some hosts.
+#undef PPC
+
// Defines symbolic names for PowerPC registers. This defines a mapping from
// register name to register number.
//
Index: llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h
===================================================================
--- llvm-3.2-3.2~rc1.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2012-11-13 21:14:34.000000000 +0100
+++ llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2012-11-15 11:04:00.000000000 +0100
@@ -14,6 +14,10 @@
#ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H
#define LLVM_TARGET_POWERPC_PPCPREDICATES_H
+// Generated files will use "namespace PPC". To avoid symbol clash,
+// undefine PPC here. PPC may be predefined on some hosts.
+#undef PPC
+
namespace llvm {
namespace PPC {
/// Predicate - These are "(BI << 5) | BO" for various predicates.
Index: llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h
===================================================================
--- llvm-3.2-3.2~rc1.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2012-11-13 21:14:34.000000000 +0100
+++ llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2012-11-15 11:04:00.000000000 +0100
@@ -12,6 +12,8 @@
#include "llvm/MC/MCFixup.h"
+#undef PPC
+
namespace llvm {
namespace PPC {
enum Fixups {

13
debian/patches/0044-soname.diff vendored Normal file
View File

@ -0,0 +1,13 @@
Index: llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile
===================================================================
--- llvm-3.1-3.1~+rc3.orig/tools/llvm-shlib/Makefile 2012-05-20 16:17:53.926257341 +0200
+++ llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile 2012-05-20 16:17:56.278257311 +0200
@@ -77,7 +77,7 @@
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
# Add soname to the library.
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions
endif
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU))

65
debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch vendored Normal file
View File

@ -0,0 +1,65 @@
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
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/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
--- a/test/DebugInfo/X86/ending-run.ll
+++ b/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

26
debian/patches/0047-version-name.diff vendored Normal file
View File

@ -0,0 +1,26 @@
Index: llvm-3.2-3.2~rc1/autoconf/configure.ac
===================================================================
--- llvm-3.2-3.2~rc1.orig/autoconf/configure.ac 2012-11-13 21:14:34.000000000 +0100
+++ llvm-3.2-3.2~rc1/autoconf/configure.ac 2012-11-15 14:36:20.000000000 +0100
@@ -31,7 +31,7 @@
dnl===-----------------------------------------------------------------------===
dnl Initialize autoconf and define the package name, version number and
dnl address for reporting bugs.
-AC_INIT([LLVM],[3.2svn],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.2],[http://llvm.org/bugs/])
AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API])
AC_DEFINE([LLVM_VERSION_MINOR], [2], [Minor version of the LLVM API])
Index: llvm-3.2-3.2~rc1/configure
===================================================================
--- llvm-3.2-3.2~rc1.orig/configure 2012-11-15 12:28:46.000000000 +0100
+++ llvm-3.2-3.2~rc1/configure 2012-11-15 14:36:15.000000000 +0100
@@ -561,7 +561,7 @@
# Identity of this package.
PACKAGE_NAME='LLVM'
PACKAGE_TARNAME='llvm'
-PACKAGE_VERSION='3.2svn'
+PACKAGE_VERSION='3.2'
PACKAGE_STRING='LLVM 3.2svn'
PACKAGE_BUGREPORT='http://llvm.org/bugs/'

6
debian/patches/18-soname.patch vendored
View File

@ -1,7 +1,7 @@
Index: clang-3.2~rc1/tools/clang/tools/libclang/Makefile
Index: clang-3.2~rc1/clang/tools/libclang/Makefile
===================================================================
--- clang-3.2~rc1.orig/tools/clang/tools/libclang/Makefile 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/tools/libclang/Makefile 2012-11-17 15:42:01.000000000 +0100
--- clang-3.2~rc1.orig/clang/tools/libclang/Makefile 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/clang/tools/libclang/Makefile 2012-11-17 15:42:01.000000000 +0100
@@ -14,6 +14,7 @@
LINK_LIBS_IN_SHARED = 1

6
debian/patches/19-clang_debian_version.patch vendored
View File

@ -1,7 +1,7 @@
Index: clang-3.2~rc1/tools/clang/lib/Basic/Version.cpp
Index: clang-3.2~rc1/clang/lib/Basic/Version.cpp
===================================================================
--- clang-3.2~rc1.orig/tools/clang/lib/Basic/Version.cpp 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/lib/Basic/Version.cpp 2012-11-17 15:43:03.000000000 +0100
--- clang-3.2~rc1.orig/clang/lib/Basic/Version.cpp 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/clang/lib/Basic/Version.cpp 2012-11-17 15:43:03.000000000 +0100
@@ -15,6 +15,7 @@
#include "clang/Basic/LLVM.h"
#include "llvm/Support/raw_ostream.h"

6
debian/patches/20-vendor.patch vendored
View File

@ -1,7 +1,7 @@
Index: clang-3.2~rc1/tools/clang/Makefile
Index: clang-3.2~rc1/clang/Makefile
===================================================================
--- clang-3.2~rc1.orig/tools/clang/Makefile 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/Makefile 2012-11-17 15:43:15.000000000 +0100
--- clang-3.2~rc1.orig/clang/Makefile 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/clang/Makefile 2012-11-17 15:43:15.000000000 +0100
@@ -47,9 +47,7 @@
# Set common Clang build flags.

8
debian/patches/21-searchPathHeaders.diff vendored
View File

@ -1,8 +1,8 @@
Index: clang-3.2~rc1/tools/clang/lib/Driver/ToolChains.cpp
Index: llvm-3.2.src/clang/lib/Driver/ToolChains.cpp
===================================================================
--- clang-3.2~rc1.orig/tools/clang/lib/Driver/ToolChains.cpp 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/lib/Driver/ToolChains.cpp 2012-11-17 15:43:18.000000000 +0100
@@ -2174,6 +2174,11 @@
--- llvm-3.2.src.orig/clang/lib/Driver/ToolChains.cpp 2012-12-16 16:59:27.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:33:39.427064577 +0100
@@ -2237,6 +2237,11 @@
addSystemInclude(DriverArgs, CC1Args, P.str());
}

28
debian/patches/23-strlcpy_strlcat_warning_removed.diff vendored
View File

@ -1,8 +1,8 @@
Index: clang-3.2~rc1/tools/clang/include/clang/Basic/Builtins.def
Index: llvm-3.2.src/clang/include/clang/Basic/Builtins.def
===================================================================
--- clang-3.2~rc1.orig/tools/clang/include/clang/Basic/Builtins.def 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/include/clang/Basic/Builtins.def 2012-11-17 15:43:20.000000000 +0100
@@ -461,8 +461,8 @@
--- llvm-3.2.src.orig/clang/include/clang/Basic/Builtins.def 2012-11-28 23:01:30.000000000 +0100
+++ llvm-3.2.src/clang/include/clang/Basic/Builtins.def 2013-01-12 15:33:43.299064490 +0100
@@ -462,8 +462,8 @@
BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF")
@ -13,7 +13,7 @@ Index: clang-3.2~rc1/tools/clang/include/clang/Basic/Builtins.def
BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
@@ -755,8 +755,8 @@
@@ -756,8 +756,8 @@
LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_LANGUAGES)
LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_LANGUAGES)
// non-standard but very common
@ -24,10 +24,10 @@ Index: clang-3.2~rc1/tools/clang/include/clang/Basic/Builtins.def
// id objc_msgSend(id, SEL, ...)
LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG)
Index: clang-3.2~rc1/tools/clang/lib/Sema/SemaChecking.cpp
Index: llvm-3.2.src/clang/lib/Sema/SemaChecking.cpp
===================================================================
--- clang-3.2~rc1.orig/tools/clang/lib/Sema/SemaChecking.cpp 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/lib/Sema/SemaChecking.cpp 2012-11-17 15:43:20.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/Sema/SemaChecking.cpp 2012-11-08 01:41:20.000000000 +0100
+++ llvm-3.2.src/clang/lib/Sema/SemaChecking.cpp 2013-01-12 15:33:43.303064490 +0100
@@ -576,9 +576,10 @@
return false;
@ -42,10 +42,10 @@ Index: clang-3.2~rc1/tools/clang/lib/Sema/SemaChecking.cpp
CheckStrncatArguments(TheCall, FnInfo);
else
CheckMemaccessArguments(TheCall, CMId, FnInfo);
Index: clang-3.2~rc1/tools/clang/lib/AST/Decl.cpp
Index: llvm-3.2.src/clang/lib/AST/Decl.cpp
===================================================================
--- clang-3.2~rc1.orig/tools/clang/lib/AST/Decl.cpp 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/lib/AST/Decl.cpp 2012-11-17 15:43:20.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/AST/Decl.cpp 2012-11-12 05:10:23.000000000 +0100
+++ llvm-3.2.src/clang/lib/AST/Decl.cpp 2013-01-12 15:33:43.303064490 +0100
@@ -2394,10 +2394,10 @@
case Builtin::BImemmove:
return Builtin::BImemmove;
@ -61,10 +61,10 @@ Index: clang-3.2~rc1/tools/clang/lib/AST/Decl.cpp
case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp:
Index: clang-3.2~rc1/tools/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
Index: llvm-3.2.src/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
===================================================================
--- clang-3.2~rc1.orig/tools/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2012-11-17 15:43:20.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2012-11-02 02:54:06.000000000 +0100
+++ llvm-3.2.src/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-01-12 15:33:43.303064490 +0100
@@ -237,9 +237,9 @@
case Builtin::BIstrncpy:
case Builtin::BIstrncat:

6
debian/patches/26-disable_SplitsOnSpaces.diff vendored
View File

@ -1,7 +1,7 @@
Index: clang-3.2~rc1/tools/clang/unittests/Tooling/CompilationDatabaseTest.cpp
Index: llvm-3.2.src/clang/unittests/Tooling/CompilationDatabaseTest.cpp
===================================================================
--- clang-3.2~rc1.orig/tools/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2012-11-17 15:43:28.000000000 +0100
--- llvm-3.2.src.orig/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2012-10-08 22:32:51.000000000 +0200
+++ llvm-3.2.src/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-01-12 15:33:49.771064346 +0100
@@ -262,19 +262,6 @@
return FoundCommand.CommandLine;
}

6
debian/patches/26-set-correct-float-abi.diff vendored
View File

@ -18,10 +18,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
Index: clang-3.2~rc1/tools/clang/lib/Driver/Tools.cpp
Index: llvm-3.2.src/clang/lib/Driver/Tools.cpp
===================================================================
--- clang-3.2~rc1.orig/tools/clang/lib/Driver/Tools.cpp 2012-11-13 21:13:57.000000000 +0100
+++ clang-3.2~rc1/tools/clang/lib/Driver/Tools.cpp 2012-11-19 17:50:05.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/Driver/Tools.cpp 2012-11-21 08:56:23.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/Tools.cpp 2013-01-12 15:33:51.947064297 +0100
@@ -671,7 +671,7 @@
FloatABI = "hard";
break;

6
debian/patches/27-fix_clang_stdint.diff vendored
View File

@ -1,5 +1,7 @@
--- a/tools/clang/lib/Headers/stdint.h 2011-04-30 23:02:59.000000000 +0400
+++ b/tools/clang/lib/Headers/stdint.h 2012-08-03 12:54:22.851687999 +0400
Index: llvm-3.2.src/clang/lib/Headers/stdint.h
===================================================================
--- llvm-3.2.src.orig/clang/lib/Headers/stdint.h 2011-04-30 21:02:59.000000000 +0200
+++ llvm-3.2.src/clang/lib/Headers/stdint.h 2013-01-12 15:33:50.891064321 +0100
@@ -22,8 +22,6 @@
*
\*===----------------------------------------------------------------------===*/

6
debian/patches/28-gcc-4.7-paths.diff vendored
View File

@ -1,7 +1,7 @@
Index: clang-3.2/tools/clang/lib/Driver/ToolChains.cpp
Index: llvm-3.2.src/clang/lib/Driver/ToolChains.cpp
===================================================================
--- clang-3.2.orig/tools/clang/lib/Driver/ToolChains.cpp 2013-01-06 09:30:46.047046507 +0100
+++ clang-3.2/tools/clang/lib/Driver/ToolChains.cpp 2013-01-06 11:22:09.982805979 +0100
--- llvm-3.2.src.orig/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:33:39.427064577 +0100
+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:34:27.855063496 +0100
@@ -2124,7 +2124,7 @@
const llvm::Triple &GCCTriple = GCCInstallation.getTriple();
const std::string &LibPath = GCCInstallation.getParentLibPath();

12
debian/patches/29-hurd.diff vendored
View File

@ -1,7 +1,7 @@
Index: clang-3.2~rc3/tools/clang/lib/Lex/HeaderSearch.cpp
Index: llvm-3.2.src/clang/lib/Lex/HeaderSearch.cpp
===================================================================
--- clang-3.2~rc3.orig/tools/clang/lib/Lex/HeaderSearch.cpp 2012-11-06 20:39:40.000000000 +0100
+++ clang-3.2~rc3/tools/clang/lib/Lex/HeaderSearch.cpp 2012-12-11 18:49:49.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/Lex/HeaderSearch.cpp 2012-11-06 20:39:40.000000000 +0100
+++ llvm-3.2.src/clang/lib/Lex/HeaderSearch.cpp 2013-01-12 15:34:28.831063474 +0100
@@ -25,6 +25,11 @@
#include <cstdio>
using namespace clang;
@ -14,10 +14,10 @@ Index: clang-3.2~rc3/tools/clang/lib/Lex/HeaderSearch.cpp
const IdentifierInfo *
HeaderFileInfo::getControllingMacro(ExternalIdentifierLookup *External) {
if (ControllingMacro)
Index: clang-3.2~rc3/tools/clang/lib/Lex/ModuleMap.cpp
Index: llvm-3.2.src/clang/lib/Lex/ModuleMap.cpp
===================================================================
--- clang-3.2~rc3.orig/tools/clang/lib/Lex/ModuleMap.cpp 2012-11-06 20:41:11.000000000 +0100
+++ clang-3.2~rc3/tools/clang/lib/Lex/ModuleMap.cpp 2012-12-11 18:50:00.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/Lex/ModuleMap.cpp 2012-11-06 20:41:11.000000000 +0100
+++ llvm-3.2.src/clang/lib/Lex/ModuleMap.cpp 2013-01-12 15:34:28.831063474 +0100
@@ -30,6 +30,11 @@
#include <stdlib.h>
using namespace clang;

12
debian/patches/30-kfreebsd.diff vendored
View File

@ -1,7 +1,7 @@
Index: clang-3.2/tools/clang/lib/Driver/ToolChains.h
Index: llvm-3.2.src/clang/lib/Driver/ToolChains.h
===================================================================
--- clang-3.2.orig/tools/clang/lib/Driver/ToolChains.h 2012-11-21 09:33:40.000000000 +0100
+++ clang-3.2/tools/clang/lib/Driver/ToolChains.h 2012-12-25 11:47:02.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/Driver/ToolChains.h 2012-11-21 09:33:40.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/ToolChains.h 2013-01-12 15:34:29.815063452 +0100
@@ -131,6 +131,8 @@
virtual bool IsUnwindTablesDefault() const;
virtual bool isPICDefault() const;
@ -11,10 +11,10 @@ Index: clang-3.2/tools/clang/lib/Driver/ToolChains.h
protected:
/// \name ToolChain Implementation Helper Functions
Index: clang-3.2/tools/clang/lib/Driver/ToolChains.cpp
Index: llvm-3.2.src/clang/lib/Driver/ToolChains.cpp
===================================================================
--- clang-3.2.orig/tools/clang/lib/Driver/ToolChains.cpp 2012-12-25 11:45:53.000000000 +0100
+++ clang-3.2/tools/clang/lib/Driver/ToolChains.cpp 2012-12-25 11:46:29.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:34:27.855063496 +0100
+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:34:29.815063452 +0100
@@ -943,6 +943,13 @@
return GoodVersion;
}

6
debian/patches/50-lldb-segfaultgcc.diff vendored
View File

@ -1,7 +1,7 @@
Index: source/Core/cxa_demangle.cpp
Index: lldb-3.2/lldb/source/Core/cxa_demangle.cpp
===================================================================
--- source/Core/cxa_demangle.cpp (revision 167708)
+++ source/Core/cxa_demangle.cpp (working copy)
--- lldb-3.2.orig/lldb/source/Core/cxa_demangle.cpp (revision 167708)
+++ lldb-3.2/lldb/source/Core/cxa_demangle.cpp (working copy)
@@ -133,9 +133,14 @@
{
for (int i = 0; i < 2*indent; ++i)

6
debian/patches/51-lldb-hasBCPLComments.diff vendored
View File

@ -1,7 +1,7 @@
Index: source/Symbol/ClangASTContext.cpp
Index: llvm-3.2.src/lldb/source/Symbol/ClangASTContext.cpp
===================================================================
--- source/Symbol/ClangASTContext.cpp (revision 167750)
+++ source/Symbol/ClangASTContext.cpp (revision 167751)
--- llvm-3.2.src.orig/lldb/source/Symbol/ClangASTContext.cpp 2013-01-10 17:51:58.000000000 +0100
+++ llvm-3.2.src/lldb/source/Symbol/ClangASTContext.cpp 2013-01-12 15:38:43.799057785 +0100
@@ -257,7 +257,7 @@
}

6
debian/patches/52-lldb-declaration.diff vendored
View File

@ -1,7 +1,7 @@
Index: include/lldb/Target/StopInfo.h
Index: llvm-3.2.src/lldb/include/lldb/Target/StopInfo.h
===================================================================
--- include/lldb/Target/StopInfo.h (revision 168826)
+++ include/lldb/Target/StopInfo.h (revision 168827)
--- llvm-3.2.src.orig/lldb/include/lldb/Target/StopInfo.h 2013-01-10 17:49:46.000000000 +0100
+++ llvm-3.2.src/lldb/include/lldb/Target/StopInfo.h 2013-01-12 15:38:44.691057765 +0100
@@ -23,7 +23,7 @@
class StopInfo

6
debian/patches/53-lldb-lambda.diff vendored
View File

@ -1,7 +1,7 @@
Index: source/Core/cxa_demangle.cpp
Index: lldb-3.2/lldb/source/Core/cxa_demangle.cpp
===================================================================
--- source/Core/cxa_demangle.cpp (revision 168834)
+++ source/Core/cxa_demangle.cpp (revision 168835)
--- lldb-3.2.orig/lldb/source/Core/cxa_demangle.cpp (revision 168834)
+++ lldb-3.2/lldb/source/Core/cxa_demangle.cpp (revision 168835)
@@ -3932,11 +3932,11 @@
}
};

6
debian/patches/54-lldb-cpp-declaration.diff vendored
View File

@ -1,7 +1,7 @@
Index: scripts/Python/python-wrapper.swig
Index: lldb-3.2/lldb/scripts/Python/python-wrapper.swig
===================================================================
--- scripts/Python/python-wrapper.swig (revision 168900)
+++ scripts/Python/python-wrapper.swig (revision 168901)
--- lldb-3.2.orig/lldb/scripts/Python/python-wrapper.swig (revision 168900)
+++ lldb-3.2/lldb/scripts/Python/python-wrapper.swig (revision 168901)
@@ -964,6 +964,10 @@
#include "lldb/API/SBInputReader.h"
#include "lldb/API/SBDebugger.h"

18
debian/patches/55-lldb-cpp-declaration.diff vendored
View File

@ -1,7 +1,7 @@
Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp
Index: lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp
===================================================================
--- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp (revision 169184)
+++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp (revision 169185)
--- lldb-3.2.orig/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp (revision 169184)
+++ lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp (revision 169185)
@@ -344,7 +344,7 @@
while (*name_cursor != '\0')
@ -11,10 +11,10 @@ Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.
if (!colon_loc)
{
selector_components.push_back(&ast_ctx.Idents.get(llvm::StringRef(name_cursor)));
Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
Index: lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
===================================================================
--- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (revision 169184)
+++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (revision 169185)
--- lldb-3.2.orig/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (revision 169184)
+++ lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (revision 169185)
@@ -727,7 +727,8 @@
lldb::addr_t load_addr) :
m_process(process),
@ -34,10 +34,10 @@ Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.c
};
class ClassDescriptorV2 : public ObjCLanguageRuntime::ClassDescriptor
Index: source/Interpreter/CommandObject.cpp
Index: lldb-3.2/lldb/source/Interpreter/CommandObject.cpp
===================================================================
--- source/Interpreter/CommandObject.cpp (revision 169184)
+++ source/Interpreter/CommandObject.cpp (revision 169185)
--- lldb-3.2.orig/lldb/source/Interpreter/CommandObject.cpp (revision 169184)
+++ lldb-3.2/lldb/source/Interpreter/CommandObject.cpp (revision 169185)
@@ -752,9 +752,9 @@
StreamString sstr;
sstr << "One of the following languages:\n";

18
debian/patches/56-lldb-python-path.diff vendored
View File

@ -1,7 +1,7 @@
Index: source/Utility/Makefile
Index: lldb-3.2/lldb/source/Utility/Makefile
===================================================================
--- source/Utility/Makefile (revision 169766)
+++ source/Utility/Makefile (revision 169767)
--- lldb-3.2.orig/lldb/source/Utility/Makefile (revision 169766)
+++ lldb-3.2/lldb/source/Utility/Makefile (revision 169767)
@@ -12,4 +12,11 @@
BUILD_ARCHIVE = 1
NO_PEDANTIC = 1
@ -14,10 +14,10 @@ Index: source/Utility/Makefile
+
+
include $(LLDB_LEVEL)/Makefile
Index: source/Core/Makefile
Index: lldb-3.2/lldb/source/Core/Makefile
===================================================================
--- source/Core/Makefile (revision 169766)
+++ source/Core/Makefile (revision 169767)
--- lldb-3.2.orig/lldb/source/Core/Makefile (revision 169766)
+++ lldb-3.2/lldb/source/Core/Makefile (revision 169767)
@@ -11,4 +11,15 @@
LIBRARYNAME := lldbCore
BUILD_ARCHIVE = 1
@ -34,10 +34,10 @@ Index: source/Core/Makefile
+endif
+
include $(LLDB_LEVEL)/Makefile
Index: lib/Makefile
Index: lldb-3.2/lldb/lib/Makefile
===================================================================
--- lib/Makefile (revision 169766)
+++ lib/Makefile (revision 169767)
--- lldb-3.2.orig/lldb/lib/Makefile (revision 169766)
+++ lldb-3.2/lldb/lib/Makefile (revision 169767)
@@ -67,6 +67,14 @@
lldbPluginPlatformLinux.a \
lldbPluginPlatformFreeBSD.a

6
debian/patches/profile_rt.diff vendored
View File

@ -1,7 +1,7 @@
Index: clang-3.2~rc1/tools/clang/lib/Driver/Tools.cpp
Index: llvm-3.2.src/clang/lib/Driver/Tools.cpp
===================================================================
--- clang-3.2~rc1.orig/tools/clang/lib/Driver/Tools.cpp 2012-11-27 12:21:42.000000000 +0100
+++ clang-3.2~rc1/tools/clang/lib/Driver/Tools.cpp 2012-11-27 18:22:13.000000000 +0100
--- llvm-3.2.src.orig/clang/lib/Driver/Tools.cpp 2013-01-12 15:33:51.947064297 +0100
+++ llvm-3.2.src/clang/lib/Driver/Tools.cpp 2013-01-12 15:34:26.679063522 +0100
@@ -32,10 +32,13 @@
#include "llvm/Support/Process.h"
#include "llvm/Support/ErrorHandling.h"

8
debian/patches/series vendored
View File

@ -13,7 +13,13 @@ profile_rt.diff
50-lldb-segfaultgcc.diff
51-lldb-hasBCPLComments.diff
52-lldb-declaration.diff
53-lldb-lambda.diff
54-lldb-cpp-declaration.diff
55-lldb-cpp-declaration.diff
56-lldb-python-path.diff
0003-Debian-version-info-and-bugreport.patch
0021-shared-lib-debian.patch
0023-link-libopagent.patch
0041-undef-PPC-macro.diff
0044-soname.diff
0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch
0047-version-name.diff