10752ef Declare CheriBSD and CheriABI OS and ABI — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Declare CheriBSD and CheriABI OS and ABI

Brooks Davis committed 20 days ago

commit 10752ef9eb22e6a435723bd15e0761d1166cd361
parent 55dac2a

2 files changed +11 -0

modified libpkg/pkg_abi.c

@@ -50,6 +50,8 @@ static const struct {

 	{ "armv6:32:el:eabi:hardfp", "armv6" },
 	{ "armv7:32:el:eabi:hardfp", "armv7" },
 	{ "aarch64:64", "aarch64" },
 	{ "aarch64:64:cheri", "aarch64c" },
 	{ "aarch64:64:cheri:benchmark", "aarch64cb" },
 	{ "mips:32:el:o32", "mipsel" },
 	{ "mips:32:el:n32", "mipsn32el" },

@@ -61,6 +63,7 @@ static const struct {

 	{ "riscv:32:hf", "riscv32" },
 	{ "riscv:32:sf", "riscv32sf" },
 	{ "riscv:64:hf", "riscv64" },
 	{ "riscv:64:cheri:hf", "riscv64c" },
 	{ "riscv:64:sf", "riscv64sf" },
 };

@@ -75,6 +78,7 @@ static const struct {

 	[PKG_OS_DRAGONFLY] =	{ "dragonfly",	"x86:64",	false },
 	[PKG_OS_LINUX] =	{ "Linux",	"x86_64",	false },
 	[PKG_OS_DARWIN] =	{ "Darwin",	"x86_64",	true },
 	[PKG_OS_CHERIBSD] =	{ "CheriBSD",	"amd64",	true },
 	[PKG_OS_ANY] =		{ "*" },
 };

@@ -88,11 +92,14 @@ static const struct {

 	[PKG_ARCH_ARMV6] =		{"armv6"},
 	[PKG_ARCH_ARMV7] =		{"armv7"},
 	[PKG_ARCH_AARCH64] =		{"aarch64"},
 	[PKG_ARCH_AARCH64C] =		{"aarch64c"},
 	[PKG_ARCH_AARCH64CB] =		{"aarch64cb"},
 	[PKG_ARCH_POWERPC] =		{"powerpc"},
 	[PKG_ARCH_POWERPC64] =		{"powerpc64"},
 	[PKG_ARCH_POWERPC64LE] =	{"powerpc64le"},
 	[PKG_ARCH_RISCV32] =		{"riscv32"},
 	[PKG_ARCH_RISCV64] =		{"riscv64"},
 	[PKG_ARCH_RISCV64C] =		{"riscv64c"},
 	[PKG_ARCH_ANY] =		{"*"},
 };

modified libpkg/private/pkg_abi.h

@@ -27,6 +27,7 @@ enum pkg_os {

 	PKG_OS_DRAGONFLY,
 	PKG_OS_LINUX,
 	PKG_OS_DARWIN,
 	PKG_OS_CHERIBSD,
 	PKG_OS_ANY,
 };

@@ -49,11 +50,14 @@ enum pkg_arch {

 	PKG_ARCH_ARMV6,
 	PKG_ARCH_ARMV7,
 	PKG_ARCH_AARCH64,
 	PKG_ARCH_AARCH64C,
 	PKG_ARCH_AARCH64CB,
 	PKG_ARCH_POWERPC,
 	PKG_ARCH_POWERPC64,
 	PKG_ARCH_POWERPC64LE,
 	PKG_ARCH_RISCV32,
 	PKG_ARCH_RISCV64,
 	PKG_ARCH_RISCV64C,
 	PKG_ARCH_ANY,
 };