Author: omjavaid Date: Sun Aug 9 14:04:41 2015 New Revision: 244419 URL: http://llvm.org/viewvc/llvm-project?rev=244419&view=rev Log: Fix for build errors on arm-linux-gnueabi-gcc http://reviews.llvm.org/D11256
Modified: lldb/trunk/source/Host/common/Host.cpp lldb/trunk/source/Host/posix/PipePosix.cpp lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp Modified: lldb/trunk/source/Host/common/Host.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Host.cpp?rev=244419&r1=244418&r2=244419&view=diff ============================================================================== --- lldb/trunk/source/Host/common/Host.cpp (original) +++ lldb/trunk/source/Host/common/Host.cpp Sun Aug 9 14:04:41 2015 @@ -143,7 +143,11 @@ private: #endif // __linux__ #ifdef __linux__ +#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8)) +static __thread volatile sig_atomic_t g_usr1_called; +#else static thread_local volatile sig_atomic_t g_usr1_called; +#endif static void SigUsr1Handler (int) Modified: lldb/trunk/source/Host/posix/PipePosix.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/posix/PipePosix.cpp?rev=244419&r1=244418&r2=244419&view=diff ============================================================================== --- lldb/trunk/source/Host/posix/PipePosix.cpp (original) +++ lldb/trunk/source/Host/posix/PipePosix.cpp Sun Aug 9 14:04:41 2015 @@ -13,6 +13,10 @@ #include "llvm/ADT/SmallString.h" #include "llvm/Support/FileSystem.h" +#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8)) +#define _GLIBCXX_USE_NANOSLEEP +#endif + #include <functional> #include <thread> Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h?rev=244419&r1=244418&r2=244419&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h (original) +++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h Sun Aug 9 14:04:41 2015 @@ -171,7 +171,7 @@ namespace process_linux { const ProcessLaunchInfo &m_launch_info; }; - typedef std::function<::pid_t(Error &)> InitialOperation; + typedef std::function< ::pid_t(Error &)> InitialOperation; // --------------------------------------------------------------------- // Private Instance Methods Modified: lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp?rev=244419&r1=244418&r2=244419&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp Sun Aug 9 14:04:41 2015 @@ -31,7 +31,7 @@ #include <sys/syscall.h> // Try to define a macro to encapsulate the tgkill syscall #define tgkill(pid, tid, sig) \ - syscall(SYS_tgkill, static_cast<::pid_t>(pid), static_cast<::pid_t>(tid), sig) + syscall(SYS_tgkill, static_cast< ::pid_t>(pid), static_cast< ::pid_t>(tid), sig) using namespace lldb; using namespace lldb_private; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits