Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i#1569 AArch64: Rename arm64 to aarch64 #4753

Merged
merged 1 commit into from
Feb 23, 2021
Merged

i#1569 AArch64: Rename arm64 to aarch64 #4753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 make/package.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ if ($ENV{DYNAMORIO_CROSS_AARCHXX_LINUX_ONLY} MATCHES "yes")
if (arg_no32)
set(arg_cacheappend "${arg_cacheappend}
PACKAGE_PLATFORM:STRING=AArch64-
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/make/toolchain-arm64.cmake")
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/make/toolchain-aarch64.cmake")
elseif (arg_no64)
set(arg_cacheappend "${arg_cacheappend}
PACKAGE_PLATFORM:STRING=ARM-
Expand Down
6 changes: 3 additions & 3 deletions make/toolchain-arm64.cmake → make/toolchain-aarch64.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2014-2017 Google, Inc. All rights reserved.
# Copyright (c) 2014-2021 Google, Inc. All rights reserved.
# **********************************************************

# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -28,11 +28,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
# DAMAGE.

# For cross-compiling on arm64 Linux using gcc-aarch64-linux-gnu package:
# For cross-compiling on aarch64 Linux using gcc-aarch64-linux-gnu package:
# - install AArch64 tool chain:
# $ sudo apt-get install g++-aarch64-linux-gnu
# - cross-compiling config
# $ cmake -DCMAKE_TOOLCHAIN_FILE=../dynamorio/make/toolchain-arm64.cmake ../dynamorio
# $ cmake -DCMAKE_TOOLCHAIN_FILE=../dynamorio/make/toolchain-aarch64.cmake ../dynamorio
# You may have to set CMAKE_FIND_ROOT_PATH to point to the target enviroment, e.g.
# by passing -DCMAKE_FIND_ROOT_PATH=/usr/aarch64-linux-gnu on Debian-like systems.
set(CMAKE_SYSTEM_NAME Linux)
Expand Down
12 changes: 6 additions & 6 deletions suite/runsuite.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,13 +452,13 @@ if (UNIX AND ARCH_IS_X86)
set(run_tests OFF) # build tests but don't run them
endif ()
endif ()
testbuild_ex("arm-debug-internal-32" OFF "
testbuild_ex("arm-debug-internal" OFF "
DEBUG:BOOL=ON
INTERNAL:BOOL=ON
${build_tests}
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/make/toolchain-arm32.cmake
" OFF ${arg_package} "")
testbuild_ex("arm-release-external-32" OFF "
testbuild_ex("arm-release-external" OFF "
DEBUG:BOOL=OFF
INTERNAL:BOOL=OFF
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/make/toolchain-arm32.cmake
Expand All @@ -469,16 +469,16 @@ if (UNIX AND ARCH_IS_X86)
set(run_tests OFF) # build tests but don't run them
endif ()
endif ()
testbuild_ex("arm-debug-internal-64" ON "
testbuild_ex("aarch64-debug-internal" ON "
DEBUG:BOOL=ON
INTERNAL:BOOL=ON
${build_tests}
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/make/toolchain-arm64.cmake
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/make/toolchain-aarch64.cmake
" OFF ${arg_package} "")
testbuild_ex("arm-release-external-64" ON "
testbuild_ex("aarch64-release-external" ON "
DEBUG:BOOL=OFF
INTERNAL:BOOL=OFF
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/make/toolchain-arm64.cmake
CMAKE_TOOLCHAIN_FILE:PATH=${CTEST_SOURCE_DIRECTORY}/make/toolchain-aarch64.cmake
" OFF ${arg_package} "")

set(run_tests ${prev_run_tests})
Expand Down