authorgravatar for jay@jayschwa.netJay Petacat <jay@jayschwa.net> 2021-07-16 18:31:00-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-07-16 19:35:25-04:00
log9979741bff5867818e4186348e7aa4e271389317
treeb46fbf80be24b6cba954c63008740cf2dc26402d
parent8cde0c91c6e95853a092ff8e00f92d804102a5dc

stage1: Fix OsOther by adding missing OsPlan9

2 files changed, 7 insertions(+), 0 deletions(-)

src/stage1/stage1.h+1
...@@ -97,6 +97,7 @@ enum Os {...@@ -97,6 +97,7 @@ enum Os {
97 OsOpenCL,97 OsOpenCL,
98 OsGLSL450,98 OsGLSL450,
99 OsVulkan,99 OsVulkan,
100 OsPlan9,
100 OsOther,101 OsOther,
101};102};
102103
src/stage1/target.cpp+6
...@@ -125,6 +125,7 @@ static const Os os_list[] = {...@@ -125,6 +125,7 @@ static const Os os_list[] = {
125 OsOpenCL,125 OsOpenCL,
126 OsGLSL450,126 OsGLSL450,
127 OsVulkan,127 OsVulkan,
128 OsPlan9,
128 OsOther,129 OsOther,
129};130};
130131
...@@ -219,6 +220,7 @@ ZigLLVM_OSType get_llvm_os_type(Os os_type) {...@@ -219,6 +220,7 @@ ZigLLVM_OSType get_llvm_os_type(Os os_type) {
219 case OsOpenCL:220 case OsOpenCL:
220 case OsGLSL450:221 case OsGLSL450:
221 case OsVulkan:222 case OsVulkan:
223 case OsPlan9:
222 case OsOther:224 case OsOther:
223 return ZigLLVM_UnknownOS;225 return ZigLLVM_UnknownOS;
224 case OsAnanas:226 case OsAnanas:
...@@ -298,6 +300,8 @@ const char *target_os_name(Os os_type) {...@@ -298,6 +300,8 @@ const char *target_os_name(Os os_type) {
298 switch (os_type) {300 switch (os_type) {
299 case OsFreestanding:301 case OsFreestanding:
300 return "freestanding";302 return "freestanding";
303 case OsPlan9:
304 return "plan9";
301 case OsUefi:305 case OsUefi:
302 return "uefi";306 return "uefi";
303 case OsOther:307 case OsOther:
...@@ -667,6 +671,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {...@@ -667,6 +671,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
667 case OsWASI:671 case OsWASI:
668 case OsHaiku:672 case OsHaiku:
669 case OsEmscripten:673 case OsEmscripten:
674 case OsPlan9:
670 switch (id) {675 switch (id) {
671 case CIntTypeShort:676 case CIntTypeShort:
672 case CIntTypeUShort:677 case CIntTypeUShort:
...@@ -975,6 +980,7 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) {...@@ -975,6 +980,7 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) {
975 case OsOpenCL:980 case OsOpenCL:
976 case OsGLSL450:981 case OsGLSL450:
977 case OsVulkan:982 case OsVulkan:
983 case OsPlan9:
978 return ZigLLVM_UnknownEnvironment;984 return ZigLLVM_UnknownEnvironment;
979 }985 }
980 zig_unreachable();986 zig_unreachable();