authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-02-25 21:14:40-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-25 19:41:30-08:00
logdc325669e360f7a9dfa24f85a62fa386529dade6
treed541362d9af40cca2e9e0f531a5f316e95839d3a
parent1ac512df70465629d1e80ff02be51c121c6f4c07

fix to compile against 12.0.0-rc2

4 files changed, 12 insertions(+), 2 deletions(-)

src/stage1/target.cpp+7
...@@ -31,6 +31,7 @@ static const ZigLLVM_ArchType arch_list[] = {...@@ -31,6 +31,7 @@ static const ZigLLVM_ArchType arch_list[] = {
31 ZigLLVM_mips64el, // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el31 ZigLLVM_mips64el, // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el
32 ZigLLVM_msp430, // MSP430: msp43032 ZigLLVM_msp430, // MSP430: msp430
33 ZigLLVM_ppc, // PPC: powerpc33 ZigLLVM_ppc, // PPC: powerpc
34 ZigLLVM_ppcle, // PPCLE: powerpc (little endian)
34 ZigLLVM_ppc64, // PPC64: powerpc64, ppu35 ZigLLVM_ppc64, // PPC64: powerpc64, ppu
35 ZigLLVM_ppc64le, // PPC64LE: powerpc64le36 ZigLLVM_ppc64le, // PPC64LE: powerpc64le
36 ZigLLVM_r600, // R600: AMD GPUs HD2XXX - HD6XXX37 ZigLLVM_r600, // R600: AMD GPUs HD2XXX - HD6XXX
...@@ -134,6 +135,7 @@ static const ZigLLVM_EnvironmentType abi_list[] = {...@@ -134,6 +135,7 @@ static const ZigLLVM_EnvironmentType abi_list[] = {
134 ZigLLVM_GNUEABI,135 ZigLLVM_GNUEABI,
135 ZigLLVM_GNUEABIHF,136 ZigLLVM_GNUEABIHF,
136 ZigLLVM_GNUX32,137 ZigLLVM_GNUX32,
138 ZigLLVM_GNUILP32,
137 ZigLLVM_CODE16,139 ZigLLVM_CODE16,
138 ZigLLVM_EABI,140 ZigLLVM_EABI,
139 ZigLLVM_EABIHF,141 ZigLLVM_EABIHF,
...@@ -484,6 +486,7 @@ uint32_t target_arch_pointer_bit_width(ZigLLVM_ArchType arch) {...@@ -484,6 +486,7 @@ uint32_t target_arch_pointer_bit_width(ZigLLVM_ArchType arch) {
484 case ZigLLVM_mipsel:486 case ZigLLVM_mipsel:
485 case ZigLLVM_nvptx:487 case ZigLLVM_nvptx:
486 case ZigLLVM_ppc:488 case ZigLLVM_ppc:
489 case ZigLLVM_ppcle:
487 case ZigLLVM_r600:490 case ZigLLVM_r600:
488 case ZigLLVM_riscv32:491 case ZigLLVM_riscv32:
489 case ZigLLVM_sparc:492 case ZigLLVM_sparc:
...@@ -550,6 +553,7 @@ uint32_t target_arch_largest_atomic_bits(ZigLLVM_ArchType arch) {...@@ -550,6 +553,7 @@ uint32_t target_arch_largest_atomic_bits(ZigLLVM_ArchType arch) {
550 case ZigLLVM_mipsel:553 case ZigLLVM_mipsel:
551 case ZigLLVM_nvptx:554 case ZigLLVM_nvptx:
552 case ZigLLVM_ppc:555 case ZigLLVM_ppc:
556 case ZigLLVM_ppcle:
553 case ZigLLVM_r600:557 case ZigLLVM_r600:
554 case ZigLLVM_riscv32:558 case ZigLLVM_riscv32:
555 case ZigLLVM_sparc:559 case ZigLLVM_sparc:
...@@ -800,6 +804,7 @@ const char *arch_stack_pointer_register_name(ZigLLVM_ArchType arch) {...@@ -800,6 +804,7 @@ const char *arch_stack_pointer_register_name(ZigLLVM_ArchType arch) {
800 case ZigLLVM_riscv64:804 case ZigLLVM_riscv64:
801 case ZigLLVM_mipsel:805 case ZigLLVM_mipsel:
802 case ZigLLVM_ppc:806 case ZigLLVM_ppc:
807 case ZigLLVM_ppcle:
803 case ZigLLVM_ppc64:808 case ZigLLVM_ppc64:
804 case ZigLLVM_ppc64le:809 case ZigLLVM_ppc64le:
805 return "sp";810 return "sp";
...@@ -904,6 +909,7 @@ bool target_is_arm(const ZigTarget *target) {...@@ -904,6 +909,7 @@ bool target_is_arm(const ZigTarget *target) {
904 case ZigLLVM_wasm64:909 case ZigLLVM_wasm64:
905 case ZigLLVM_xcore:910 case ZigLLVM_xcore:
906 case ZigLLVM_ppc:911 case ZigLLVM_ppc:
912 case ZigLLVM_ppcle:
907 case ZigLLVM_ppc64:913 case ZigLLVM_ppc64:
908 case ZigLLVM_ve:914 case ZigLLVM_ve:
909 return false;915 return false;
...@@ -1097,6 +1103,7 @@ const char *target_libc_generic_name(const ZigTarget *target) {...@@ -1097,6 +1103,7 @@ const char *target_libc_generic_name(const ZigTarget *target) {
1097 case ZigLLVM_GNUEABI:1103 case ZigLLVM_GNUEABI:
1098 case ZigLLVM_GNUEABIHF:1104 case ZigLLVM_GNUEABIHF:
1099 case ZigLLVM_GNUX32:1105 case ZigLLVM_GNUX32:
1106 case ZigLLVM_GNUILP32:
1100 return "glibc";1107 return "glibc";
1101 case ZigLLVM_Musl:1108 case ZigLLVM_Musl:
1102 case ZigLLVM_MuslEABI:1109 case ZigLLVM_MuslEABI:
src/zig_clang_cc1_main.cpp+1-2
...@@ -251,8 +251,7 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {...@@ -251,8 +251,7 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
251 if (auto profilerOutput =251 if (auto profilerOutput =
252 Clang->createOutputFile(Path.str(),252 Clang->createOutputFile(Path.str(),
253 /*Binary=*/false,253 /*Binary=*/false,
254 /*RemoveFileOnSignal=*/false, "",254 /*RemoveFileOnSignal=*/false,
255 /*Extension=*/"json",
256 /*useTemporary=*/false)) {255 /*useTemporary=*/false)) {
257256
258 llvm::timeTraceProfilerWrite(*profilerOutput);257 llvm::timeTraceProfilerWrite(*profilerOutput);
src/zig_llvm.cpp+2
...@@ -1190,6 +1190,7 @@ static_assert((Triple::ArchType)ZigLLVM_mips64 == Triple::mips64, "");...@@ -1190,6 +1190,7 @@ static_assert((Triple::ArchType)ZigLLVM_mips64 == Triple::mips64, "");
1190static_assert((Triple::ArchType)ZigLLVM_mips64el == Triple::mips64el, "");1190static_assert((Triple::ArchType)ZigLLVM_mips64el == Triple::mips64el, "");
1191static_assert((Triple::ArchType)ZigLLVM_msp430 == Triple::msp430, "");1191static_assert((Triple::ArchType)ZigLLVM_msp430 == Triple::msp430, "");
1192static_assert((Triple::ArchType)ZigLLVM_ppc == Triple::ppc, "");1192static_assert((Triple::ArchType)ZigLLVM_ppc == Triple::ppc, "");
1193static_assert((Triple::ArchType)ZigLLVM_ppcle == Triple::ppcle, "");
1193static_assert((Triple::ArchType)ZigLLVM_ppc64 == Triple::ppc64, "");1194static_assert((Triple::ArchType)ZigLLVM_ppc64 == Triple::ppc64, "");
1194static_assert((Triple::ArchType)ZigLLVM_ppc64le == Triple::ppc64le, "");1195static_assert((Triple::ArchType)ZigLLVM_ppc64le == Triple::ppc64le, "");
1195static_assert((Triple::ArchType)ZigLLVM_r600 == Triple::r600, "");1196static_assert((Triple::ArchType)ZigLLVM_r600 == Triple::r600, "");
...@@ -1291,6 +1292,7 @@ static_assert((Triple::EnvironmentType)ZigLLVM_GNUABI64 == Triple::GNUABI64, "")...@@ -1291,6 +1292,7 @@ static_assert((Triple::EnvironmentType)ZigLLVM_GNUABI64 == Triple::GNUABI64, "")
1291static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABI == Triple::GNUEABI, "");1292static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABI == Triple::GNUEABI, "");
1292static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABIHF == Triple::GNUEABIHF, "");1293static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABIHF == Triple::GNUEABIHF, "");
1293static_assert((Triple::EnvironmentType)ZigLLVM_GNUX32 == Triple::GNUX32, "");1294static_assert((Triple::EnvironmentType)ZigLLVM_GNUX32 == Triple::GNUX32, "");
1295static_assert((Triple::EnvironmentType)ZigLLVM_GNUILP32 == Triple::GNUILP32, "");
1294static_assert((Triple::EnvironmentType)ZigLLVM_CODE16 == Triple::CODE16, "");1296static_assert((Triple::EnvironmentType)ZigLLVM_CODE16 == Triple::CODE16, "");
1295static_assert((Triple::EnvironmentType)ZigLLVM_EABI == Triple::EABI, "");1297static_assert((Triple::EnvironmentType)ZigLLVM_EABI == Triple::EABI, "");
1296static_assert((Triple::EnvironmentType)ZigLLVM_EABIHF == Triple::EABIHF, "");1298static_assert((Triple::EnvironmentType)ZigLLVM_EABIHF == Triple::EABIHF, "");
src/zig_llvm.h+2
...@@ -296,6 +296,7 @@ enum ZigLLVM_ArchType {...@@ -296,6 +296,7 @@ enum ZigLLVM_ArchType {
296 ZigLLVM_mips64el, // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el296 ZigLLVM_mips64el, // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el
297 ZigLLVM_msp430, // MSP430: msp430297 ZigLLVM_msp430, // MSP430: msp430
298 ZigLLVM_ppc, // PPC: powerpc298 ZigLLVM_ppc, // PPC: powerpc
299 ZigLLVM_ppcle, // PPCLE: powerpc (little endian)
299 ZigLLVM_ppc64, // PPC64: powerpc64, ppu300 ZigLLVM_ppc64, // PPC64: powerpc64, ppu
300 ZigLLVM_ppc64le, // PPC64LE: powerpc64le301 ZigLLVM_ppc64le, // PPC64LE: powerpc64le
301 ZigLLVM_r600, // R600: AMD GPUs HD2XXX - HD6XXX302 ZigLLVM_r600, // R600: AMD GPUs HD2XXX - HD6XXX
...@@ -408,6 +409,7 @@ enum ZigLLVM_EnvironmentType {...@@ -408,6 +409,7 @@ enum ZigLLVM_EnvironmentType {
408 ZigLLVM_GNUEABI,409 ZigLLVM_GNUEABI,
409 ZigLLVM_GNUEABIHF,410 ZigLLVM_GNUEABIHF,
410 ZigLLVM_GNUX32,411 ZigLLVM_GNUX32,
412 ZigLLVM_GNUILP32,
411 ZigLLVM_CODE16,413 ZigLLVM_CODE16,
412 ZigLLVM_EABI,414 ZigLLVM_EABI,
413 ZigLLVM_EABIHF,415 ZigLLVM_EABIHF,