| Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame^] | 1 | From c6acfba64b470c7e919fd5bd29124d7228492537 Mon Sep 17 00:00:00 2001 |
| 2 | From: Guillem Jover <guillem@debian.org> |
| 3 | Date: Fri, 28 May 2021 04:07:49 +0200 |
| 4 | Subject: [PATCH] arch: Add support for ARCv2 CPU |
| 5 | |
| 6 | This is based on the ARCv2 32-bit little-endian hard-float ISA. |
| 7 | |
| 8 | Closes: #980963 |
| 9 | |
| 10 | Upstream-Status: Backport [https://salsa.debian.org/dpkg-team/dpkg/-/commit/0d134cdcb0dcc6b21fa7926964c1426a5821181d] |
| 11 | |
| 12 | Based-on-patch-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> |
| 13 | Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> |
| 14 | --- |
| 15 | data/cputable | 1 + |
| 16 | scripts/Dpkg/Shlibs/Objdump.pm | 1 + |
| 17 | scripts/t/Dpkg_Arch.t | 4 ++-- |
| 18 | 3 files changed, 4 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/data/cputable b/data/cputable |
| 21 | index 9f2a8e0e4..277bed88f 100644 |
| 22 | --- a/data/cputable |
| 23 | +++ b/data/cputable |
| 24 | @@ -20,6 +20,7 @@ i386 i686 (i[34567]86|pentium) 32 little |
| 25 | ia64 ia64 ia64 64 little |
| 26 | alpha alpha alpha.* 64 little |
| 27 | amd64 x86_64 (amd64|x86_64) 64 little |
| 28 | +arc arc arc 32 little |
| 29 | armeb armeb arm.*b 32 big |
| 30 | arm arm arm.* 32 little |
| 31 | arm64 aarch64 aarch64 64 little |
| 32 | diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm |
| 33 | index 4cee866e7..93319d1eb 100644 |
| 34 | --- a/scripts/Dpkg/Shlibs/Objdump.pm |
| 35 | +++ b/scripts/Dpkg/Shlibs/Objdump.pm |
| 36 | @@ -100,6 +100,7 @@ use constant { |
| 37 | ELF_MACH_OR1K => 92, |
| 38 | ELF_MACH_XTENSA => 94, |
| 39 | ELF_MACH_MICROBLAZE => 189, |
| 40 | + ELF_MACH_ARCV2 => 195, |
| 41 | ELF_MACH_AVR_OLD => 0x1057, |
| 42 | ELF_MACH_OR1K_OLD => 0x8472, |
| 43 | ELF_MACH_ALPHA => 0x9026, |
| 44 | diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t |
| 45 | index a3a9e6fee..f0bba272a 100644 |
| 46 | --- a/scripts/t/Dpkg_Arch.t |
| 47 | +++ b/scripts/t/Dpkg_Arch.t |
| 48 | @@ -16,7 +16,7 @@ |
| 49 | use strict; |
| 50 | use warnings; |
| 51 | |
| 52 | -use Test::More tests => 16836; |
| 53 | +use Test::More tests => 18407; |
| 54 | |
| 55 | use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch |
| 56 | debarch_eq debarch_is debarch_is_wildcard |
| 57 | @@ -174,7 +174,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet'); |
| 58 | is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet'); |
| 59 | is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet'); |
| 60 | |
| 61 | -is(scalar get_valid_arches(), 539, 'expected amount of known architectures'); |
| 62 | +is(scalar get_valid_arches(), 554, 'expected amount of known architectures'); |
| 63 | |
| 64 | { |
| 65 | local $ENV{CC} = 'false'; |
| 66 | -- |
| 67 | 2.16.2 |
| 68 | |