This is an archive of the discontinued LLVM Phabricator instance.

Differential D11321

Add evil hack to workaround the missing libdl.a in the Android toolchain.
ClosedPublic

Authored by chaoren on Jul 17 2015, 5:37 PM.

Details

Reviewers
vharron
ovyalov
Commits
rG857a43c70a95: Add evil hack to workaround the missing libdl.a in the Android toolchain.
rLLDB242599: Add evil hack to workaround the missing libdl.a in the Android toolchain.
rL242599: Add evil hack to workaround the missing libdl.a in the Android toolchain.

Diff Detail

Event Timeline

chaoren updated this revision to Diff 30057.Jul 17 2015, 5:37 PM
chaoren retitled this revision from to Add evil hack to workaround the missing libdl.a in the Android toolchain..
chaoren updated this object.
chaoren added reviewers: ovyalov, vharron.
chaoren added a subscriber: lldb-commits.
Herald added subscribers: srhines, danalbert, tberghammer. · View Herald TranscriptJul 17 2015, 5:37 PM
ovyalov accepted this revision.Jul 17 2015, 6:08 PM
ovyalov edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jul 17 2015, 6:08 PM
Closed by commit rL242599: Add evil hack to workaround the missing libdl.a in the Android toolchain. (authored by chaoren). · Explain WhyJul 17 2015, 6:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cmake/
platforms/
19 lines

Diff 30057

cmake/platforms/Android.cmake

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Lines
# 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()
# linker flags # linker flags
set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fdata-sections -ffunction-sections" ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fdata-sections -ffunction-sections" )
set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--gc-sections" ) set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--gc-sections" )
################# BEGIN EVIL HACK ##################
# lldb-server links against libdl even though it's not being used and
# libdl.a is currently missing from the toolchain (b.android.com/178517).
# Therefore, in order to statically link lldb-server, we need a temporary
# workaround. This creates a dummy libdl.a stub until the actual
# libdl.a can be implemented in the toolchain.
set( ANDROID_LIBDL_STUB "${CMAKE_BINARY_DIR}/libdl_stub" )
file( MAKE_DIRECTORY ${ANDROID_LIBDL_STUB} )
file( WRITE "${ANDROID_LIBDL_STUB}/libdl.c" "
#include <dlfcn.h>
void * dlopen (const char *filename, int flag) { return 0; }
const char * dlerror (void) { return 0; }
void * dlsym (void *handle, const char *symbol) { return 0; }
int dlclose (void *handle) { return 0; }")
execute_process( COMMAND ${CMAKE_C_COMPILER} -c ${ANDROID_LIBDL_STUB}/libdl.c -o ${ANDROID_LIBDL_STUB}/libdl.o )
execute_process( COMMAND ${CMAKE_AR} rcs ${ANDROID_LIBDL_STUB}/libdl.a ${ANDROID_LIBDL_STUB}/libdl.o )
set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -L${ANDROID_LIBDL_STUB}" )
################# END EVIL HACK ##################
# cache flags # cache flags
set( CMAKE_CXX_FLAGS "" CACHE STRING "c++ flags" ) set( CMAKE_CXX_FLAGS "" CACHE STRING "c++ flags" )
set( CMAKE_C_FLAGS "" CACHE STRING "c flags" ) set( CMAKE_C_FLAGS "" CACHE STRING "c flags" )
set( CMAKE_EXE_LINKER_FLAGS "-Wl,-z,nocopyreloc" CACHE STRING "executable linker flags" ) set( CMAKE_EXE_LINKER_FLAGS "-Wl,-z,nocopyreloc" CACHE STRING "executable linker flags" )
set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS}" CACHE INTERNAL "Android c/c++ flags" ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS}" CACHE INTERNAL "Android c/c++ flags" )
set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS}" CACHE INTERNAL "Android c/c++ linker flags" ) set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS}" CACHE INTERNAL "Android c/c++ linker flags" )
# final flags # final flags
Show All 16 Lines