This is an archive of the discontinued LLVM Phabricator instance.

Differential D14127

Use accept4 workaround for MIPS Android build.
ClosedPublic

Authored by chaoren on Oct 27 2015, 12:14 PM.

Details

Reviewers
chying
ovyalov
Commits
rG339428232a92: Use accept4 workaround for MIPS Android build.
rLLDB251439: Use accept4 workaround for MIPS Android build.
rL251439: Use accept4 workaround for MIPS Android build.
Summary

Similar to http://reviews.llvm.org/rL242319, which was for ARM.

Diff Detail

Repository
rL LLVM

Event Timeline

chaoren updated this revision to Diff 38581.Oct 27 2015, 12:14 PM
chaoren retitled this revision from to Use accept4 workaround for MIPS Android build..
chaoren updated this object.
chaoren added reviewers: chying, ovyalov.
chaoren added a subscriber: lldb-commits.
Herald added subscribers: srhines, danalbert, tberghammer, aemerson. · View Herald TranscriptOct 27 2015, 12:14 PM
Closed by commit rL251439: Use accept4 workaround for MIPS Android build. (authored by chaoren). · Explain WhyOct 27 2015, 12:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
cmake/
platforms/
4 lines
source/
Host/
common/
6 lines

Diff 38582

lldb/trunk/cmake/platforms/Android.cmake

Show First 20 Lines • Show All 109 Lines • ▼ Show 20 Lines
endif() endif()
elseif( ANDROID_ABI STREQUAL "mips" ) elseif( ANDROID_ABI STREQUAL "mips" )
# http://b.android.com/182094 # http://b.android.com/182094
list( FIND LLDB_SYSTEM_LIBS atomic index ) list( FIND LLDB_SYSTEM_LIBS atomic index )
if( index EQUAL -1 ) if( index EQUAL -1 )
list( APPEND LLDB_SYSTEM_LIBS atomic ) list( APPEND LLDB_SYSTEM_LIBS atomic )
set( LLDB_SYSTEM_LIBS ${LLDB_SYSTEM_LIBS} CACHE INTERNAL "" FORCE ) set( LLDB_SYSTEM_LIBS ${LLDB_SYSTEM_LIBS} CACHE INTERNAL "" FORCE )
endif() endif()
if( LLVM_BUILD_STATIC )
# Temporary workaround for static linking with the latest API.
set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -DANDROID_MIPS_BUILD_STATIC" )
endif()
endif() endif()
if( NOT LLVM_BUILD_STATIC ) if( NOT LLVM_BUILD_STATIC )
# PIE is required for API 21+ so we enable it if we're not statically linking # PIE is required for API 21+ so we enable it if we're not statically linking
# unfortunately, it is not supported before API 16 so we need to do something # unfortunately, it is not supported before API 16 so we need to do something
# else there see http://llvm.org/pr23457 # else there see http://llvm.org/pr23457
set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -pie -fPIE" ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -pie -fPIE" )
endif() endif()
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines

lldb/trunk/source/Host/common/Socket.cpp

Show All 34 Lines
#endif #endif
#ifdef __ANDROID_NDK__ #ifdef __ANDROID_NDK__
#include <linux/tcp.h> #include <linux/tcp.h>
#include <bits/error_constants.h> #include <bits/error_constants.h>
#include <asm-generic/errno-base.h> #include <asm-generic/errno-base.h>
#include <errno.h> #include <errno.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#if defined(ANDROID_ARM_BUILD_STATIC) #if defined(ANDROID_ARM_BUILD_STATIC) || defined(ANDROID_MIPS_BUILD_STATIC)
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <fcntl.h> #include <fcntl.h>
#endif // ANDROID_ARM_BUILD_STATIC #endif // ANDROID_ARM_BUILD_STATIC || ANDROID_MIPS_BUILD_STATIC
#endif // __ANDROID_NDK__ #endif // __ANDROID_NDK__
using namespace lldb; using namespace lldb;
using namespace lldb_private; using namespace lldb_private;
#if defined(_WIN32) #if defined(_WIN32)
typedef const char * set_socket_option_arg_type; typedef const char * set_socket_option_arg_type;
typedef char * get_socket_option_arg_type; typedef char * get_socket_option_arg_type;
▲ Show 20 Lines • Show All 396 Lines • ▼ Show 20 Lines
NativeSocket NativeSocket
Socket::AcceptSocket(NativeSocket sockfd, Socket::AcceptSocket(NativeSocket sockfd,
struct sockaddr *addr, struct sockaddr *addr,
socklen_t *addrlen, socklen_t *addrlen,
bool child_processes_inherit, bool child_processes_inherit,
Error& error) Error& error)
{ {
error.Clear(); error.Clear();
#if defined(ANDROID_ARM_BUILD_STATIC) #if defined(ANDROID_ARM_BUILD_STATIC) || defined(ANDROID_MIPS_BUILD_STATIC)
// Temporary workaround for statically linking Android lldb-server with the // Temporary workaround for statically linking Android lldb-server with the
// latest API. // latest API.
int fd = syscall(__NR_accept, sockfd, addr, addrlen); int fd = syscall(__NR_accept, sockfd, addr, addrlen);
if (fd >= 0 && !child_processes_inherit) if (fd >= 0 && !child_processes_inherit)
{ {
int flags = ::fcntl(fd, F_GETFD); int flags = ::fcntl(fd, F_GETFD);
if (flags != -1 && ::fcntl(fd, F_SETFD, flags | FD_CLOEXEC) != -1) if (flags != -1 && ::fcntl(fd, F_SETFD, flags | FD_CLOEXEC) != -1)
return fd; return fd;
Show All 21 Lines