Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
pkg_abi.c: tidy arch_trans definition
Brooks Davis committed 21 days ago
commit c0d9d700a39f5d19bf909fb2bc074f1f8fb22928
parent 61a7a2d
1 file changed +29 -15
modified libpkg/pkg_abi.c
@@ -33,22 +33,36 @@ struct arch_trans {
	const char *archid;
};

-
static const struct arch_trans machine_arch_translation[] = { { "x86:32", "i386" },
-
	{ "x86:64", "amd64" }, { "powerpc:32:eb", "powerpc" },
-
	{ "powerpc:64:eb", "powerpc64" }, { "powerpc:64:el", "powerpc64le" },
-
	{ "sparc64:64", "sparc64" }, { "ia64:64", "ia64" },
-
	/* All the ARM stuff */
+
static const struct arch_trans machine_arch_translation[] = {
+
	{ "x86:32", "i386" },
+
	{ "x86:64", "amd64" },
+

+
	{ "powerpc:32:eb", "powerpc" },
+
	{ "powerpc:64:eb", "powerpc64" },
+
	{ "powerpc:64:el", "powerpc64le" },
+

+
	{ "sparc64:64", "sparc64" },
+

+
	{ "ia64:64", "ia64" },
+

	{ "armv6:32:el:eabi:hardfp", "armv6" },
-
	{ "armv7:32:el:eabi:hardfp", "armv7" }, { "aarch64:64", "aarch64" },
-
	/* And now MIPS */
-
	{ "mips:32:el:o32", "mipsel" }, { "mips:32:el:n32", "mipsn32el" },
-
	{ "mips:32:eb:o32", "mips" }, { "mips:32:eb:n32", "mipsn32" },
-
	{ "mips:64:el:n64", "mips64el" }, { "mips:64:eb:n64", "mips64" },
-
	/* And RISC-V */
-
	{ "riscv:32:hf", "riscv32" }, { "riscv:32:sf", "riscv32sf" },
-
	{ "riscv:64:hf", "riscv64" }, { "riscv:64:sf", "riscv64sf" },
-

-
	{ NULL, NULL } };
+
	{ "armv7:32:el:eabi:hardfp", "armv7" },
+
	{ "aarch64:64", "aarch64" },
+

+
	{ "mips:32:el:o32", "mipsel" },
+
	{ "mips:32:el:n32", "mipsn32el" },
+
	{ "mips:32:eb:o32", "mips" },
+
	{ "mips:32:eb:n32", "mipsn32" },
+
	{ "mips:64:el:n64", "mips64el" },
+
	{ "mips:64:eb:n64", "mips64" },
+

+
	{ "riscv:32:hf", "riscv32" },
+
	{ "riscv:32:sf", "riscv32sf" },
+
	{ "riscv:64:hf", "riscv64" },
+
	{ "riscv:64:sf", "riscv64sf" },
+

+
	{ NULL, NULL }
+
};

static const struct {
	enum pkg_os os;