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

* Fix the FTBFS under PowerPC. Thanks to Dimitri John Ledkov for the patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2014-07-29 17:23:58 +00:00
parent fe4f56e3d3
commit beceab0640
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
debian/patches/lldb-__linux__-ftbfs-powerpc.patch vendored
View File

@ -1,23 +1,7 @@
From 0480011e58fc86c20026204a979918d0f4a9b831 Mon Sep 17 00:00:00 2001 diff --git llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
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 index a14ad04..382db07 100644
--- a/tools/lldb-mi/MICmnLogMediumFile.cpp --- llvm-toolchain-snapshot_3.5~svn201241.orig/tools/lldb-mi/MICmnLogMediumFile.cpp
+++ b/tools/lldb-mi/MICmnLogMediumFile.cpp +++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
#if defined( _MSC_VER ) #if defined( _MSC_VER )
@ -27,10 +11,10 @@ index a14ad04..382db07 100644
#include "MIUtilSystemLinux.h" #include "MIUtilSystemLinux.h"
#elif defined( __APPLE__ ) #elif defined( __APPLE__ )
#include "MIUtilSystemOsx.h" #include "MIUtilSystemOsx.h"
diff --git a/tools/lldb-mi/MIUtilSystemLinux.cpp b/tools/lldb-mi/MIUtilSystemLinux.cpp diff --git llvm-toolchain-snapshot_3.5~svn201241.orig/lldb//tools/lldb-mi/MIUtilSystemLinux.cpp llvm-toolchain-snapshot_3.5~svn201241/lldb//tools/lldb-mi/MIUtilSystemLinux.cpp
index de14317..9c4deb4 100644 index de14317..9c4deb4 100644
--- a/tools/lldb-mi/MIUtilSystemLinux.cpp --- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp
+++ b/tools/lldb-mi/MIUtilSystemLinux.cpp +++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
// Include compiler configuration // Include compiler configuration
#include "MICmnConfig.h" #include "MICmnConfig.h"
@ -46,10 +30,10 @@ index de14317..9c4deb4 100644
-#endif // #if defined( __linux ) -#endif // #if defined( __linux )
+#endif // #if defined( __linux__ ) +#endif // #if defined( __linux__ )
diff --git a/tools/lldb-mi/MIUtilSystemLinux.h b/tools/lldb-mi/MIUtilSystemLinux.h diff --git llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.h llvm-toolchain-snapshot_3.5~svn201241/lldb//tools/lldb-mi/MIUtilSystemLinux.h
index c79bcfd..0d9062a 100644 index c79bcfd..0d9062a 100644
--- a/tools/lldb-mi/MIUtilSystemLinux.h --- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MIUtilSystemLinux.h
+++ b/tools/lldb-mi/MIUtilSystemLinux.h +++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.h
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
// Include compiler configuration // Include compiler configuration
#include "MICmnConfig.h" #include "MICmnConfig.h"

1
debian/patches/series vendored
View File

@ -39,7 +39,6 @@ compiler-rt-path.diff
lldb-soname.diff lldb-soname.diff
force-link-pass.o.diff force-link-pass.o.diff
follow-parallel-var.diff follow-parallel-var.diff
scan-build-search-path.diff
lldb-kfreebsd.diff lldb-kfreebsd.diff
hurd-EIEIO-undef.diff hurd-EIEIO-undef.diff
lldb-__linux__-ftbfs-powerpc.patch lldb-__linux__-ftbfs-powerpc.patch