From 87e3a8543d0595df1de2d11a9694a19dc6f2809e Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 22 Oct 2020 20:00:51 -0700 Subject: [PATCH] util: Rename the aarch64 m5 util version to arm64. Change-Id: I0ab0c4af0b24a4934b059d934fce237eeab839da Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27757 Tested-by: kokoro Reviewed-by: Gabe Black Maintainer: Gabe Black --- util/m5/README.md | 6 +++--- util/m5/src/abi/{aarch64 => arm64}/SConsopts | 2 +- util/m5/src/abi/{aarch64 => arm64}/m5op.S | 0 util/m5/src/abi/{aarch64 => arm64}/m5op_addr.S | 0 util/m5/src/abi/{aarch64 => arm64}/m5op_semi.S | 0 util/m5/src/abi/{aarch64 => arm64}/verify_inst.cc | 0 util/m5/src/abi/{aarch64 => arm64}/verify_semi.cc | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename util/m5/src/abi/{aarch64 => arm64}/SConsopts (98%) rename util/m5/src/abi/{aarch64 => arm64}/m5op.S (100%) rename util/m5/src/abi/{aarch64 => arm64}/m5op_addr.S (100%) rename util/m5/src/abi/{aarch64 => arm64}/m5op_semi.S (100%) rename util/m5/src/abi/{aarch64 => arm64}/verify_inst.cc (100%) rename util/m5/src/abi/{aarch64 => arm64}/verify_semi.cc (100%) diff --git a/util/m5/README.md b/util/m5/README.md index 5314f9be4..00c0aeb14 100644 --- a/util/m5/README.md +++ b/util/m5/README.md @@ -93,7 +93,7 @@ first identify what ABI(s) you're targetting. ABI | Description | Triggers ---------|--------------|---------- - aarch64 | 64 bit ARM | instruction, adddress, semihosting + arm64 | 64 bit ARM | instruction, adddress, semihosting arm | 32 bit ARM | instruction thumb | ARM thumb | instruction sparc | 64 bit SPARC | instruction @@ -161,7 +161,7 @@ scons x86.CROSS_COMPILE=x86_64-linux-gnu- build/x86/out/m5 ABI | QEMU_ARCH | CROSS_COMPILE ---------|-----------|--------------------- - aarch64 | aarch64 | aarch64-linux-gnu- + arm64 | aarch64 | aarch64-linux-gnu- arm | arm | arm-linux-gnueabihf- thumb | arm | arm-linux-gnueabihf- sparc | sparc64 | sparc64-linux-gnu- @@ -245,7 +245,7 @@ varies based on the ABI. ABI | Default call type ---------|------------------- - aarch64 | instruction + arm64 | instruction arm | instruction thumb | instruction sparc | instruction diff --git a/util/m5/src/abi/aarch64/SConsopts b/util/m5/src/abi/arm64/SConsopts similarity index 98% rename from util/m5/src/abi/aarch64/SConsopts rename to util/m5/src/abi/arm64/SConsopts index f55b1a147..ebf40c5fe 100644 --- a/util/m5/src/abi/aarch64/SConsopts +++ b/util/m5/src/abi/arm64/SConsopts @@ -25,7 +25,7 @@ Import('*') -env['ABI'] = 'aarch64' +env['ABI'] = 'arm64' get_abi_opt('CROSS_COMPILE', 'aarch64-linux-gnu-') get_abi_opt('QEMU_ARCH', 'aarch64') diff --git a/util/m5/src/abi/aarch64/m5op.S b/util/m5/src/abi/arm64/m5op.S similarity index 100% rename from util/m5/src/abi/aarch64/m5op.S rename to util/m5/src/abi/arm64/m5op.S diff --git a/util/m5/src/abi/aarch64/m5op_addr.S b/util/m5/src/abi/arm64/m5op_addr.S similarity index 100% rename from util/m5/src/abi/aarch64/m5op_addr.S rename to util/m5/src/abi/arm64/m5op_addr.S diff --git a/util/m5/src/abi/aarch64/m5op_semi.S b/util/m5/src/abi/arm64/m5op_semi.S similarity index 100% rename from util/m5/src/abi/aarch64/m5op_semi.S rename to util/m5/src/abi/arm64/m5op_semi.S diff --git a/util/m5/src/abi/aarch64/verify_inst.cc b/util/m5/src/abi/arm64/verify_inst.cc similarity index 100% rename from util/m5/src/abi/aarch64/verify_inst.cc rename to util/m5/src/abi/arm64/verify_inst.cc diff --git a/util/m5/src/abi/aarch64/verify_semi.cc b/util/m5/src/abi/arm64/verify_semi.cc similarity index 100% rename from util/m5/src/abi/aarch64/verify_semi.cc rename to util/m5/src/abi/arm64/verify_semi.cc -- 2.30.2