[infra] Remove references to unsupported ARMv6 and ARMv5TE.

Change-Id: I2fb2f438940866333c7d34d26f7eb4c447b25a95
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/237624
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Ryan Macnak 2022-03-17 00:07:54 +00:00 committed by Commit Bot
parent e2f615fa9d
commit c9d2394c02
6 changed files with 5 additions and 32 deletions

View file

@ -577,11 +577,9 @@ class Architecture extends NamedEnum {
static const x64c = Architecture._('x64c');
static const arm = Architecture._('arm');
static const arm_x64 = Architecture._('arm_x64');
static const armv6 = Architecture._('armv6');
static const arm64 = Architecture._('arm64');
static const arm64c = Architecture._('arm64c');
static const simarm = Architecture._('simarm');
static const simarmv6 = Architecture._('simarmv6');
static const simarm64 = Architecture._('simarm64');
static const simarm64c = Architecture._('simarm64c');
static const riscv32 = Architecture._('riscv32');
@ -596,12 +594,10 @@ class Architecture extends NamedEnum {
x64,
x64c,
arm,
armv6,
arm_x64,
arm64,
arm64c,
simarm,
simarmv6,
simarm64,
simarm64c,
riscv32,

View file

@ -257,8 +257,6 @@ class DartVmRuntimeConfiguration extends RuntimeConfiguration {
case Architecture.arm_x64:
case Architecture.arm64:
case Architecture.arm64c:
case Architecture.simarmv6:
case Architecture.armv6:
case Architecture.simarm64:
case Architecture.simarm64c:
case Architecture.simriscv32:

View file

@ -97,13 +97,10 @@ def HostCpuForArch(arch):
m = platform.machine()
if m == 'aarch64' or m == 'arm64':
return 'arm64'
if m == 'armv7l' or m == 'armv6l':
if m == 'armv7l':
return 'arm'
if arch in [
'ia32', 'arm', 'armv6', 'simarm', 'simarm_x64', 'riscv32',
'simriscv32'
]:
if arch in ['ia32', 'arm', 'simarm', 'simarm_x64', 'riscv32', 'simriscv32']:
return 'x86'
if arch in [
'x64', 'arm64', 'simarm64', 'arm_x64', 'x64c', 'arm64c',
@ -239,11 +236,6 @@ def ToGnArgs(args, mode, arch, target_os, sanitizer, verify_sdk_hash):
gn_args['arm_version'] = 7
gn_args['arm_float_abi'] = floatabi
gn_args['arm_use_neon'] = True
elif gn_args['target_cpu'] == 'armv6':
floatabi = 'softfp' if args.arm_float_abi == '' else args.arm_float_abi
gn_args['target_cpu'] = 'arm'
gn_args['arm_version'] = 6
gn_args['arm_float_abi'] = floatabi
gn_args['is_debug'] = mode == 'debug'
gn_args['is_release'] = mode == 'release'
@ -389,7 +381,6 @@ def ProcessOptions(args):
'x64',
'arm',
'arm_x64',
'armv6',
'arm64',
'x64c',
'arm64c',

View file

@ -35,7 +35,7 @@ def BuildOptions():
result.add_option("-a",
"--arch",
help='Target architectures (comma-separated).',
metavar='[all,ia32,x64,armel,armhf]',
metavar='[all,ia32,x64,armhf]',
default='x64')
result.add_option("-t",
"--toolchain",
@ -92,12 +92,6 @@ def BuildDebianPackage(tarball, out_dir, arch, toolchain):
RunBuildPackage(['-B', '-aarmhf', '-us', '-uc'],
join(temp_dir, tarroot), toolchain)
# Build armel binary package.
if 'armel' in arch:
print("Building armel package")
RunBuildPackage(['-B', '-aarmel', '-us', '-uc'],
join(temp_dir, tarroot), toolchain)
# Copy the Debian package files to the build directory.
debbase = 'dart_%s' % version
source_package = [
@ -108,7 +102,6 @@ def BuildDebianPackage(tarball, out_dir, arch, toolchain):
i386_package = ['%s-1_i386.deb' % debbase]
amd64_package = ['%s-1_amd64.deb' % debbase]
armhf_package = ['%s-1_armhf.deb' % debbase]
armel_package = ['%s-1_armel.deb' % debbase]
for name in source_package:
copyfile(join(temp_dir, name), join(out_dir, name))
@ -121,9 +114,6 @@ def BuildDebianPackage(tarball, out_dir, arch, toolchain):
if ('armhf' in arch):
for name in armhf_package:
copyfile(join(temp_dir, name), join(out_dir, name))
if ('armel' in arch):
for name in armel_package:
copyfile(join(temp_dir, name), join(out_dir, name))
def Main():

View file

@ -34,7 +34,7 @@ rm -rf sdk
gsutil.py cp "gs://dart-archive/channels/$channel/release/$1/sdk/dartsdk-linux-arm-release.zip" .
unzip -q dartsdk-linux-arm-release.zip -d sdk
cipd create \
-name dart/dart-sdk/linux-armv6l \
-name dart/dart-sdk/linux-arm \
-in sdk \
-install-mode copy \
-tag version:$1 \

View file

@ -152,9 +152,7 @@ def GuessOS():
# Try to guess the host architecture.
def GuessArchitecture():
os_id = platform.machine()
if os_id.startswith('armv6'):
return 'armv6'
elif os_id.startswith('aarch64') or os_id == 'arm64':
if os_id.startswith('aarch64') or os_id == 'arm64':
return 'arm64'
elif os_id.startswith('arm'):
return 'arm'