authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-01-24 09:31:00-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-01-24 09:31:00-05:00
log1411df4e2705e677003e6e5b5cbe1ca30bf637d7
tree464b66cf46b7560c5a9ee9a17724fa268ad7b5c4
parent87f5bed11fa9b92f63f6c2eea1e3c8d4fcefa44d

update to llvm8 trunk. all tests passing

5 files changed, 15 insertions(+), 14 deletions(-)

src-self-hosted/target.zig+1-2
...@@ -233,7 +233,6 @@ pub const Target = union(enum) {...@@ -233,7 +233,6 @@ pub const Target = union(enum) {
233 builtin.Arch.le32,233 builtin.Arch.le32,
234 builtin.Arch.mipsr6,234 builtin.Arch.mipsr6,
235 builtin.Arch.mipselr6,235 builtin.Arch.mipselr6,
236 builtin.Arch.nios2,
237 builtin.Arch.powerpc,236 builtin.Arch.powerpc,
238 builtin.Arch.r600,237 builtin.Arch.r600,
239 builtin.Arch.riscv32,238 builtin.Arch.riscv32,
...@@ -438,7 +437,6 @@ pub const Target = union(enum) {...@@ -438,7 +437,6 @@ pub const Target = union(enum) {
438 builtin.Arch.bpfeb,437 builtin.Arch.bpfeb,
439 builtin.Arch.hexagon,438 builtin.Arch.hexagon,
440 builtin.Arch.msp430,439 builtin.Arch.msp430,
441 builtin.Arch.nios2,
442 builtin.Arch.r600,440 builtin.Arch.r600,
443 builtin.Arch.amdgcn,441 builtin.Arch.amdgcn,
444 builtin.Arch.riscv32,442 builtin.Arch.riscv32,
...@@ -576,6 +574,7 @@ pub const Target = union(enum) {...@@ -576,6 +574,7 @@ pub const Target = union(enum) {
576 builtin.Os.amdpal,574 builtin.Os.amdpal,
577 builtin.Os.hermit,575 builtin.Os.hermit,
578 builtin.Os.hurd,576 builtin.Os.hurd,
577 builtin.Os.wasi,
579 => @panic("TODO specify the C integer type sizes for this OS"),578 => @panic("TODO specify the C integer type sizes for this OS"),
580 }579 }
581 }580 }
src/target.cpp+7-5
...@@ -91,7 +91,6 @@ static const ArchType arch_list[] = {...@@ -91,7 +91,6 @@ static const ArchType arch_list[] = {
91 {ZigLLVM_mips64el, ZigLLVM_MipsSubArch_r6},91 {ZigLLVM_mips64el, ZigLLVM_MipsSubArch_r6},
9292
93 {ZigLLVM_msp430, ZigLLVM_NoSubArch},93 {ZigLLVM_msp430, ZigLLVM_NoSubArch},
94 {ZigLLVM_nios2, ZigLLVM_NoSubArch},
95 {ZigLLVM_ppc, ZigLLVM_NoSubArch},94 {ZigLLVM_ppc, ZigLLVM_NoSubArch},
96 {ZigLLVM_ppc64, ZigLLVM_NoSubArch},95 {ZigLLVM_ppc64, ZigLLVM_NoSubArch},
97 {ZigLLVM_ppc64le, ZigLLVM_NoSubArch},96 {ZigLLVM_ppc64le, ZigLLVM_NoSubArch},
...@@ -185,6 +184,7 @@ static const Os os_list[] = {...@@ -185,6 +184,7 @@ static const Os os_list[] = {
185 OsAMDPAL,184 OsAMDPAL,
186 OsHermitCore,185 OsHermitCore,
187 OsHurd,186 OsHurd,
187 OsWASI,
188 OsZen,188 OsZen,
189 OsUefi,189 OsUefi,
190};190};
...@@ -333,6 +333,8 @@ ZigLLVM_OSType get_llvm_os_type(Os os_type) {...@@ -333,6 +333,8 @@ ZigLLVM_OSType get_llvm_os_type(Os os_type) {
333 return ZigLLVM_HermitCore;333 return ZigLLVM_HermitCore;
334 case OsHurd:334 case OsHurd:
335 return ZigLLVM_Hurd;335 return ZigLLVM_Hurd;
336 case OsWASI:
337 return ZigLLVM_WASI;
336 }338 }
337 zig_unreachable();339 zig_unreachable();
338}340}
...@@ -406,6 +408,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {...@@ -406,6 +408,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
406 return OsHermitCore;408 return OsHermitCore;
407 case ZigLLVM_Hurd:409 case ZigLLVM_Hurd:
408 return OsHurd;410 return OsHurd;
411 case ZigLLVM_WASI:
412 return OsWASI;
409 }413 }
410 zig_unreachable();414 zig_unreachable();
411}415}
...@@ -450,6 +454,7 @@ const char *get_target_os_name(Os os_type) {...@@ -450,6 +454,7 @@ const char *get_target_os_name(Os os_type) {
450 case OsAMDPAL:454 case OsAMDPAL:
451 case OsHermitCore:455 case OsHermitCore:
452 case OsHurd:456 case OsHurd:
457 case OsWASI:
453 return ZigLLVMGetOSTypeName(get_llvm_os_type(os_type));458 return ZigLLVMGetOSTypeName(get_llvm_os_type(os_type));
454 }459 }
455 zig_unreachable();460 zig_unreachable();
...@@ -617,7 +622,6 @@ void resolve_target_object_format(ZigTarget *target) {...@@ -617,7 +622,6 @@ void resolve_target_object_format(ZigTarget *target) {
617 case ZigLLVM_mips64el:622 case ZigLLVM_mips64el:
618 case ZigLLVM_mipsel:623 case ZigLLVM_mipsel:
619 case ZigLLVM_msp430:624 case ZigLLVM_msp430:
620 case ZigLLVM_nios2:
621 case ZigLLVM_nvptx:625 case ZigLLVM_nvptx:
622 case ZigLLVM_nvptx64:626 case ZigLLVM_nvptx64:
623 case ZigLLVM_ppc64le:627 case ZigLLVM_ppc64le:
...@@ -674,7 +678,6 @@ static int get_arch_pointer_bit_width(ZigLLVM_ArchType arch) {...@@ -674,7 +678,6 @@ static int get_arch_pointer_bit_width(ZigLLVM_ArchType arch) {
674 case ZigLLVM_le32:678 case ZigLLVM_le32:
675 case ZigLLVM_mips:679 case ZigLLVM_mips:
676 case ZigLLVM_mipsel:680 case ZigLLVM_mipsel:
677 case ZigLLVM_nios2:
678 case ZigLLVM_nvptx:681 case ZigLLVM_nvptx:
679 case ZigLLVM_ppc:682 case ZigLLVM_ppc:
680 case ZigLLVM_r600:683 case ZigLLVM_r600:
...@@ -826,6 +829,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {...@@ -826,6 +829,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
826 case OsAMDPAL:829 case OsAMDPAL:
827 case OsHermitCore:830 case OsHermitCore:
828 case OsHurd:831 case OsHurd:
832 case OsWASI:
829 zig_panic("TODO c type size in bits for this target");833 zig_panic("TODO c type size in bits for this target");
830 }834 }
831 zig_unreachable();835 zig_unreachable();
...@@ -1014,7 +1018,6 @@ const char *arch_stack_pointer_register_name(const ArchType *arch) {...@@ -1014,7 +1018,6 @@ const char *arch_stack_pointer_register_name(const ArchType *arch) {
1014 case ZigLLVM_mips64el:1018 case ZigLLVM_mips64el:
1015 case ZigLLVM_mipsel:1019 case ZigLLVM_mipsel:
1016 case ZigLLVM_msp430:1020 case ZigLLVM_msp430:
1017 case ZigLLVM_nios2:
1018 case ZigLLVM_nvptx:1021 case ZigLLVM_nvptx:
1019 case ZigLLVM_nvptx64:1022 case ZigLLVM_nvptx64:
1020 case ZigLLVM_ppc64le:1023 case ZigLLVM_ppc64le:
...@@ -1076,7 +1079,6 @@ bool target_is_arm(const ZigTarget *target) {...@@ -1076,7 +1079,6 @@ bool target_is_arm(const ZigTarget *target) {
1076 case ZigLLVM_mips64el:1079 case ZigLLVM_mips64el:
1077 case ZigLLVM_mipsel:1080 case ZigLLVM_mipsel:
1078 case ZigLLVM_msp430:1081 case ZigLLVM_msp430:
1079 case ZigLLVM_nios2:
1080 case ZigLLVM_nvptx:1082 case ZigLLVM_nvptx:
1081 case ZigLLVM_nvptx64:1083 case ZigLLVM_nvptx64:
1082 case ZigLLVM_ppc64le:1084 case ZigLLVM_ppc64le:
src/target.hpp+1
...@@ -52,6 +52,7 @@ enum Os {...@@ -52,6 +52,7 @@ enum Os {
52 OsAMDPAL,52 OsAMDPAL,
53 OsHermitCore,53 OsHermitCore,
54 OsHurd,54 OsHurd,
55 OsWASI,
55 OsZen,56 OsZen,
56 OsUefi,57 OsUefi,
57};58};
src/zig_llvm.cpp-1
...@@ -929,7 +929,6 @@ static_assert((Triple::ArchType)ZigLLVM_mipsel == Triple::mipsel, "");...@@ -929,7 +929,6 @@ static_assert((Triple::ArchType)ZigLLVM_mipsel == Triple::mipsel, "");
929static_assert((Triple::ArchType)ZigLLVM_mips64 == Triple::mips64, "");929static_assert((Triple::ArchType)ZigLLVM_mips64 == Triple::mips64, "");
930static_assert((Triple::ArchType)ZigLLVM_mips64el == Triple::mips64el, "");930static_assert((Triple::ArchType)ZigLLVM_mips64el == Triple::mips64el, "");
931static_assert((Triple::ArchType)ZigLLVM_msp430 == Triple::msp430, "");931static_assert((Triple::ArchType)ZigLLVM_msp430 == Triple::msp430, "");
932static_assert((Triple::ArchType)ZigLLVM_nios2 == Triple::nios2, "");
933static_assert((Triple::ArchType)ZigLLVM_ppc == Triple::ppc, "");932static_assert((Triple::ArchType)ZigLLVM_ppc == Triple::ppc, "");
934static_assert((Triple::ArchType)ZigLLVM_ppc64 == Triple::ppc64, "");933static_assert((Triple::ArchType)ZigLLVM_ppc64 == Triple::ppc64, "");
935static_assert((Triple::ArchType)ZigLLVM_ppc64le == Triple::ppc64le, "");934static_assert((Triple::ArchType)ZigLLVM_ppc64le == Triple::ppc64le, "");
src/zig_llvm.h+6-6
...@@ -226,12 +226,11 @@ enum ZigLLVM_ArchType {...@@ -226,12 +226,11 @@ enum ZigLLVM_ArchType {
226 ZigLLVM_bpfel, // eBPF or extended BPF or 64-bit BPF (little endian)226 ZigLLVM_bpfel, // eBPF or extended BPF or 64-bit BPF (little endian)
227 ZigLLVM_bpfeb, // eBPF or extended BPF or 64-bit BPF (big endian)227 ZigLLVM_bpfeb, // eBPF or extended BPF or 64-bit BPF (big endian)
228 ZigLLVM_hexagon, // Hexagon: hexagon228 ZigLLVM_hexagon, // Hexagon: hexagon
229 ZigLLVM_mips, // MIPS: mips, mipsallegrex229 ZigLLVM_mips, // MIPS: mips, mipsallegrex, mipsr6
230 ZigLLVM_mipsel, // MIPSEL: mipsel, mipsallegrexel230 ZigLLVM_mipsel, // MIPSEL: mipsel, mipsallegrexe, mipsr6el
231 ZigLLVM_mips64, // MIPS64: mips64231 ZigLLVM_mips64, // MIPS64: mips64, mips64r6, mipsn32, mipsn32r6
232 ZigLLVM_mips64el, // MIPS64EL: mips64el232 ZigLLVM_mips64el, // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el
233 ZigLLVM_msp430, // MSP430: msp430233 ZigLLVM_msp430, // MSP430: msp430
234 ZigLLVM_nios2, // NIOSII: nios2
235 ZigLLVM_ppc, // PPC: powerpc234 ZigLLVM_ppc, // PPC: powerpc
236 ZigLLVM_ppc64, // PPC64: powerpc64, ppu235 ZigLLVM_ppc64, // PPC64: powerpc64, ppu
237 ZigLLVM_ppc64le, // PPC64LE: powerpc64le236 ZigLLVM_ppc64le, // PPC64LE: powerpc64le
...@@ -363,8 +362,9 @@ enum ZigLLVM_OSType {...@@ -363,8 +362,9 @@ enum ZigLLVM_OSType {
363 ZigLLVM_AMDPAL, // AMD PAL Runtime362 ZigLLVM_AMDPAL, // AMD PAL Runtime
364 ZigLLVM_HermitCore, // HermitCore Unikernel/Multikernel363 ZigLLVM_HermitCore, // HermitCore Unikernel/Multikernel
365 ZigLLVM_Hurd, // GNU/Hurd364 ZigLLVM_Hurd, // GNU/Hurd
365 ZigLLVM_WASI, // Experimental WebAssembly OS
366366
367 ZigLLVM_LastOSType = ZigLLVM_Hurd367 ZigLLVM_LastOSType = ZigLLVM_WASI
368};368};
369369
370// Synchronize with target.cpp::environ_list370// Synchronize with target.cpp::environ_list