Commit 70afae8c authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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
------------------------------------------------------------------------

llvm-svn: 228780
parent 9cd09177

lldb/scripts/Python/modules/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ include $(LLDB_LEVEL)/../../Makefile.config 


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

lldb/source/Host/common/Host.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ Host::LaunchApplication (const FileSpec &app_file_spec) 


#endif



#if !defined (__linux__) && !defined (__FreeBSD__) && !defined (__NetBSD__)

#if !defined (__linux__) && !defined (__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined (__NetBSD__)



const lldb_private::UnixSignalsSP&

Host::GetUnixSignals ()

lldb/source/Host/freebsd/HostThreadFreeBSD.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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>

lldb/source/Host/freebsd/ThisThread.cpp

+9 −0
Original line number Diff line number Diff line
@@ -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

}

lldb/tools/lldb-mi/MICmnLogMediumFile.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"