[llvm-branch-commits] [lldb] r228780 - Merging r228710:

[Hans Wennborg]

Author: hans
Date: Tue Feb 10 19:16:48 2015
New Revision: 228780

URL: http://llvm.org/viewvc/llvm-project?rev=228780&view=rev
Log:
Merging r228710:
------------------------------------------------------------------------
r228710 | sylvestre | 2015-02-10 09:16:13 -0800 (Tue, 10 Feb 2015) | 11 lines

Fix the LLDB build under Debian Kfreebsd

Summary:
I don't know if there is a better way for the change in source/Host/freebsd/ThisThread.cpp


Reviewers: emaste

Subscribers: hansw, emaste, lldb-commits

Differential Revision: http://reviews.llvm.org/D7441
------------------------------------------------------------------------

Modified:
    lldb/branches/release_36/   (props changed)
    lldb/branches/release_36/scripts/Python/modules/Makefile
    lldb/branches/release_36/source/Host/common/Host.cpp
    lldb/branches/release_36/source/Host/freebsd/HostThreadFreeBSD.cpp
    lldb/branches/release_36/source/Host/freebsd/ThisThread.cpp
    lldb/branches/release_36/tools/lldb-mi/MICmnLogMediumFile.cpp
    lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.cpp
    lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.h

Propchange: lldb/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 10 19:16:48 2015
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:228057
+/lldb/trunk:228057,228710

Modified: lldb/branches/release_36/scripts/Python/modules/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/scripts/Python/modules/Makefile?rev=228780&r1=228779&r2=228780&view=diff
==============================================================================
--- lldb/branches/release_36/scripts/Python/modules/Makefile (original)
+++ lldb/branches/release_36/scripts/Python/modules/Makefile Tue Feb 10 19:16:48 2015
@@ -12,8 +12,8 @@ include $(LLDB_LEVEL)/../../Makefile.con
 
 DIRS:=
 
-# only build the readline suppression module on Linux
-ifeq ($(HOST_OS), Linux)
+# only build the readline suppression module on Linux, Kfreebsd & Hurd
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
 DIRS += readline
 endif
 

Modified: lldb/branches/release_36/source/Host/common/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/source/Host/common/Host.cpp?rev=228780&r1=228779&r2=228780&view=diff
==============================================================================
--- lldb/branches/release_36/source/Host/common/Host.cpp (original)
+++ lldb/branches/release_36/source/Host/common/Host.cpp Tue Feb 10 19:16:48 2015
@@ -1061,7 +1061,7 @@ Host::LaunchApplication (const FileSpec
 
 #endif
 
-#if !defined (__linux__) && !defined (__FreeBSD__) && !defined (__NetBSD__)
+#if !defined (__linux__) && !defined (__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined (__NetBSD__)
 
 const lldb_private::UnixSignalsSP&
 Host::GetUnixSignals ()

Modified: lldb/branches/release_36/source/Host/freebsd/HostThreadFreeBSD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/source/Host/freebsd/HostThreadFreeBSD.cpp?rev=228780&r1=228779&r2=228780&view=diff
==============================================================================
--- lldb/branches/release_36/source/Host/freebsd/HostThreadFreeBSD.cpp (original)
+++ lldb/branches/release_36/source/Host/freebsd/HostThreadFreeBSD.cpp Tue Feb 10 19:16:48 2015
@@ -14,7 +14,9 @@
 // C includes
 #include <errno.h>
 #include <pthread.h>
+#if defined (__FreeBSD__)
 #include <pthread_np.h>
+#endif
 #include <stdlib.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>

Modified: lldb/branches/release_36/source/Host/freebsd/ThisThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/source/Host/freebsd/ThisThread.cpp?rev=228780&r1=228779&r2=228780&view=diff
==============================================================================
--- lldb/branches/release_36/source/Host/freebsd/ThisThread.cpp (original)
+++ lldb/branches/release_36/source/Host/freebsd/ThisThread.cpp Tue Feb 10 19:16:48 2015
@@ -13,18 +13,27 @@
 #include "llvm/ADT/SmallVector.h"
 
 #include <pthread.h>
+#if defined (__FreeBSD__)
 #include <pthread_np.h>
+#endif
 
 using namespace lldb_private;
 
 void
 ThisThread::SetName(llvm::StringRef name)
 {
+#if defined (__FreeBSD__) // Kfreebsd does not have a simple alternative
     ::pthread_set_name_np(::pthread_self(), name.data());
+#endif
 }
 
 void
 ThisThread::GetName(llvm::SmallVectorImpl<char> &name)
 {
+#if defined (__FreeBSD__)
     HostNativeThread::GetName(::pthread_getthreadid_np(), name);
+#else
+// Kfreebsd
+    HostNativeThread::GetName((unsigned)pthread_self(), name);
+#endif
 }

Modified: lldb/branches/release_36/tools/lldb-mi/MICmnLogMediumFile.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/tools/lldb-mi/MICmnLogMediumFile.cpp?rev=228780&r1=228779&r2=228780&view=diff
==============================================================================
--- lldb/branches/release_36/tools/lldb-mi/MICmnLogMediumFile.cpp (original)
+++ lldb/branches/release_36/tools/lldb-mi/MICmnLogMediumFile.cpp Tue Feb 10 19:16:48 2015
@@ -24,7 +24,7 @@
 #include "MICmnResources.h"
 #if defined(_MSC_VER)
 #include "MIUtilSystemWindows.h"
-#elif defined(__FreeBSD__) || defined(__linux__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__linux__)
 #include "MIUtilSystemLinux.h"
 #elif defined(__APPLE__)
 #include "MIUtilSystemOsx.h"

Modified: lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.cpp?rev=228780&r1=228779&r2=228780&view=diff
==============================================================================
--- lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.cpp (original)
+++ lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.cpp Tue Feb 10 19:16:48 2015
@@ -19,7 +19,7 @@
 // Copyright:   None.
 //--
 
-#if defined(__FreeBSD__) || defined(__linux__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__linux__)
 
 // In-house headers:
 #include "MIUtilSystemLinux.h"

Modified: lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.h?rev=228780&r1=228779&r2=228780&view=diff
==============================================================================
--- lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.h (original)
+++ lldb/branches/release_36/tools/lldb-mi/MIUtilSystemLinux.h Tue Feb 10 19:16:48 2015
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#if defined(__FreeBSD__) || defined(__linux__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__linux__)
 
 // In-house headers:
 #include "MIUtilString.h"