arch: unify sh, sh2 and sh4 into a single sh architecture

Debian only ships an sh4 cross compiler for sh.

Add sh2 and sh4 as aliases for sh instead of having separate
config files. Resolve aliases before config file lookup so
they work without a .ini file.

Remove sh2.ini and the sh4.ini symlink. Use sh instead of
sh2 and sh4 in the korg-gcc target lists.

Suggested-by: Arnd Bergmann <arnd@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Author: roxell

docs/architectures.md

@@ -30,9 +30,7 @@ parisc       |             | 64-bit parisc            | yes¹ ²   | no
 powerpc      |             | 64-bit PowerPC (EL)      | yes¹ ² ³ | yes
 riscv        |             | 64-bit RISC-V            | yes¹ ² ³ | no
 s390         | *s390x*     | 64-bit IBM S/390         | yes      | yes
-sh           |             | 32-bit sh4               | yes¹     | no
-sh2          |             | 32-bit sh2               | yes³     | no
-sh4          |             | 32-bit sh4               | yes³     | no
+sh           | *sh2*, *sh4*| 32-bit sh4               | yes¹ ³   | no
 sparc        |             | 64-bit Sparc             | yes¹ ² ³ | no
 um           |             | User-Mode Linux          | yes¹ ²   | no
 x86_64       | *amd64*     | 64-bit X86               | yes      | yes

tuxmake/arch.py

@@ -15,6 +15,8 @@ class Architecture(ConfigurableObject):
         "armv8l": "arm",
         "i686": "i386",
         "s390x": "s390",
+        "sh2": "sh",
+        "sh4": "sh",
     }
 
     def __init_config__(self):

tuxmake/arch/sh2.ini

@@ -28,10 +28,10 @@ def __repr__(self):
     @lru_cache(None)
     def read_config(cls, name: str) -> Tuple[str, ConfigParser]:
         commonconf = Path(__file__).parent / cls.basedir / "common.ini"
+        name = cls.config_aliases.get(name, name)
         conffile = Path(__file__).parent / cls.basedir / f"{name}.ini"
         if not conffile.exists():
             raise cls.exception(name)
-        name = cls.config_aliases.get(conffile.stem, name)
         config = ConfigParser()
         config.read(commonconf)
         config.read(conffile)

tuxmake/arch/sh4.ini

@@ -542,8 +542,8 @@ rebuild = monthly
 kind = korg-gcc-build
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
-target_skip = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
+target_skip = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 14.2.0
 rebuild = monthly
 
@@ -553,7 +553,7 @@ skip_build = True
 kind = korg-gcc-build
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 8.5.0
 rebuild = monthly
 
@@ -563,7 +563,7 @@ skip_build = True
 kind = korg-gcc-build
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 9.5.0
 rebuild = monthly
 
@@ -573,7 +573,7 @@ skip_build = True
 kind = korg-gcc-build
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 10.5.0
 rebuild = monthly
 
@@ -583,7 +583,7 @@ skip_build = True
 kind = korg-gcc-build
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 11.5.0
 rebuild = monthly
 
@@ -593,7 +593,7 @@ skip_build = True
 kind = korg-gcc-build
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 12.4.0
 rebuild = monthly
 
@@ -603,7 +603,7 @@ skip_build = True
 kind = korg-gcc-build
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 13.3.0
 rebuild = monthly
 
@@ -614,7 +614,7 @@ kind = korg-gcc-build
 target_kinds = alpha:korg-gcc
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 14.2.0
 rebuild = monthly
 
@@ -625,6 +625,6 @@ kind = korg-gcc-build
 target_kinds = alpha:korg-gcc
 base = base-debian13
 hosts = amd64, arm64
-targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, powerpc, riscv, s390, sh2, sh4, sparc, x86_64, xtensa
+targets = alpha, arc, arm64, arm, csky, i386, loongarch, m68k, microblaze, mips, nios2, openrisc, powerpc, riscv, s390, sh, sparc, x86_64, xtensa
 tc_full_version = 15.2.0
 rebuild = monthly