Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drmemory/docs/build.dox
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ $ make/git/devsetup.sh
$ 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
```

Expand Down
2 changes: 1 addition & 1 deletion drmemory/docs/new_release.dox
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Android:

```
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:
Expand Down
2 changes: 1 addition & 1 deletion dynamorio
Submodule dynamorio updated 38 files
+73 −7 .github/workflows/ci-aarchxx-cross.yml
+2 −2 .github/workflows/ci-aarchxx.yml
+2 −2 .github/workflows/ci-clang-format.yml
+3 −3 .github/workflows/ci-docs.yml
+2 −2 .github/workflows/ci-osx.yml
+7 −7 .github/workflows/ci-package.yml
+2 −2 .github/workflows/ci-riscv64.yml
+4 −4 .github/workflows/ci-windows.yml
+7 −7 .github/workflows/ci-x86.yml
+3 −1 .gitmodules
+4 −0 CMakeLists.txt
+4 −4 api/docs/building.dox
+1 −1 api/docs/new_release.dox
+3 −0 clients/drcachesim/CMakeLists.txt
+1 −4 clients/drcachesim/docs/drcachesim.dox.in
+1 −1 clients/drcachesim/tests/allasm_aarch64_flush.asm
+1 −1 clients/drcachesim/tests/allasm_aarch64_prefetch.asm
+1 −1 clients/drcachesim/tests/allasm_scattergather_aarch64.asm
+2 −2 clients/drcachesim/tests/allasm_scattergather_x86.asm
+2 −2 clients/drcachesim/tests/builtin_prefetch.c
+7 −0 core/drlibc/drlibc_module_elf.c
+53 −3 core/unix/coredump.c
+1 −0 core/unix/module_private.h
+17 −2 core/unix/preload.c
+6 −0 make/DynamoRIOConfig.cmake.in
+2 −0 make/cpp2asm_support.cmake
+1 −1 make/package.cmake
+1 −1 make/toolchain-android-gcc.cmake
+24 −27 make/toolchain-android-llvm.cmake
+31 −5 suite/runsuite.cmake
+31 −3 suite/tests/CMakeLists.txt
+3 −0 suite/tests/client-interface/memory_dump_test.templatex
+1 −1 suite/tests/common/allasm_aarch64_cache.asm
+4 −4 suite/tests/common/allasm_arm.asm
+4 −4 suite/tests/common/allasm_thumb.asm
+1 −1 suite/tests/common/allasm_x86_64.asm
+1 −1 suite/tests/linux/mmap.c
+1 −1 suite/tests/linux/mmap.template
4 changes: 2 additions & 2 deletions tests/runsuite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ if (UNIX AND ARCH_IS_X86)
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)
Expand All @@ -383,7 +383,7 @@ if (UNIX AND ARCH_IS_X86)
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
Expand Down
Loading