diff options
| author | sylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d> | 2014-08-08 10:57:06 +0000 |
|---|---|---|
| committer | sylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d> | 2014-08-08 10:57:06 +0000 |
| commit | f2c0b87580978c614daff5de74488350eb64e52b (patch) | |
| tree | 829f8ed899c5a2c156d80ddafbc6be24cca10c24 | |
| parent | d960090a190c2404cea8c6d680f205280e540dad (diff) | |
| download | llvm-toolchain-3.5-f2c0b87580978c614daff5de74488350eb64e52b.tar.gz | |
update patches
git-svn-id: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.5@1330 670adf90-79fe-46c2-b027-9eb1e76e7c7d
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/hurd-EIEIO-undef.diff | 22 | ||||
| -rw-r--r-- | debian/patches/kfreebsd-lldb-gdbserver.diff | 13 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 34 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 46529a5..55bc9a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-3.5 (1:3.5~+rc2-1) unstable; urgency=medium + + * Fix the version + * try to build lldb-gdbserver under kfreebsd (kfreebsd-lldb-gdbserver.diff) + * Second try to fix build under HURD (hurd-EIEIO-undef.diff) + + -- Sylvestre Ledru <sylvestre@debian.org> Fri, 08 Aug 2014 10:42:13 +0200 + llvm-toolchain-3.5 (1:3.5~+rc2-1~exp1) unstable; urgency=medium * New snapshot release diff --git a/debian/patches/hurd-EIEIO-undef.diff b/debian/patches/hurd-EIEIO-undef.diff index 02f409e..a7c30e5 100644 --- a/debian/patches/hurd-EIEIO-undef.diff +++ b/debian/patches/hurd-EIEIO-undef.diff @@ -1,14 +1,14 @@ -Index: llvm-toolchain-3.4-3.4.2/utils/TableGen/InstrInfoEmitter.cpp +Index: llvm-toolchain-snapshot-3.6~svn215188/utils/TableGen/CodeEmitterGen.cpp =================================================================== ---- llvm-toolchain-3.4-3.4.2.orig/utils/TableGen/InstrInfoEmitter.cpp -+++ llvm-toolchain-3.4-3.4.2/utils/TableGen/InstrInfoEmitter.cpp -@@ -569,6 +569,9 @@ void InstrInfoEmitter::emitEnums(raw_ost - OS << "\n#ifdef GET_INSTRINFO_ENUM\n"; - OS << "#undef GET_INSTRINFO_ENUM\n"; +--- llvm-toolchain-snapshot-3.6~svn215188.orig/utils/TableGen/CodeEmitterGen.cpp ++++ llvm-toolchain-snapshot-3.6~svn215188/utils/TableGen/CodeEmitterGen.cpp +@@ -241,6 +241,9 @@ void CodeEmitterGen::run(raw_ostream &o) + const std::vector<const CodeGenInstruction*> &NumberedInstructions = + Target.getInstructionsByEnumValue(); -+ OS << "// Undef for HURD\n"; -+ OS << "#ifdef EIEIO\n#undef EIEIO\n#endif\n"; ++ o << "// Undef for HURD\n"; ++ o << "#ifdef EIEIO\n#undef EIEIO\n#endif\n"; + - OS << "namespace llvm {\n\n"; - - CodeGenTarget Target(Records); + // Emit function declaration + o << "uint64_t " << Target.getName(); + if (MCEmitter) diff --git a/debian/patches/kfreebsd-lldb-gdbserver.diff b/debian/patches/kfreebsd-lldb-gdbserver.diff new file mode 100644 index 0000000..6b10091 --- /dev/null +++ b/debian/patches/kfreebsd-lldb-gdbserver.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-3.5-3.5~+rc2/lldb/tools/Makefile +=================================================================== +--- llvm-toolchain-3.5-3.5~+rc2.orig/lldb/tools/Makefile ++++ llvm-toolchain-3.5-3.5~+rc2/lldb/tools/Makefile +@@ -13,7 +13,7 @@ include $(LLDB_LEVEL)/../../Makefile.con + DIRS := + + # enable lldb-gdbserver for supported platforms +-ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux))) ++ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux GNU/kFreeBSD))) + DIRS += lldb-gdbserver + endif + diff --git a/debian/patches/series b/debian/patches/series index 4851d1f..8ffd02a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,3 +40,5 @@ follow-parallel-var.diff lldb-kfreebsd.diff hurd-EIEIO-undef.diff disable-powerpc-test.diff +kfreebsd-lldb-gdbserver.diff +fix-lldb-3.5-rc2.diff |