From 1c988c612da018c0cd7538b57ffe9530a7b0a154 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 28 Sep 2014 09:30:22 +0000 Subject: [PATCH] remove old and uncommented patches --- debian/patches/0010-shared-lib-paths.patch | 38 --- debian/patches/0047-version-name.diff | 28 -- debian/patches/21-searchPathHeaders.diff | 16 -- debian/patches/30-kfreebsd.diff | 28 -- debian/patches/disable-powerpc-test.diff | 10 - debian/patches/disabletestlldb.diff | 12 - debian/patches/hurd.diff | 19 -- debian/patches/include-target.diff | 13 - debian/patches/kfreebsd_ptrace_kludge.diff | 81 ------ debian/patches/kfreebsd_v2.diff | 319 --------------------- debian/patches/suffixsvn.diff | 26 -- 11 files changed, 590 deletions(-) delete mode 100644 debian/patches/0010-shared-lib-paths.patch delete mode 100644 debian/patches/0047-version-name.diff delete mode 100644 debian/patches/21-searchPathHeaders.diff delete mode 100644 debian/patches/30-kfreebsd.diff delete mode 100644 debian/patches/disable-powerpc-test.diff delete mode 100644 debian/patches/disabletestlldb.diff delete mode 100644 debian/patches/hurd.diff delete mode 100644 debian/patches/include-target.diff delete mode 100644 debian/patches/kfreebsd_ptrace_kludge.diff delete mode 100644 debian/patches/kfreebsd_v2.diff delete mode 100644 debian/patches/suffixsvn.diff diff --git a/debian/patches/0010-shared-lib-paths.patch b/debian/patches/0010-shared-lib-paths.patch deleted file mode 100644 index 0d13b6d4..00000000 --- a/debian/patches/0010-shared-lib-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Driver/ToolChains.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188146.orig/clang/lib/Driver/ToolChains.cpp 2013-08-11 10:01:30.888734802 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Driver/ToolChains.cpp 2013-08-11 10:01:30.884734801 +0200 -@@ -2337,6 +2337,14 @@ - addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); - addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); - -+ // In Debian we install LLVM lib with version string -+ // /usr/lib/llvm-X.Y/lib/LLVMGold.so -+ if (IsDebian(Distro)) { -+ addPathIfExists(SysRoot + "/usr/lib/llvm-" + CLANG_VERSION_STRING + "/lib/", -+ Paths); -+ } -+ -+ - // Try walking via the GCC triple path in case of biarch or multiarch GCC - // installations with strange symlinks. - if (GCCInstallation.isValid()) -Index: llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Driver/Tools.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188146.orig/clang/lib/Driver/Tools.cpp 2013-08-11 10:01:30.888734802 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Driver/Tools.cpp 2013-08-11 10:01:30.888734802 +0200 -@@ -6153,6 +6153,14 @@ - if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ if ( ! llvm::sys::fs::exists(Plugin)) { -+ // Plugin is not in driver-based relative path, try system libs -+ // on Debian for instance -+ std::string PluginSystem = ToolChain.GetFilePath("LLVMgold.so"); -+ if (llvm::sys::fs::exists(PluginSystem)){ -+ Plugin = PluginSystem; -+ } -+ } - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to diff --git a/debian/patches/0047-version-name.diff b/debian/patches/0047-version-name.diff deleted file mode 100644 index a6baa19a..00000000 --- a/debian/patches/0047-version-name.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: llvm-toolchain-snapshot_3.5~svn202847/autoconf/configure.ac -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn202847.orig/autoconf/configure.ac 2014-03-04 14:43:34.430731503 +0100 -+++ llvm-toolchain-snapshot_3.5~svn202847/autoconf/configure.ac 2014-03-04 14:43:53.702730643 +0100 -@@ -32,7 +32,7 @@ - dnl Initialize autoconf and define the package name, version number and - dnl address for reporting bugs. - --AC_INIT([LLVM],[3.5.0svn],[http://llvm.org/bugs/]) -+AC_INIT([LLVM],[3.5.0],[http://llvm.org/bugs/]) - - LLVM_VERSION_MAJOR=3 - LLVM_VERSION_MINOR=5 -Index: llvm-toolchain-snapshot_3.5~svn202847/configure -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn202847.orig/configure 2014-03-04 14:43:34.430731503 +0100 -+++ llvm-toolchain-snapshot_3.5~svn202847/configure 2014-03-04 14:44:24.942729247 +0100 -@@ -561,8 +561,8 @@ - # Identity of this package. - PACKAGE_NAME='LLVM' - PACKAGE_TARNAME='llvm' --PACKAGE_VERSION='3.5.0svn' --PACKAGE_STRING='LLVM 3.5.0svn' -+PACKAGE_VERSION='3.5.0' -+PACKAGE_STRING='LLVM 3.5.0' - PACKAGE_BUGREPORT='http://llvm.org/bugs/' - - ac_unique_file="lib/IR/Module.cpp" diff --git a/debian/patches/21-searchPathHeaders.diff b/debian/patches/21-searchPathHeaders.diff deleted file mode 100644 index b005d756..00000000 --- a/debian/patches/21-searchPathHeaders.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:47:04.468669903 +0100 -+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:47:04.464669903 +0100 -@@ -2529,6 +2529,11 @@ - addSystemInclude(DriverArgs, CC1Args, P.str()); - } - -+ // Under Debian, clang headers are installed into -+ // '/usr/include/clang/VERSION/include/' -+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); -+ -+ - if (DriverArgs.hasArg(options::OPT_nostdlibinc)) - return; - diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff deleted file mode 100644 index 6dba9fc8..00000000 --- a/debian/patches/30-kfreebsd.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: llvm-toolchain-3.4-3.4.1/clang/lib/Driver/ToolChains.cpp -=================================================================== ---- llvm-toolchain-3.4-3.4.1.orig/clang/lib/Driver/ToolChains.cpp 2014-04-26 01:38:13.000000000 +0200 -+++ llvm-toolchain-3.4-3.4.1/clang/lib/Driver/ToolChains.cpp 2014-05-10 12:34:16.374471699 +0200 -@@ -2588,6 +2588,10 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -+ // Under Debian, clang headers are installed into -+ // '/usr/include/clang/VERSION/include/' -+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); -+ - if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) - addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include"); - -Index: llvm-toolchain-3.4-3.4.1/lldb/source/Host/common/Host.cpp -=================================================================== ---- llvm-toolchain-3.4-3.4.1.orig/lldb/source/Host/common/Host.cpp 2013-12-16 10:49:51.000000000 +0100 -+++ llvm-toolchain-3.4-3.4.1/lldb/source/Host/common/Host.cpp 2014-05-10 12:33:20.000000000 +0200 -@@ -1586,7 +1586,7 @@ - return error; - } - --#if defined(__linux__) or defined(__FreeBSD__) -+#if defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__) - // The functions below implement process launching via posix_spawn() for Linux - // and FreeBSD. - diff --git a/debian/patches/disable-powerpc-test.diff b/debian/patches/disable-powerpc-test.diff deleted file mode 100644 index 9f4cee8b..00000000 --- a/debian/patches/disable-powerpc-test.diff +++ /dev/null @@ -1,10 +0,0 @@ -Index: llvm-toolchain-3.5-3.5~+rc2/test/CodeGen/PowerPC/unal-altivec.ll -=================================================================== ---- llvm-toolchain-3.5-3.5~+rc2.orig/test/CodeGen/PowerPC/unal-altivec.ll -+++ llvm-toolchain-3.5-3.5~+rc2/test/CodeGen/PowerPC/unal-altivec.ll -@@ -1,4 +1,5 @@ - ; RUN: llc < %s -mcpu=g5 | FileCheck %s -+; XFAIL: * - target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128-v128:128:128-n32:64" - target triple = "powerpc64-unknown-linux-gnu" - diff --git a/debian/patches/disabletestlldb.diff b/debian/patches/disabletestlldb.diff deleted file mode 100644 index 7b33002f..00000000 --- a/debian/patches/disabletestlldb.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: llvm-toolchain-3.3-3.3/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py -=================================================================== ---- llvm-toolchain-3.3-3.3.orig/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py (révision 183568) -+++ llvm-toolchain-3.3-3.3/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py (révision 183569) -@@ -21,6 +21,7 @@ - self.breakpoint_after_join_test() - - @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained -+ @skipIfLinux # Causes hangs (llvm.org/pr16170) when run using "make check" - @dwarf_test - def test_with_dwarf(self): - """Test breakpoint handling after a thread join.""" diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff deleted file mode 100644 index 6427d1d2..00000000 --- a/debian/patches/hurd.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: llvm-toolchain-3.3-3.3/clang/lib/Basic/FileManager.cpp -=================================================================== ---- llvm-toolchain-3.3-3.3.orig/clang/lib/Basic/FileManager.cpp 2013-01-26 17:29:36.000000000 +0100 -+++ llvm-toolchain-3.3-3.3/clang/lib/Basic/FileManager.cpp 2013-08-18 16:44:39.364713179 +0200 -@@ -43,6 +43,14 @@ - #if defined(LLVM_ON_UNIX) - #include - #endif -+ -+// For GNU Hurd -+#if defined(__GNU__) && !defined(PATH_MAX) -+# define PATH_MAX 4096 -+#endif -+ -+ -+ - using namespace clang; - - // FIXME: Enhance libsystem to support inode and other fields. diff --git a/debian/patches/include-target.diff b/debian/patches/include-target.diff deleted file mode 100644 index 7bdcfe38..00000000 --- a/debian/patches/include-target.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:35.377059510 +0100 -+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:39.989351664 +0100 -@@ -3241,7 +3241,7 @@ - - #ifdef __i386__ - // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him -- addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.str(), "i386-linux-gnu", GCCInstallation.getMultiarchSuffix(), DriverArgs, CC1Args); -+ addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.Text, "i386-linux-gnu", Multilib.includeSuffix(), DriverArgs, CC1Args); - #endif - - if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", diff --git a/debian/patches/kfreebsd_ptrace_kludge.diff b/debian/patches/kfreebsd_ptrace_kludge.diff deleted file mode 100644 index 0954a968..00000000 --- a/debian/patches/kfreebsd_ptrace_kludge.diff +++ /dev/null @@ -1,81 +0,0 @@ -Index: llvm-toolchain-snapshot_3.4~svn188146/lldb/source/Host/freebsd/Host.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188146.orig/lldb/source/Host/freebsd/Host.cpp 2013-08-11 10:01:39.192734591 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188146/lldb/source/Host/freebsd/Host.cpp 2013-08-11 10:01:39.188734591 +0200 -@@ -20,6 +20,35 @@ - #include - #include - -+#include -+#include -+#include -+ -+#define PT_LWPINFO 13 /* Info about the LWP that stopped. */ -+#define PT_GETNUMLWPS 14 /* get total number of threads */ -+#define PT_GETLWPLIST 15 /* get thread list */ -+ -+/* Argument structure for PT_LWPINFO. */ -+struct ptrace_lwpinfo { -+ __lwpid_t pl_lwpid; /* LWP described. */ -+ int pl_event; /* Event that stopped the LWP. */ -+#define PL_EVENT_NONE 0 -+#define PL_EVENT_SIGNAL 1 -+ int pl_flags; /* LWP flags. */ -+#define PL_FLAG_SA 0x01 /* M:N thread */ -+#define PL_FLAG_BOUND 0x02 /* M:N bound thread */ -+#define PL_FLAG_SCE 0x04 /* syscall enter point */ -+#define PL_FLAG_SCX 0x08 /* syscall leave point */ -+#define PL_FLAG_EXEC 0x10 /* exec(2) succeeded */ -+#define PL_FLAG_SI 0x20 /* siginfo is valid */ -+#define PL_FLAG_FORKED 0x40 /* new child */ -+#define PL_FLAG_CHILD 0x80 /* I am from child */ -+ sigset_t pl_sigmask; /* LWP signal mask */ -+ sigset_t pl_siglist; /* LWP pending signal */ -+ struct siginfo pl_siginfo; /* siginfo for signal */ -+ char pl_tdname[MAXCOMLEN + 1]; /* LWP name */ -+ int pl_child_pid; /* New child pid */ -+}; - - // C++ Includes - // Other libraries and framework includes -Index: llvm-toolchain-snapshot_3.4~svn188146/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188146.orig/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp 2013-08-11 10:01:39.192734591 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188146/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp 2013-08-11 10:01:39.188734591 +0200 -@@ -19,6 +19,36 @@ - #include - #include - -+#include -+#include -+#include -+ -+#define PT_LWPINFO 13 /* Info about the LWP that stopped. */ -+#define PT_GETNUMLWPS 14 /* get total number of threads */ -+#define PT_GETLWPLIST 15 /* get thread list */ -+ -+/* Argument structure for PT_LWPINFO. */ -+struct ptrace_lwpinfo { -+ __lwpid_t pl_lwpid; /* LWP described. */ -+ int pl_event; /* Event that stopped the LWP. */ -+#define PL_EVENT_NONE 0 -+#define PL_EVENT_SIGNAL 1 -+ int pl_flags; /* LWP flags. */ -+#define PL_FLAG_SA 0x01 /* M:N thread */ -+#define PL_FLAG_BOUND 0x02 /* M:N bound thread */ -+#define PL_FLAG_SCE 0x04 /* syscall enter point */ -+#define PL_FLAG_SCX 0x08 /* syscall leave point */ -+#define PL_FLAG_EXEC 0x10 /* exec(2) succeeded */ -+#define PL_FLAG_SI 0x20 /* siginfo is valid */ -+#define PL_FLAG_FORKED 0x40 /* new child */ -+#define PL_FLAG_CHILD 0x80 /* I am from child */ -+ sigset_t pl_sigmask; /* LWP signal mask */ -+ sigset_t pl_siglist; /* LWP pending signal */ -+ struct siginfo pl_siginfo; /* siginfo for signal */ -+ char pl_tdname[MAXCOMLEN + 1]; /* LWP name */ -+ int pl_child_pid; /* New child pid */ -+}; -+ - // C++ Includes - // Other libraries and framework includes - #include "lldb/Core/Error.h" diff --git a/debian/patches/kfreebsd_v2.diff b/debian/patches/kfreebsd_v2.diff deleted file mode 100644 index ca1b47e6..00000000 --- a/debian/patches/kfreebsd_v2.diff +++ /dev/null @@ -1,319 +0,0 @@ ---- a/lldb/source/Host/common/Host.cpp -+++ b/lldb/source/Host/common/Host.cpp -@@ -27,7 +27,7 @@ - #include - #include - --#elif defined (__linux__) || defined(__FreeBSD_kernel__) -+#elif defined (__linux__) || defined(__GLIBC__) - /* Linux or the FreeBSD kernel with glibc (Debian KFreeBSD for example) */ - - #include -@@ -524,7 +524,7 @@ - { - } - --#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__linux__) // see macosx/Host.mm -+#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) && !defined (__linux__) // see macosx/Host.mm - - void - Host::ThreadCreated (const char *thread_name) -@@ -544,7 +544,7 @@ - return 0; - } - --#endif // #if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__linux__) -+#endif // #if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) && !defined (__linux__) - - struct HostThreadCreateInfo - { -@@ -684,7 +684,7 @@ - return true; - } - return false; --#elif defined (__linux__) -+#elif defined (__linux__) || defined (__GLIBC__) - void *fn = dlsym (RTLD_DEFAULT, "pthread_setname_np"); - if (fn) - { -@@ -742,7 +742,7 @@ - exe_path[len] = 0; - g_program_filespec.SetFile(exe_path, false); - } --#elif defined (__FreeBSD__) -+#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) - int exe_path_mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, getpid() }; - size_t exe_path_size; - if (sysctl(exe_path_mib, 4, NULL, &exe_path_size, NULL, 0) == 0) -@@ -1180,7 +1180,7 @@ - return NULL; - } - --#if !defined (__APPLE__) && !defined (__FreeBSD__) // see macosx/Host.mm -+#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) // see macosx/Host.mm - bool - Host::GetOSBuildString (std::string &s) - { -@@ -1229,7 +1229,7 @@ - } - #endif // #if !defined (__APPLE__) && !defined(__linux__) - --#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined(__linux__) -+#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) && !defined(__linux__) - bool - Host::GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &process_info) - { -@@ -1443,7 +1443,7 @@ - static uint32_t g_num_cores = UINT32_MAX; - if (g_num_cores == UINT32_MAX) - { --#if defined(__APPLE__) or defined (__linux__) or defined (__FreeBSD__) -+#if defined(__APPLE__) or defined (__linux__) or defined (__FreeBSD__) or defined (__FreeBSD_kernel__) - - g_num_cores = ::sysconf(_SC_NPROCESSORS_ONLN); - ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -275,10 +275,12 @@ - BuildMode := Release - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS),FreeBSD) -+ ifneq ($(HOST_OS),GNU/kFreeBSD) - ifneq ($(HOST_OS),Darwin) - OmitFramePointer := -fomit-frame-pointer - endif - endif -+ endif - - CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) - C.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) -@@ -1454,7 +1456,7 @@ - endif - endif - --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD GNU)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD GNU/kFreeBSD GNU)) - ifneq ($(ARCH), Mips) - LD.Flags += -Wl,--version-script=$(LLVM_SRC_ROOT)/autoconf/ExportMap.map - endif ---- a/autoconf/configure.ac -+++ b/autoconf/configure.ac -@@ -222,11 +222,16 @@ - llvm_cv_no_link_all_option="-Wl,-noall_load" - llvm_cv_os_type="Minix" - llvm_cv_platform_type="Unix" ;; -- *-*-freebsd* | *-*-kfreebsd-gnu) -+ *-*-freebsd*) - llvm_cv_link_all_option="-Wl,--whole-archive" - llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="FreeBSD" - llvm_cv_platform_type="Unix" ;; -+ *-*-kfreebsd-gnu) -+ llvm_cv_link_all_option="-Wl,--whole-archive" -+ llvm_cv_no_link_all_option="-Wl,--no-whole-archive" -+ llvm_cv_os_type="GNU/kFreeBSD" -+ llvm_cv_platform_type="Unix" ;; - *-*-openbsd*) - llvm_cv_link_all_option="-Wl,--whole-archive" - llvm_cv_no_link_all_option="-Wl,--no-whole-archive" -@@ -317,8 +322,10 @@ - llvm_cv_target_os_type="Darwin" ;; - *-*-minix*) - llvm_cv_target_os_type="Minix" ;; -- *-*-freebsd* | *-*-kfreebsd-gnu) -+ *-*-freebsd*) - llvm_cv_target_os_type="FreeBSD" ;; -+ *-*-kfreebsd-gnu) -+ llvm_cv_target_os_type="GNU/kFreeBSD" ;; - *-*-openbsd*) - llvm_cv_target_os_type="OpenBSD" ;; - *-*-netbsd*) ---- a/clang/tools/libclang/Makefile -+++ b/clang/tools/libclang/Makefile -@@ -30,7 +30,7 @@ - include $(CLANG_LEVEL)/Makefile - - # Add soname to the library. --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD)) - LDFLAGS += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_MAJOR) - endif - ---- a/configure -+++ b/configure -@@ -3824,11 +3824,16 @@ - llvm_cv_no_link_all_option="-Wl,-noall_load" - llvm_cv_os_type="Minix" - llvm_cv_platform_type="Unix" ;; -- *-*-freebsd* | *-*-kfreebsd-gnu) -+ *-*-freebsd*) - llvm_cv_link_all_option="-Wl,--whole-archive" - llvm_cv_no_link_all_option="-Wl,--no-whole-archive" - llvm_cv_os_type="FreeBSD" - llvm_cv_platform_type="Unix" ;; -+ *-*-kfreebsd-gnu) -+ llvm_cv_link_all_option="-Wl,--whole-archive" -+ llvm_cv_no_link_all_option="-Wl,--no-whole-archive" -+ llvm_cv_os_type="GNU/kFreeBSD" -+ llvm_cv_platform_type="Unix" ;; - *-*-openbsd*) - llvm_cv_link_all_option="-Wl,--whole-archive" - llvm_cv_no_link_all_option="-Wl,--no-whole-archive" -@@ -3925,8 +3930,10 @@ - llvm_cv_target_os_type="Darwin" ;; - *-*-minix*) - llvm_cv_target_os_type="Minix" ;; -- *-*-freebsd* | *-*-kfreebsd-gnu) -+ *-*-freebsd*) - llvm_cv_target_os_type="FreeBSD" ;; -+ *-*-kfreebsd-gnu) -+ llvm_cv_target_os_type="GNU/kFreeBSD" ;; - *-*-openbsd*) - llvm_cv_target_os_type="OpenBSD" ;; - *-*-netbsd*) ---- a/lldb/lib/Makefile -+++ b/lldb/lib/Makefile -@@ -99,7 +99,7 @@ - lldbPluginDynamicLoaderMacOSX.a - endif - --ifeq ($(HOST_OS),FreeBSD) -+ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) - USEDLIBS += lldbHostFreeBSD.a \ - lldbPluginProcessPOSIX.a \ - lldbPluginProcessFreeBSD.a -@@ -132,7 +132,7 @@ - endif - endif - --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) - # Include everything from the .a's into the shared library. - ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \ - -Wl,--no-whole-archive ---- a/lldb/source/Host/Makefile -+++ b/lldb/source/Host/Makefile -@@ -21,7 +21,7 @@ - DIRS += linux - endif - --ifeq ($(HOST_OS),FreeBSD) -+ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) - DIRS += freebsd - endif - ---- a/lldb/source/Plugins/Platform/Makefile -+++ b/lldb/source/Plugins/Platform/Makefile -@@ -24,5 +24,9 @@ - # ifeq ($(HOST_OS),FreeBSD) - # DIRS += FreeBSD - # endif -+# -+# ifeq ($(HOST_OS),GNU/kFreeBSD) -+# DIRS += FreeBSD -+# endif - - include $(LLDB_LEVEL)/Makefile ---- a/lldb/source/Plugins/Process/POSIX/Makefile -+++ b/lldb/source/Plugins/Process/POSIX/Makefile -@@ -24,7 +24,7 @@ - CPPFLAGS += -Wno-extended-offsetof - endif - --ifeq ($(HOST_OS),FreeBSD) -+ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) - # Extend the include path so we may locate ProcessMonitor - CPPFLAGS += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/FreeBSD - endif ---- a/projects/sample/Makefile.llvm.rules -+++ b/projects/sample/Makefile.llvm.rules -@@ -208,10 +208,12 @@ - BuildMode := Release - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS),FreeBSD) -+ ifneq ($(HOST_OS),GNU/kFreeBSD) - ifneq ($(HOST_OS),Darwin) - OmitFramePointer := -fomit-frame-pointer - endif - endif -+ endif - - # Darwin requires -fstrict-aliasing to be explicitly enabled. - # Avoid -fstrict-aliasing on Darwin for now, there are unresolved issues -@@ -1372,7 +1374,7 @@ - endif - endif - --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD GNU/kFreeBSD)) - ifneq ($(ARCH), Mips) - LD.Flags += -Wl,--version-script=$(PROJ_SRC_ROOT)/autoconf/ExportMap.map - endif ---- a/tools/llvm-shlib/Makefile -+++ b/tools/llvm-shlib/Makefile -@@ -69,18 +69,18 @@ - endif - endif - --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD GNU Bitrig)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig)) - # Include everything from the .a's into the shared library. - LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ - -Wl,--no-whole-archive - endif - --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD GNU)) - # Add soname to the library. - LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions - endif - --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) - # Don't allow unresolved symbols. - LLVMLibsOptions += -Wl,--no-undefined - endif ---- a/lldb/source/Plugins/Makefile -+++ b/lldb/source/Plugins/Makefile -@@ -36,7 +36,7 @@ - DIRS += Process/Linux Process/POSIX - endif - --ifeq ($(HOST_OS),FreeBSD) -+ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) - DIRS += Process/FreeBSD Process/POSIX - endif - ---- a/lldb/tools/driver/Makefile -+++ b/lldb/tools/driver/Makefile -@@ -21,7 +21,7 @@ - LLVMLibsOptions += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,"$(PROJ_SRC_DIR)/lldb-Info.plist" - endif - --ifeq ($(HOST_OS),Linux) -+ifneq (,$(filter $(HOST_OS), Linux GNU/kFreeBSD)) - LLVMLibsOptions += -Wl,-rpath,$(LibDir) - endif - ---- a/lldb/tools/lldb-platform/Makefile -+++ b/lldb/tools/lldb-platform/Makefile -@@ -18,6 +18,6 @@ - LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/ - endif - --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD)) - LLVMLibsOptions += -Wl,-rpath,$(LibDir) - endif ---- a/lldb/source/Host/common/Host.cpp -+++ b/lldb/source/Host/common/Host.cpp -@@ -1569,7 +1569,7 @@ Host::RunShellCommand (const char *command, - return error; - } - --#if defined(__linux__) or defined(__FreeBSD__) -+#if defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__) - // The functions below implement process launching via posix_spawn() for Linux - // and FreeBSD. - - diff --git a/debian/patches/suffixsvn.diff b/debian/patches/suffixsvn.diff deleted file mode 100644 index 1259e4fd..00000000 --- a/debian/patches/suffixsvn.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: llvm-toolchain-snapshot_3.5~svn207356/autoconf/configure.ac -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn207356.orig/autoconf/configure.ac 2014-04-27 07:56:06.576699406 -0700 -+++ llvm-toolchain-snapshot_3.5~svn207356/autoconf/configure.ac 2014-04-27 07:56:06.572699443 -0700 -@@ -37,7 +37,7 @@ - LLVM_VERSION_MAJOR=3 - LLVM_VERSION_MINOR=5 - LLVM_VERSION_PATCH=0 --LLVM_VERSION_SUFFIX=svn -+LLVM_VERSION_SUFFIX= - - AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API]) - AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API]) -Index: llvm-toolchain-snapshot_3.5~svn207356/configure -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn207356.orig/configure 2014-04-27 07:56:06.312701828 -0700 -+++ llvm-toolchain-snapshot_3.5~svn207356/configure 2014-04-27 10:00:36.436143478 -0700 -@@ -1938,7 +1938,7 @@ - LLVM_VERSION_MAJOR=3 - LLVM_VERSION_MINOR=5 - LLVM_VERSION_PATCH=0 --LLVM_VERSION_SUFFIX=svn -+LLVM_VERSION_SUFFIX= - - - cat >>confdefs.h <<_ACEOF