authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-11-28 22:58:52-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-11-28 22:58:52-05:00
logc54fe0d3ae867744bf1c0b27202f779fffc5ac7f
treeaf5ba83f8c9596aa0e3ccb7021d5dcd337f3dfef
parent11e8afb37cea3d4b951165f382eeee36a653978f
signaturelock-open Commit is signed but in an unrecognized format.

work around to support debian's fork of llvm 7.0.1

it has a patch that adds an OS type, breaking the public API this commit avoids depending on the last os type enum item, but retains the safety assertion checks. closes #1788

1 files changed, 163 insertions(+), 12 deletions(-)

src/zig_llvm.cpp+163-12
...@@ -681,18 +681,6 @@ void ZigLLVMParseCommandLineOptions(size_t argc, const char *const *argv) {...@@ -681,18 +681,6 @@ void ZigLLVMParseCommandLineOptions(size_t argc, const char *const *argv) {
681}681}
682682
683683
684static_assert((Triple::ArchType)ZigLLVM_LastArchType == Triple::LastArchType, "");
685static_assert((Triple::VendorType)ZigLLVM_LastVendorType == Triple::LastVendorType, "");
686static_assert((Triple::OSType)ZigLLVM_LastOSType == Triple::LastOSType, "");
687static_assert((Triple::EnvironmentType)ZigLLVM_LastEnvironmentType == Triple::LastEnvironmentType, "");
688static_assert((Triple::SubArchType)ZigLLVM_KalimbaSubArch_v5 == Triple::KalimbaSubArch_v5, "");
689
690static_assert((Triple::ObjectFormatType)ZigLLVM_UnknownObjectFormat == Triple::UnknownObjectFormat, "");
691static_assert((Triple::ObjectFormatType)ZigLLVM_COFF == Triple::COFF, "");
692static_assert((Triple::ObjectFormatType)ZigLLVM_ELF == Triple::ELF, "");
693static_assert((Triple::ObjectFormatType)ZigLLVM_MachO == Triple::MachO, "");
694static_assert((Triple::ObjectFormatType)ZigLLVM_Wasm == Triple::Wasm, "");
695
696const char *ZigLLVMGetArchTypeName(ZigLLVM_ArchType arch) {684const char *ZigLLVMGetArchTypeName(ZigLLVM_ArchType arch) {
697 return (const char*)Triple::getArchTypeName((Triple::ArchType)arch).bytes_begin();685 return (const char*)Triple::getArchTypeName((Triple::ArchType)arch).bytes_begin();
698}686}
...@@ -919,3 +907,166 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_...@@ -919,3 +907,166 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
919 assert(false); // unreachable907 assert(false); // unreachable
920 abort();908 abort();
921}909}
910
911static_assert((Triple::ArchType)ZigLLVM_UnknownArch == Triple::UnknownArch, "");
912static_assert((Triple::ArchType)ZigLLVM_arm == Triple::arm, "");
913static_assert((Triple::ArchType)ZigLLVM_armeb == Triple::armeb, "");
914static_assert((Triple::ArchType)ZigLLVM_aarch64 == Triple::aarch64, "");
915static_assert((Triple::ArchType)ZigLLVM_aarch64_be == Triple::aarch64_be, "");
916static_assert((Triple::ArchType)ZigLLVM_arc == Triple::arc, "");
917static_assert((Triple::ArchType)ZigLLVM_avr == Triple::avr, "");
918static_assert((Triple::ArchType)ZigLLVM_bpfel == Triple::bpfel, "");
919static_assert((Triple::ArchType)ZigLLVM_bpfeb == Triple::bpfeb, "");
920static_assert((Triple::ArchType)ZigLLVM_hexagon == Triple::hexagon, "");
921static_assert((Triple::ArchType)ZigLLVM_mips == Triple::mips, "");
922static_assert((Triple::ArchType)ZigLLVM_mipsel == Triple::mipsel, "");
923static_assert((Triple::ArchType)ZigLLVM_mips64 == Triple::mips64, "");
924static_assert((Triple::ArchType)ZigLLVM_mips64el == Triple::mips64el, "");
925static_assert((Triple::ArchType)ZigLLVM_msp430 == Triple::msp430, "");
926static_assert((Triple::ArchType)ZigLLVM_nios2 == Triple::nios2, "");
927static_assert((Triple::ArchType)ZigLLVM_ppc == Triple::ppc, "");
928static_assert((Triple::ArchType)ZigLLVM_ppc64 == Triple::ppc64, "");
929static_assert((Triple::ArchType)ZigLLVM_ppc64le == Triple::ppc64le, "");
930static_assert((Triple::ArchType)ZigLLVM_r600 == Triple::r600, "");
931static_assert((Triple::ArchType)ZigLLVM_amdgcn == Triple::amdgcn, "");
932static_assert((Triple::ArchType)ZigLLVM_riscv32 == Triple::riscv32, "");
933static_assert((Triple::ArchType)ZigLLVM_riscv64 == Triple::riscv64, "");
934static_assert((Triple::ArchType)ZigLLVM_sparc == Triple::sparc, "");
935static_assert((Triple::ArchType)ZigLLVM_sparcv9 == Triple::sparcv9, "");
936static_assert((Triple::ArchType)ZigLLVM_sparcel == Triple::sparcel, "");
937static_assert((Triple::ArchType)ZigLLVM_systemz == Triple::systemz, "");
938static_assert((Triple::ArchType)ZigLLVM_tce == Triple::tce, "");
939static_assert((Triple::ArchType)ZigLLVM_tcele == Triple::tcele, "");
940static_assert((Triple::ArchType)ZigLLVM_thumb == Triple::thumb, "");
941static_assert((Triple::ArchType)ZigLLVM_thumbeb == Triple::thumbeb, "");
942static_assert((Triple::ArchType)ZigLLVM_x86 == Triple::x86, "");
943static_assert((Triple::ArchType)ZigLLVM_x86_64 == Triple::x86_64, "");
944static_assert((Triple::ArchType)ZigLLVM_xcore == Triple::xcore, "");
945static_assert((Triple::ArchType)ZigLLVM_nvptx == Triple::nvptx, "");
946static_assert((Triple::ArchType)ZigLLVM_nvptx64 == Triple::nvptx64, "");
947static_assert((Triple::ArchType)ZigLLVM_le32 == Triple::le32, "");
948static_assert((Triple::ArchType)ZigLLVM_le64 == Triple::le64, "");
949static_assert((Triple::ArchType)ZigLLVM_amdil == Triple::amdil, "");
950static_assert((Triple::ArchType)ZigLLVM_amdil64 == Triple::amdil64, "");
951static_assert((Triple::ArchType)ZigLLVM_hsail == Triple::hsail, "");
952static_assert((Triple::ArchType)ZigLLVM_hsail64 == Triple::hsail64, "");
953static_assert((Triple::ArchType)ZigLLVM_spir == Triple::spir, "");
954static_assert((Triple::ArchType)ZigLLVM_spir64 == Triple::spir64, "");
955static_assert((Triple::ArchType)ZigLLVM_kalimba == Triple::kalimba, "");
956static_assert((Triple::ArchType)ZigLLVM_shave == Triple::shave, "");
957static_assert((Triple::ArchType)ZigLLVM_lanai == Triple::lanai, "");
958static_assert((Triple::ArchType)ZigLLVM_wasm32 == Triple::wasm32, "");
959static_assert((Triple::ArchType)ZigLLVM_wasm64 == Triple::wasm64, "");
960static_assert((Triple::ArchType)ZigLLVM_renderscript32 == Triple::renderscript32, "");
961static_assert((Triple::ArchType)ZigLLVM_renderscript64 == Triple::renderscript64, "");
962// Uncomment this when testing LLVM 8.0.0
963//static_assert((Triple::ArchType)ZigLLVM_LastArchType == Triple::LastArchType, "");
964
965static_assert((Triple::SubArchType)ZigLLVM_NoSubArch == Triple::NoSubArch, "");
966static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v8_4a == Triple::ARMSubArch_v8_4a, "");
967static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v8_3a == Triple::ARMSubArch_v8_3a, "");
968static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v8_2a == Triple::ARMSubArch_v8_2a, "");
969static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v8_1a == Triple::ARMSubArch_v8_1a, "");
970static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v8 == Triple::ARMSubArch_v8, "");
971static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v8r == Triple::ARMSubArch_v8r, "");
972static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v8m_baseline == Triple::ARMSubArch_v8m_baseline, "");
973static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v8m_mainline == Triple::ARMSubArch_v8m_mainline, "");
974static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v7 == Triple::ARMSubArch_v7, "");
975static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v7em == Triple::ARMSubArch_v7em, "");
976static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v7m == Triple::ARMSubArch_v7m, "");
977static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v7s == Triple::ARMSubArch_v7s, "");
978static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v7k == Triple::ARMSubArch_v7k, "");
979static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v7ve == Triple::ARMSubArch_v7ve, "");
980static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v6 == Triple::ARMSubArch_v6, "");
981static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v6m == Triple::ARMSubArch_v6m, "");
982static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v6k == Triple::ARMSubArch_v6k, "");
983static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v6t2 == Triple::ARMSubArch_v6t2, "");
984static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v5 == Triple::ARMSubArch_v5, "");
985static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v5te == Triple::ARMSubArch_v5te, "");
986static_assert((Triple::SubArchType)ZigLLVM_ARMSubArch_v4t == Triple::ARMSubArch_v4t, "");
987static_assert((Triple::SubArchType)ZigLLVM_KalimbaSubArch_v3 == Triple::KalimbaSubArch_v3, "");
988static_assert((Triple::SubArchType)ZigLLVM_KalimbaSubArch_v4 == Triple::KalimbaSubArch_v4, "");
989static_assert((Triple::SubArchType)ZigLLVM_KalimbaSubArch_v5 == Triple::KalimbaSubArch_v5, "");
990
991static_assert((Triple::VendorType)ZigLLVM_UnknownVendor == Triple::UnknownVendor, "");
992static_assert((Triple::VendorType)ZigLLVM_Apple == Triple::Apple, "");
993static_assert((Triple::VendorType)ZigLLVM_PC == Triple::PC, "");
994static_assert((Triple::VendorType)ZigLLVM_SCEI == Triple::SCEI, "");
995static_assert((Triple::VendorType)ZigLLVM_BGP == Triple::BGP, "");
996static_assert((Triple::VendorType)ZigLLVM_BGQ == Triple::BGQ, "");
997static_assert((Triple::VendorType)ZigLLVM_Freescale == Triple::Freescale, "");
998static_assert((Triple::VendorType)ZigLLVM_IBM == Triple::IBM, "");
999static_assert((Triple::VendorType)ZigLLVM_ImaginationTechnologies == Triple::ImaginationTechnologies, "");
1000static_assert((Triple::VendorType)ZigLLVM_MipsTechnologies == Triple::MipsTechnologies, "");
1001static_assert((Triple::VendorType)ZigLLVM_NVIDIA == Triple::NVIDIA, "");
1002static_assert((Triple::VendorType)ZigLLVM_CSR == Triple::CSR, "");
1003static_assert((Triple::VendorType)ZigLLVM_Myriad == Triple::Myriad, "");
1004static_assert((Triple::VendorType)ZigLLVM_AMD == Triple::AMD, "");
1005static_assert((Triple::VendorType)ZigLLVM_Mesa == Triple::Mesa, "");
1006static_assert((Triple::VendorType)ZigLLVM_SUSE == Triple::SUSE, "");
1007static_assert((Triple::VendorType)ZigLLVM_OpenEmbedded == Triple::OpenEmbedded, "");
1008// Uncomment this when testing LLVM 8.0.0
1009//static_assert((Triple::VendorType)ZigLLVM_LastVendorType == Triple::LastVendorType, "");
1010
1011static_assert((Triple::OSType)ZigLLVM_UnknownOS == Triple::UnknownOS, "");
1012static_assert((Triple::OSType)ZigLLVM_Ananas == Triple::Ananas, "");
1013static_assert((Triple::OSType)ZigLLVM_CloudABI == Triple::CloudABI, "");
1014static_assert((Triple::OSType)ZigLLVM_Darwin == Triple::Darwin, "");
1015static_assert((Triple::OSType)ZigLLVM_DragonFly == Triple::DragonFly, "");
1016static_assert((Triple::OSType)ZigLLVM_FreeBSD == Triple::FreeBSD, "");
1017static_assert((Triple::OSType)ZigLLVM_Fuchsia == Triple::Fuchsia, "");
1018static_assert((Triple::OSType)ZigLLVM_IOS == Triple::IOS, "");
1019static_assert((Triple::OSType)ZigLLVM_KFreeBSD == Triple::KFreeBSD, "");
1020static_assert((Triple::OSType)ZigLLVM_Linux == Triple::Linux, "");
1021static_assert((Triple::OSType)ZigLLVM_Lv2 == Triple::Lv2, "");
1022static_assert((Triple::OSType)ZigLLVM_MacOSX == Triple::MacOSX, "");
1023static_assert((Triple::OSType)ZigLLVM_NetBSD == Triple::NetBSD, "");
1024static_assert((Triple::OSType)ZigLLVM_OpenBSD == Triple::OpenBSD, "");
1025static_assert((Triple::OSType)ZigLLVM_Solaris == Triple::Solaris, "");
1026static_assert((Triple::OSType)ZigLLVM_Win32 == Triple::Win32, "");
1027static_assert((Triple::OSType)ZigLLVM_Haiku == Triple::Haiku, "");
1028static_assert((Triple::OSType)ZigLLVM_Minix == Triple::Minix, "");
1029static_assert((Triple::OSType)ZigLLVM_RTEMS == Triple::RTEMS, "");
1030static_assert((Triple::OSType)ZigLLVM_NaCl == Triple::NaCl, "");
1031static_assert((Triple::OSType)ZigLLVM_CNK == Triple::CNK, "");
1032static_assert((Triple::OSType)ZigLLVM_AIX == Triple::AIX, "");
1033static_assert((Triple::OSType)ZigLLVM_CUDA == Triple::CUDA, "");
1034static_assert((Triple::OSType)ZigLLVM_NVCL == Triple::NVCL, "");
1035static_assert((Triple::OSType)ZigLLVM_AMDHSA == Triple::AMDHSA, "");
1036static_assert((Triple::OSType)ZigLLVM_PS4 == Triple::PS4, "");
1037static_assert((Triple::OSType)ZigLLVM_ELFIAMCU == Triple::ELFIAMCU, "");
1038static_assert((Triple::OSType)ZigLLVM_TvOS == Triple::TvOS, "");
1039static_assert((Triple::OSType)ZigLLVM_WatchOS == Triple::WatchOS, "");
1040static_assert((Triple::OSType)ZigLLVM_Mesa3D == Triple::Mesa3D, "");
1041static_assert((Triple::OSType)ZigLLVM_Contiki == Triple::Contiki, "");
1042static_assert((Triple::OSType)ZigLLVM_AMDPAL == Triple::AMDPAL, "");
1043// Uncomment this when testing LLVM 8.0.0
1044//static_assert((Triple::OSType)ZigLLVM_LastOSType == Triple::LastOSType, "");
1045
1046static_assert((Triple::EnvironmentType)ZigLLVM_UnknownEnvironment == Triple::UnknownEnvironment, "");
1047static_assert((Triple::EnvironmentType)ZigLLVM_GNU == Triple::GNU, "");
1048static_assert((Triple::EnvironmentType)ZigLLVM_GNUABIN32 == Triple::GNUABIN32, "");
1049static_assert((Triple::EnvironmentType)ZigLLVM_GNUABI64 == Triple::GNUABI64, "");
1050static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABI == Triple::GNUEABI, "");
1051static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABIHF == Triple::GNUEABIHF, "");
1052static_assert((Triple::EnvironmentType)ZigLLVM_GNUX32 == Triple::GNUX32, "");
1053static_assert((Triple::EnvironmentType)ZigLLVM_CODE16 == Triple::CODE16, "");
1054static_assert((Triple::EnvironmentType)ZigLLVM_EABI == Triple::EABI, "");
1055static_assert((Triple::EnvironmentType)ZigLLVM_EABIHF == Triple::EABIHF, "");
1056static_assert((Triple::EnvironmentType)ZigLLVM_Android == Triple::Android, "");
1057static_assert((Triple::EnvironmentType)ZigLLVM_Musl == Triple::Musl, "");
1058static_assert((Triple::EnvironmentType)ZigLLVM_MuslEABI == Triple::MuslEABI, "");
1059static_assert((Triple::EnvironmentType)ZigLLVM_MuslEABIHF == Triple::MuslEABIHF, "");
1060static_assert((Triple::EnvironmentType)ZigLLVM_MSVC == Triple::MSVC, "");
1061static_assert((Triple::EnvironmentType)ZigLLVM_Itanium == Triple::Itanium, "");
1062static_assert((Triple::EnvironmentType)ZigLLVM_Cygnus == Triple::Cygnus, "");
1063static_assert((Triple::EnvironmentType)ZigLLVM_CoreCLR == Triple::CoreCLR, "");
1064static_assert((Triple::EnvironmentType)ZigLLVM_Simulator == Triple::Simulator, "");
1065// Uncomment this when testing LLVM 8.0.0
1066//static_assert((Triple::EnvironmentType)ZigLLVM_LastEnvironmentType == Triple::LastEnvironmentType, "");
1067
1068static_assert((Triple::ObjectFormatType)ZigLLVM_UnknownObjectFormat == Triple::UnknownObjectFormat, "");
1069static_assert((Triple::ObjectFormatType)ZigLLVM_COFF == Triple::COFF, "");
1070static_assert((Triple::ObjectFormatType)ZigLLVM_ELF == Triple::ELF, "");
1071static_assert((Triple::ObjectFormatType)ZigLLVM_MachO == Triple::MachO, "");
1072static_assert((Triple::ObjectFormatType)ZigLLVM_Wasm == Triple::Wasm, "");