From f9187c8b13478824c9eff73c92a084cc50c34cad Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 24 Jan 2023 23:32:06 +0100
Subject: [PATCH] Revert "arch: Add support for loong64 CPU"
This reverts commit 321e479ba142e6b05d1a27b50e4bb7900903fbf0.
This arch which was supposedly already defined, with an agreed ABI,
GNU triplet and dpkg multiarch paths, seems to want to redefine all
these. There is no clear rationale for why this is happening at this
point in time, while patches for at least gcc have been submitted
with no coordination (which ended up being applied).
The handling of this is less than ideal. Until the whole situation
gets clarified, the safest way is to revert the support. It can be
reintroduced once things clear out.
Ref: #1028654
---
data/cputable | 1 -
scripts/Dpkg/Shlibs/Objdump.pm | 7 -------
scripts/t/Dpkg_Arch.t | 4 ++--
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/data/cputable b/data/cputable
index 7b1ee2c58..172cea3f5 100644
--- a/data/cputable
+++ b/data/cputable
@@ -26,7 +26,6 @@ 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
diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
index c9af96564..cf09469ca 100644
--- a/scripts/Dpkg/Shlibs/Objdump.pm
+++ b/scripts/Dpkg/Shlibs/Objdump.pm
@@ -104,7 +104,6 @@ use constant {
EM_XTENSA => 94,
EM_MICROBLAZE => 189,
EM_ARCV2 => 195,
- EM_LOONGARCH => 258,
EM_AVR_OLD => 0x1057,
EM_OR1K_OLD => 0x8472,
EM_ALPHA => 0x9026,
@@ -129,11 +128,6 @@ use constant {
EF_IA64_ABI64 => 0x00000010,
- EF_LOONGARCH_SOFT_FLOAT => 0x00000001,
- EF_LOONGARCH_SINGLE_FLOAT => 0x00000002,
- EF_LOONGARCH_DOUBLE_FLOAT => 0x00000003,
- EF_LOONGARCH_ABI_MASK => 0x00000007,
-
EF_MIPS_ABI2 => 0x00000020,
EF_MIPS_32BIT => 0x00000100,
EF_MIPS_FP64 => 0x00000200,
@@ -167,7 +161,6 @@ my %elf_mach_map = (
# behavior, and we do not drop dependencies.
my %elf_flags_mask = (
EM_IA64() => EF_IA64_ABI64,
- EM_LOONGARCH() => EF_LOONGARCH_ABI_MASK,
EM_MIPS() => EF_MIPS_ABI_MASK | EF_MIPS_ABI2,
EM_PPC64() => EF_PPC64_ABI64,
);
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index 59855dfa4..012f67c63 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 => 18407;
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 = 554;
my @valid_arches = get_valid_arches();
sub get_valid_wildcards
--
GitLab