This is an archive of the discontinued LLVM Phabricator instance.

Differential D7441

Fix the LLDB build under Debian Kfreebsd
ClosedPublic

Authored by sylvestre.ledru on Feb 5 2015, 8:35 AM.

Details

Reviewers
emaste
Commits
rG70afae8c173c: Merging r228710: --------------------------------------------------------------…
rG57958b5d359a: Fix the LLDB build under Debian Kfreebsd
rLLDB228710: Fix the LLDB build under Debian Kfreebsd
rL228710: 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

Diff Detail

Event Timeline

sylvestre.ledru updated this revision to Diff 19411.Feb 5 2015, 8:35 AM
sylvestre.ledru retitled this revision from to Fix the LLDB build under Debian Kfreebsd.
sylvestre.ledru updated this object.
sylvestre.ledru edited the test plan for this revision. (Show Details)
sylvestre.ledru added a reviewer: emaste.
sylvestre.ledru added a subscriber: Unknown Object (MLST).
Herald added a subscriber: emaste. · View Herald TranscriptFeb 5 2015, 8:35 AM
hans added a subscriber: hansw.Feb 5 2015, 11:30 AM
emaste edited edge metadata.Feb 9 2015, 12:32 PM

LGTM other than sorting the lists in alpha order. In the future would you mind uploading with full context (e.g., using -U99999)?

source/Host/common/Host.cpp
1057

Do you mind re-sorting these in alpha order? Minor point, but I think it would make things more clear when future changes come along (e.g. adding OpenBSD or refactoring this into some catch-all #define)

emaste added a comment.Feb 9 2015, 12:33 PM

LGTM other than sorting the lists in alpha order. In the future would you mind uploading with full context (e.g., using -U99999)?

Closed by commit rL228710: Fix the LLDB build under Debian Kfreebsd (authored by sylvestre). · Explain WhyFeb 10 2015, 9:18 AM
This revision was automatically updated to reflect the committed changes.
sylvestre.ledru added a comment.Feb 10 2015, 9:18 AM

With the correct ordering!

Revision Contents

PathSize
scripts/
Python/
modules/
4 lines
source/
Host/
common/
2 lines
freebsd/
2 lines
9 lines
tools/
lldb-mi/
2 lines
2 lines
2 lines

Diff 19411

scripts/Python/modules/Makefile

Context not available.
DIRS:= DIRS:=
# only build the readline suppression module on Linux # only build the readline suppression module on Linux, Kfreebsd & Hurd
ifeq ($(HOST_OS), Linux) ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
DIRS += readline DIRS += readline
endif endif
Context not available.

source/Host/common/Host.cpp

Context not available.
#endif #endif
#if !defined (__linux__) && !defined (__FreeBSD__) && !defined (__NetBSD__) #if !defined (__linux__) && !defined (__FreeBSD__) && !defined (__NetBSD__) && !defined(__FreeBSD_kernel__)
emasteUnsubmitted
Not Done
ReplyInline Actions

Do you mind re-sorting these in alpha order? Minor point, but I think it would make things more clear when future changes come along (e.g. adding OpenBSD or refactoring this into some catch-all #define)

emaste: Do you mind re-sorting these in alpha order? Minor point, but I think it would make things more…
const lldb_private::UnixSignalsSP& const lldb_private::UnixSignalsSP&
Host::GetUnixSignals () Host::GetUnixSignals ()
Context not available.

source/Host/freebsd/HostThreadFreeBSD.cpp

Context not available.
// C includes // C includes
#include <errno.h> #include <errno.h>
#include <pthread.h> #include <pthread.h>
#if defined (__FreeBSD__)
#include <pthread_np.h> #include <pthread_np.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/user.h> #include <sys/user.h>
Context not available.

source/Host/freebsd/ThisThread.cpp

Context not available.
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include <pthread.h> #include <pthread.h>
#if defined (__FreeBSD__)
#include <pthread_np.h> #include <pthread_np.h>
#endif
using namespace lldb_private; using namespace lldb_private;
Context not available.
void void
ThisThread::SetName(llvm::StringRef name) ThisThread::SetName(llvm::StringRef name)
{ {
#if defined (__FreeBSD__) // Kfreebsd does not have a simple alternative
::pthread_set_name_np(::pthread_self(), name.data()); ::pthread_set_name_np(::pthread_self(), name.data());
#endif
} }
void void
ThisThread::GetName(llvm::SmallVectorImpl<char> &name) ThisThread::GetName(llvm::SmallVectorImpl<char> &name)
{ {
#if defined (__FreeBSD__)
HostNativeThread::GetName(::pthread_getthreadid_np(), name); HostNativeThread::GetName(::pthread_getthreadid_np(), name);
#else
// Kfreebsd
HostNativeThread::GetName((unsigned)pthread_self(), name);
#endif
} }
Context not available.

tools/lldb-mi/MICmnLogMediumFile.cpp

Context not available.
#include "MICmnResources.h" #include "MICmnResources.h"
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include "MIUtilSystemWindows.h" #include "MIUtilSystemWindows.h"
#elif defined(__FreeBSD__) || defined(__linux__) #elif defined(__FreeBSD__) || defined(__linux__) || defined(__FreeBSD_kernel__)
#include "MIUtilSystemLinux.h" #include "MIUtilSystemLinux.h"
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include "MIUtilSystemOsx.h" #include "MIUtilSystemOsx.h"
Context not available.

tools/lldb-mi/MIUtilSystemLinux.h

Context not available.
#pragma once #pragma once
#if defined(__FreeBSD__) || defined(__linux__) #if defined(__FreeBSD__) || defined(__linux__) || defined(__FreeBSD_kernel__)
// In-house headers: // In-house headers:
#include "MIUtilString.h" #include "MIUtilString.h"
Context not available.

tools/lldb-mi/MIUtilSystemLinux.cpp

Context not available.
// Copyright: None. // Copyright: None.
//-- //--
#if defined(__FreeBSD__) || defined(__linux__) #if defined(__FreeBSD__) || defined(__linux__) || defined(__FreeBSD_kernel__)
// In-house headers: // In-house headers:
#include "MIUtilSystemLinux.h" #include "MIUtilSystemLinux.h"
Context not available.