This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=1ef2064a7833c9b97f3867c40ddccc62242f8425 commit 1ef2064a7833c9b97f3867c40ddccc62242f8425 Author: Guillem Jover <[email protected]> AuthorDate: Tue Apr 25 23:08:03 2023 +0200 Remove avr32, m32r and tilegx obsolete architectures These do no longer have support in Linux. Neither the BSDs support these CPUs. There is no point in pretending these are supported by dpkg. Ref: Linux commit 26202873bb51fafdaa51be3e8de7aab9beb49f70 (avr32) Ref: Linux commit 553b085c2075f6a4a2591108554f830fa61e881f (m32r) Ref: Linux commit bb9d812643d8a121df7d614a2b9c60193a92deb0 (tile) --- data/cputable | 3 --- scripts/Dpkg/Shlibs/Objdump.pm | 6 ------ scripts/Dpkg/Vendor/Debian.pm | 9 ++++----- scripts/t/Dpkg_Arch.t | 4 ++-- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/data/cputable b/data/cputable index 7b1ee2c58..575c008e3 100644 --- a/data/cputable +++ b/data/cputable @@ -24,12 +24,10 @@ arc arc arc 32 little armeb armeb arm.*b 32 big arm arm arm.* 32 little arm64 aarch64 aarch64 64 little -avr32 avr32 avr32 32 big hppa hppa hppa.* 32 big loong64 loongarch64 loongarch64 64 little i386 i686 (i[34567]86|pentium) 32 little ia64 ia64 ia64 64 little -m32r m32r m32r 32 big m68k m68k m68k 32 big mips mips mips(eb)? 32 big mipsel mipsel mipsel 32 little @@ -54,4 +52,3 @@ sh4 sh4 sh4 32 little sh4eb sh4eb sh4eb 32 big sparc sparc sparc 32 big sparc64 sparc64 sparc64 64 big -tilegx tilegx tilegx 64 little diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm index 5e27ec7f2..adf31d9ea 100644 --- a/scripts/Dpkg/Shlibs/Objdump.pm +++ b/scripts/Dpkg/Shlibs/Objdump.pm @@ -110,8 +110,6 @@ use constant { EM_SH => 42, EM_SPARC64 => 43, EM_IA64 => 50, - EM_AVR => 83, - EM_M32R => 88, EM_MN10300 => 89, EM_MN10200 => 90, EM_OR1K => 92, @@ -119,10 +117,8 @@ use constant { EM_MICROBLAZE => 189, EM_ARCV2 => 195, EM_LOONGARCH => 258, - EM_AVR_OLD => 0x1057, EM_OR1K_OLD => 0x8472, EM_ALPHA => 0x9026, - EM_M32R_CYGNUS => 0x9041, EM_S390_OLD => 0xa390, EM_XTENSA_OLD => 0xabc7, EM_MICROBLAZE_OLD => 0xbaab, @@ -163,8 +159,6 @@ use constant { # These map alternative or old machine IDs to their canonical form. my %elf_mach_map = ( EM_ALPHA_OLD() => EM_ALPHA, - EM_AVR_OLD() => EM_AVR, - EM_M32R_CYGNUS() => EM_M32R, EM_MICROBLAZE_OLD() => EM_MICROBLAZE, EM_MN10200_CYGNUS() => EM_MN10200, EM_MN10300_CYGNUS() => EM_MN10300, diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index ed7d27c8a..6e5d308ae 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -262,10 +262,9 @@ sub set_build_features { # Mask features that are not available on certain architectures. if (none { $os eq $_ } qw(linux kfreebsd knetbsd hurd) or - any { $cpu eq $_ } qw(hppa avr32)) { + $cpu eq 'hppa') { # Disabled on non-(linux/kfreebsd/knetbsd/hurd). - # Disabled on hppa, avr32 - # (#574716). + # Disabled on hppa. $use_feature{hardening}{pie} = 0; } if (any { $cpu eq $_ } qw(ia64 alpha hppa nios2) or $arch eq 'arm') { @@ -275,8 +274,8 @@ sub set_build_features { # compiler supports it incorrectly (leads to SEGV) $use_feature{hardening}{stackprotector} = 0; } - if (any { $cpu eq $_ } qw(ia64 hppa avr32)) { - # relro not implemented on ia64, hppa, avr32. + if (any { $cpu eq $_ } qw(ia64 hppa)) { + # relro not implemented on ia64, hppa. $use_feature{hardening}{relro} = 0; } diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t index 95e6adf52..d206fc0d8 100644 --- a/scripts/t/Dpkg_Arch.t +++ b/scripts/t/Dpkg_Arch.t @@ -16,7 +16,7 @@ use strict; use warnings; -use Test::More tests => 18900; +use Test::More tests => 17421; use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch debarch_eq debarch_is debarch_is_wildcard @@ -28,7 +28,7 @@ use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch get_host_gnu_type get_valid_arches)); -my $KNOWN_ARCHES_TOTAL = 569; +my $KNOWN_ARCHES_TOTAL = 524; my @valid_arches = get_valid_arches(); sub get_valid_wildcards -- Dpkg.Org's dpkg
