This is an archive of the discontinued LLVM Phabricator instance.

Differential D11840

Update to D11825.
ClosedPublic

Authored by chaoren on Aug 7 2015, 10:35 AM.

Details

Reviewers
ovyalov
Andrzej
Commits
rGd47fb197f608: Update to D11825.
rLLDB244343: Update to D11825.
rL244343: Update to D11825.
Summary

Adding -latomic to ANDROID_LINKER_FLAGS doesn't actually work.
Adding atomic to LLDB_SYSTEM_LIBS does.

Related: D11831.

Diff Detail

Repository
rL LLVM

Event Timeline

chaoren updated this revision to Diff 31530.Aug 7 2015, 10:35 AM
chaoren retitled this revision from to Update to D11825..
chaoren updated this object.
chaoren added a reviewer: Andrzej.
chaoren added a subscriber: lldb-commits.
Herald added subscribers: srhines, danalbert, tberghammer. · View Herald TranscriptAug 7 2015, 10:35 AM
chaoren added a reviewer: ovyalov.Aug 7 2015, 10:52 AM
ovyalov accepted this revision.Aug 7 2015, 11:52 AM
ovyalov edited edge metadata.

LGTM

This revision is now accepted and ready to land.Aug 7 2015, 11:52 AM
Closed by commit rL244343: Update to D11825. (authored by chaoren). · Explain WhyAug 7 2015, 11:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
cmake/
platforms/
6 lines

Diff 31536

lldb/trunk/cmake/platforms/Android.cmake

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Lines
# armv5te and armv6 were tried but do not work. # armv5te and armv6 were tried but do not work.
set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a" ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a" )
if( LLVM_BUILD_STATIC ) if( LLVM_BUILD_STATIC )
# Temporary workaround for static linking with the latest API. # Temporary workaround for static linking with the latest API.
set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -DANDROID_ARM_BUILD_STATIC" ) set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -DANDROID_ARM_BUILD_STATIC" )
endif() endif()
elseif( ANDROID_ABI STREQUAL "mips" ) elseif( ANDROID_ABI STREQUAL "mips" )
# http://b.android.com/182094 # http://b.android.com/182094
set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -latomic" ) list( FIND LLDB_SYSTEM_LIBS atomic index )
if( index EQUAL -1 )
list( APPEND LLDB_SYSTEM_LIBS atomic )
set( LLDB_SYSTEM_LIBS ${LLDB_SYSTEM_LIBS} CACHE INTERNAL "" FORCE )
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 54 Lines • Show Last 20 Lines