This revision was automatically updated to reflect the committed changes. Closed by commit rL244298: Add -latomic to Android mips build to avoid http://b.android.com/182094. (authored by chaoren).
Changed prior to commit: http://reviews.llvm.org/D11825?vs=31493&id=31494#toc Repository: rL LLVM http://reviews.llvm.org/D11825 Files: lldb/trunk/cmake/platforms/Android.cmake Index: lldb/trunk/cmake/platforms/Android.cmake =================================================================== --- lldb/trunk/cmake/platforms/Android.cmake +++ lldb/trunk/cmake/platforms/Android.cmake @@ -107,6 +107,9 @@ # Temporary workaround for static linking with the latest API. set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -DANDROID_ARM_BUILD_STATIC" ) endif() +elseif( ANDROID_ABI STREQUAL "mips" ) + # http://b.android.com/182094 + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -latomic" ) endif() if( NOT LLVM_BUILD_STATIC )
Index: lldb/trunk/cmake/platforms/Android.cmake =================================================================== --- lldb/trunk/cmake/platforms/Android.cmake +++ lldb/trunk/cmake/platforms/Android.cmake @@ -107,6 +107,9 @@ # Temporary workaround for static linking with the latest API. set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -DANDROID_ARM_BUILD_STATIC" ) endif() +elseif( ANDROID_ABI STREQUAL "mips" ) + # http://b.android.com/182094 + set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -latomic" ) endif() if( NOT LLVM_BUILD_STATIC )
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits