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.
diff --git a/drmemory/docs/build.dox b/drmemory/docs/build.dox
index bb356dd..7fd227a 100644
--- a/drmemory/docs/build.dox
+++ b/drmemory/docs/build.dox
@@ -424,7 +424,7 @@
$ cd ..
$ mkdir build_android
$ cd build_android
-$ cmake -DCMAKE_TOOLCHAIN_FILE=../drmemory/dynamorio/make/toolchain-android.cmake -DANDROID_TOOLCHAIN=/mytooldir/android-ndk-21 ../drmemory
+$ cmake -DCMAKE_TOOLCHAIN_FILE=../drmemory/dynamorio/make/toolchain-android-gcc.cmake -DANDROID_TOOLCHAIN=/mytooldir/android-ndk-21 ../drmemory
$ make -j
```
diff --git a/drmemory/docs/new_release.dox b/drmemory/docs/new_release.dox
index 1702bd2..2262914 100644
--- a/drmemory/docs/new_release.dox
+++ b/drmemory/docs/new_release.dox
@@ -159,7 +159,7 @@
```
cd /work/drmemory/build_package/
-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
+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
```
On MacOS:
diff --git a/dynamorio b/dynamorio
index 8fb15c2..a09c4c9 160000
--- a/dynamorio
+++ b/dynamorio
@@ -1 +1 @@
-Subproject commit 8fb15c2d096724f5a387322d928fc2495519ac37
+Subproject commit a09c4c9f5a0503aaa4efc2c9d59aada92de85291
diff --git a/tests/runsuite.cmake b/tests/runsuite.cmake
index 737d14b..86964f4 100644
--- a/tests/runsuite.cmake
+++ b/tests/runsuite.cmake
@@ -372,7 +372,7 @@
TOOL_DR_MEMORY:BOOL=ON
${DR_entry}
CMAKE_BUILD_TYPE:STRING=Debug
- CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/dynamorio/make/toolchain-android.cmake
+ CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/dynamorio/make/toolchain-android-gcc.cmake
${android_extra_dbg}
" OFF OFF "")
if (cross_android_only OR NOT TEST_LONG)
@@ -383,7 +383,7 @@
TOOL_DR_MEMORY:BOOL=ON
${DR_entry}
CMAKE_BUILD_TYPE:STRING=Release
- CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/dynamorio/make/toolchain-android.cmake
+ CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/dynamorio/make/toolchain-android-gcc.cmake
${android_extra_rel}
" OFF OFF "")
set(run_tests ${prev_run_tests}) # restore