diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2019-10-16 10:06:33 +0100 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2019-11-18 12:46:29 +0200 |
| commit | 03c56049a92e0f4f22e4e4f582c59c3f4802553d (patch) | |
| tree | 2fdeedb9521c0ebfb0ad11a563ddcbe40e46297e | |
| parent | 37e3f64481d055d36f35bb89bda22050131759a3 (diff) | |
| download | rpm-03c56049a92e0f4f22e4e4f582c59c3f4802553d.tar.gz | |
Revert "rpmrc: Add architecture compatibility mapping between aarch64 and arm64"
This reverts commit 236d6f5a2b924266b1249a82875b595e8758c52b.
This change is fundamentally wrong. arm64 is a catch all that covers the
naming but rpm uses "uname -m" to detect the actual architecture. The aarch64
nonclamenture specifies the ISA (Instruction Set Architecture) for the 64-bit
variant of the Arm architecture which was first supported with ARMv8.
Because all 64-bit variants of ARMv8 use aarch64 the arm64 would never be
used in rpm. If it's useful in some context while using some Debian related
tools those tools should have some translation added there. This just adds
confusion and causes issues and duplication that haven't been necessary in
any of the arch64 work up until now.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
(cherry picked from commit 0da3c50d1fa37945ba1b01975ecf2f62b51fb3cd)
| -rw-r--r-- | rpmrc.in | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -103,7 +103,6 @@ optflags: sh4 -O2 -g -mieee optflags: sh4a -O2 -g -mieee optflags: aarch64 -O2 -g -optflags: arm64 -O2 -g optflags: riscv64 -O2 -g @@ -252,9 +251,7 @@ arch_canon: sh3: sh3 17 arch_canon: sh4: sh4 17 arch_canon: sh4a: sh4a 17 arch_canon: xtensa: xtensa 18 - -arch_canon: aarch64: aarch64 19 -arch_canon: arm64: arm64 19 +arch_canon: aarch64: aarch64 19 arch_canon: mipsr6: mipsr6 20 arch_canon: mipsr6el: mipsr6el 20 @@ -393,7 +390,6 @@ buildarchtranslate: sh4: sh4 buildarchtranslate: sh4a: sh4 buildarchtranslate: aarch64: aarch64 -buildarchtranslate: arm64: aarch64 buildarchtranslate: riscv: riscv64 buildarchtranslate: riscv64: riscv64 @@ -507,8 +503,7 @@ arch_compat: sh3: noarch arch_compat: sh4: noarch arch_compat: sh4a: sh4 -arch_compat: aarch64: arm64 noarch -arch_compat: arm64: aarch64 noarch +arch_compat: aarch64: noarch arch_compat: riscv: noarch arch_compat: riscv64: noarch @@ -545,7 +540,6 @@ os_compat: Darwin: MacOSX buildarch_compat: ia64: noarch buildarch_compat: aarch64: noarch -buildarch_compat: arm64: aarch64 buildarch_compat: riscv: noarch buildarch_compat: riscv64: noarch |