From fe4f56e3d3eb3b0faee6a7f3c176f45e5efa861c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 29 Jul 2014 17:14:37 +0000 Subject: [PATCH] * Disable lldb for ppc64el. Thanks to Dimitri John Ledkov (Closes: #756380) * Fix the FTBFS under PowerPC. Thanks to Dimitri John Ledkov for the patch --- debian/changelog | 8 +-- .../lldb-__linux__-ftbfs-powerpc.patch | 70 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 debian/patches/lldb-__linux__-ftbfs-powerpc.patch diff --git a/debian/changelog b/debian/changelog index 401e4551..d7dc82d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -llvm-toolchain-3.5 (1:3.5~+rc1-3) UNRELEASED; urgency=medium - - * Disable lldb for ppc64el. Thanks to Dimitri John Ledkov (Closes: #756380) - - -- Sylvestre Ledru Tue, 29 Jul 2014 13:40:20 +0200 - llvm-toolchain-3.5 (1:3.5~+rc1-2) unstable; urgency=medium * Sync with 3.4 svn to retrieve some changes: @@ -15,6 +9,8 @@ llvm-toolchain-3.5 (1:3.5~+rc1-2) unstable; urgency=medium * clang-X suggests clang-X-doc (Closes: #755922) * Manage all files using .in mecanism. It will simplify the upgrade of version + * Disable lldb for ppc64el. Thanks to Dimitri John Ledkov (Closes: #756380) + * Fix the FTBFS under PowerPC. Thanks to Dimitri John Ledkov for the patch -- Sylvestre Ledru Thu, 24 Jul 2014 11:42:56 +0200 diff --git a/debian/patches/lldb-__linux__-ftbfs-powerpc.patch b/debian/patches/lldb-__linux__-ftbfs-powerpc.patch new file mode 100644 index 00000000..4500a3ff --- /dev/null +++ b/debian/patches/lldb-__linux__-ftbfs-powerpc.patch @@ -0,0 +1,70 @@ +From 0480011e58fc86c20026204a979918d0f4a9b831 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov +Date: Tue, 29 Jul 2014 16:38:04 +0100 +Subject: [PATCH] Use __linux__ macro throughout, instead of ocasional __linux. + +__linux is not universally defined across all standards versions, compilers and architectures. Specifically at C99 and up, it's not defined in GCC on powerpc platform. + +See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=28314 + +Bugzilla: http://llvm.org/bugs/show_bug.cgi?id=20380 +--- + tools/lldb-mi/MICmnLogMediumFile.cpp | 2 +- + tools/lldb-mi/MIUtilSystemLinux.cpp | 4 ++-- + tools/lldb-mi/MIUtilSystemLinux.h | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tools/lldb-mi/MICmnLogMediumFile.cpp b/tools/lldb-mi/MICmnLogMediumFile.cpp +index a14ad04..382db07 100644 +--- a/tools/lldb-mi/MICmnLogMediumFile.cpp ++++ b/tools/lldb-mi/MICmnLogMediumFile.cpp +@@ -28,7 +28,7 @@ + + #if defined( _MSC_VER ) + #include "MIUtilSystemWindows.h" +-#elif defined( __FreeBSD__ ) || defined( __linux ) ++#elif defined( __FreeBSD__ ) || defined( __linux__ ) + #include "MIUtilSystemLinux.h" + #elif defined( __APPLE__ ) + #include "MIUtilSystemOsx.h" +diff --git a/tools/lldb-mi/MIUtilSystemLinux.cpp b/tools/lldb-mi/MIUtilSystemLinux.cpp +index de14317..9c4deb4 100644 +--- a/tools/lldb-mi/MIUtilSystemLinux.cpp ++++ b/tools/lldb-mi/MIUtilSystemLinux.cpp +@@ -22,7 +22,7 @@ + // Include compiler configuration + #include "MICmnConfig.h" + +-#if defined( __FreeBSD__ ) || defined( __linux ) ++#if defined( __FreeBSD__ ) || defined( __linux__ ) + + // In-house headers: + #include "MIUtilSystemLinux.h" +@@ -119,4 +119,4 @@ bool CMIUtilSystemLinux::GetLogFilesPath( CMIUtilString & vrwFileNamePath ) cons + return MIstatus::success; + } + +-#endif // #if defined( __linux ) ++#endif // #if defined( __linux__ ) +diff --git a/tools/lldb-mi/MIUtilSystemLinux.h b/tools/lldb-mi/MIUtilSystemLinux.h +index c79bcfd..0d9062a 100644 +--- a/tools/lldb-mi/MIUtilSystemLinux.h ++++ b/tools/lldb-mi/MIUtilSystemLinux.h +@@ -24,7 +24,7 @@ + // Include compiler configuration + #include "MICmnConfig.h" + +-#if defined( __FreeBSD__ ) || defined( __linux ) ++#if defined( __FreeBSD__ ) || defined( __linux__ ) + + // In-house headers: + #include "MIUtilString.h" +@@ -57,4 +57,4 @@ public: + + typedef CMIUtilSystemLinux CMIUtilSystem; + +-#endif // #if defined( __linux ) ++#endif // #if defined( __linux__ ) +-- +2.0.1 + diff --git a/debian/patches/series b/debian/patches/series index 2dcf9ec4..b6b3aa72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,3 +42,4 @@ follow-parallel-var.diff scan-build-search-path.diff lldb-kfreebsd.diff hurd-EIEIO-undef.diff +lldb-__linux__-ftbfs-powerpc.patch