Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[lldb][AIX] Some base #if _AIX changes of a minimal lldb build #120979

Merged
merged 8 commits into from
Jan 9, 2025
Merged

[lldb][AIX] Some base #if _AIX changes of a minimal lldb build #120979

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c8887ad
Some base #if _AIX changes
DhruvSrivastavaX Dec 23, 2024
1ebb1db
ObjectContainerBSDArchive.cpp
DhruvSrivastavaX Dec 24, 2024
3d66417
Merge branch 'llvm:main' into aix-build
DhruvSrivastavaX Dec 27, 2024
080d20c
Added port speed options
DhruvSrivastavaX Jan 8, 2025
ce3629f
Merge branch 'llvm:main' into aix-build
DhruvSrivastavaX Jan 8, 2025
efe3e7c
clang-format
DhruvSrivastavaX Jan 8, 2025
b55a649
added #error
DhruvSrivastavaX Jan 8, 2025
0afad59
Removed strings.h
DhruvSrivastavaX Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ ConnectionFileDescriptor::ConnectFD(llvm::StringRef s,
ConnectionStatus ConnectionFileDescriptor::ConnectFile(
llvm::StringRef s, socket_id_callback_type socket_id_callback,
Status *error_ptr) {
#if LLDB_ENABLE_POSIX
#if LLDB_ENABLE_POSIX && !defined(_AIX)
DhruvSrivastavaX marked this conversation as resolved.
Show resolved Hide resolved
std::string addr_str = s.str();
// file:///PATH
int fd = FileSystem::Instance().Open(addr_str.c_str(), O_RDWR);
Expand Down Expand Up @@ -746,7 +746,7 @@ ConnectionStatus ConnectionFileDescriptor::ConnectFile(

m_io_sp = std::make_shared<NativeFile>(fd, File::eOpenOptionReadWrite, true);
return eConnectionStatusSuccess;
#endif // LLDB_ENABLE_POSIX
#endif // LLDB_ENABLE_POSIX && !defined(_AIX)
llvm_unreachable("this function should be only called w/ LLDB_ENABLE_POSIX");
}

Expand Down
3 changes: 3 additions & 0 deletions lldb/source/Host/posix/DomainSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
#include <memory>
#include <sys/socket.h>
#include <sys/un.h>
#ifdef _AIX
#include <strings.h>
DavidSpickett marked this conversation as resolved.
Show resolved Hide resolved
#endif

using namespace lldb;
using namespace lldb_private;
Expand Down
2 changes: 2 additions & 0 deletions lldb/source/Host/posix/FileSystemPosix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
// C includes
#include <dirent.h>
#include <fcntl.h>
#ifndef _AIX
#include <sys/mount.h>
DhruvSrivastavaX marked this conversation as resolved.
Show resolved Hide resolved
#endif
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/Language/ObjC/Cocoa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ bool lldb_private::formatters::ObjCSELSummaryProvider(
time_t lldb_private::formatters::GetOSXEpoch() {
static time_t epoch = 0;
if (!epoch) {
#ifndef _WIN32
#if !defined(_WIN32) && !defined(_AIX)
DavidSpickett marked this conversation as resolved.
Show resolved Hide resolved
tzset();
tm tm_epoch;
tm_epoch.tm_sec = 0;
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "ObjectContainerBSDArchive.h"

#if defined(_WIN32) || defined(__ANDROID__)
#if defined(_WIN32) || defined(__ANDROID__) || defined(_AIX)
// Defines from ar, missing on Windows
#define SARMAG 8
#define ARFMAG "`\n"
Expand Down
Loading