Skip to content

Commit 28347a5

Browse files
Update DR to latest to fix elfutils issue (#2542)
Updates DR to the latest a09c4c9f5a0503aaa4efc2c9d59aada92de85291 to pull in the fix for DynamoRIO/dynamorio#7253 to avoid submodule issues with elfutils from sourceware.org. Updates the toolchain-android.cmake paths for the recent renaming in DR.
1 parent a964ce9 commit 28347a5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

drmemory/docs/build.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ $ make/git/devsetup.sh
424424
$ cd ..
425425
$ mkdir build_android
426426
$ cd build_android
427-
$ cmake -DCMAKE_TOOLCHAIN_FILE=../drmemory/dynamorio/make/toolchain-android.cmake -DANDROID_TOOLCHAIN=/mytooldir/android-ndk-21 ../drmemory
427+
$ cmake -DCMAKE_TOOLCHAIN_FILE=../drmemory/dynamorio/make/toolchain-android-gcc.cmake -DANDROID_TOOLCHAIN=/mytooldir/android-ndk-21 ../drmemory
428428
$ make -j
429429
```
430430

drmemory/docs/new_release.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Android:
159159

160160
```
161161
cd /work/drmemory/build_package/
162-
ctest -D CMAKE_SYSTEM_PROCESSOR=arm -V -S /work/drmemory_package/package.cmake,drmem_only\;32_only\;build=2\;cacheappend=TOOL_VERSION_NUMBER:STRING=1.11.0\;cacheappend=DRMF_VERSION:STRING=1.0.0\;cacheappend=CMAKE_TOOLCHAIN_FILE=/work/drmemory/git/src/dynamorio/make/toolchain-android.cmake\;cacheappend=ANDROID_TOOLCHAIN=/work/toolchain/android-ndk-21\;cpackappend=set\(CPACK_PACKAGE_FILE_NAME\ DrMemory-ARM-Android-EABI-1.11.0-2\)\;cacheappend=VERSION_NUMBER:STRING=6.2.0
162+
ctest -D CMAKE_SYSTEM_PROCESSOR=arm -V -S /work/drmemory_package/package.cmake,drmem_only\;32_only\;build=2\;cacheappend=TOOL_VERSION_NUMBER:STRING=1.11.0\;cacheappend=DRMF_VERSION:STRING=1.0.0\;cacheappend=CMAKE_TOOLCHAIN_FILE=/work/drmemory/git/src/dynamorio/make/toolchain-android-gcc.cmake\;cacheappend=ANDROID_TOOLCHAIN=/work/toolchain/android-ndk-21\;cpackappend=set\(CPACK_PACKAGE_FILE_NAME\ DrMemory-ARM-Android-EABI-1.11.0-2\)\;cacheappend=VERSION_NUMBER:STRING=6.2.0
163163
```
164164

165165
On MacOS:

tests/runsuite.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ if (UNIX AND ARCH_IS_X86)
372372
TOOL_DR_MEMORY:BOOL=ON
373373
${DR_entry}
374374
CMAKE_BUILD_TYPE:STRING=Debug
375-
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/dynamorio/make/toolchain-android.cmake
375+
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/dynamorio/make/toolchain-android-gcc.cmake
376376
${android_extra_dbg}
377377
" OFF OFF "")
378378
if (cross_android_only OR NOT TEST_LONG)
@@ -383,7 +383,7 @@ if (UNIX AND ARCH_IS_X86)
383383
TOOL_DR_MEMORY:BOOL=ON
384384
${DR_entry}
385385
CMAKE_BUILD_TYPE:STRING=Release
386-
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/dynamorio/make/toolchain-android.cmake
386+
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/dynamorio/make/toolchain-android-gcc.cmake
387387
${android_extra_rel}
388388
" OFF OFF "")
389389
set(run_tests ${prev_run_tests}) # restore

0 commit comments

Comments
 (0)