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) {
233233 builtin.Arch.le32,
234234 builtin.Arch.mipsr6,
235235 builtin.Arch.mipselr6,
236 builtin.Arch.nios2,
237236 builtin.Arch.powerpc,
238237 builtin.Arch.r600,
239238 builtin.Arch.riscv32,
......@@ -438,7 +437,6 @@ pub const Target = union(enum) {
438437 builtin.Arch.bpfeb,
439438 builtin.Arch.hexagon,
440439 builtin.Arch.msp430,
441 builtin.Arch.nios2,
442440 builtin.Arch.r600,
443441 builtin.Arch.amdgcn,
444442 builtin.Arch.riscv32,
......@@ -576,6 +574,7 @@ pub const Target = union(enum) {
576574 builtin.Os.amdpal,
577575 builtin.Os.hermit,
578576 builtin.Os.hurd,
577 builtin.Os.wasi,
579578 => @panic("TODO specify the C integer type sizes for this OS"),
580579 }
581580 }
src/target.cpp+7-5
......@@ -91,7 +91,6 @@ static const ArchType arch_list[] = {
9191 {ZigLLVM_mips64el, ZigLLVM_MipsSubArch_r6},
9292
9393 {ZigLLVM_msp430, ZigLLVM_NoSubArch},
94 {ZigLLVM_nios2, ZigLLVM_NoSubArch},
9594 {ZigLLVM_ppc, ZigLLVM_NoSubArch},
9695 {ZigLLVM_ppc64, ZigLLVM_NoSubArch},
9796 {ZigLLVM_ppc64le, ZigLLVM_NoSubArch},
......@@ -185,6 +184,7 @@ static const Os os_list[] = {
185184 OsAMDPAL,
186185 OsHermitCore,
187186 OsHurd,
187 OsWASI,
188188 OsZen,
189189 OsUefi,
190190};
......@@ -333,6 +333,8 @@ ZigLLVM_OSType get_llvm_os_type(Os os_type) {
333333 return ZigLLVM_HermitCore;
334334 case OsHurd:
335335 return ZigLLVM_Hurd;
336 case OsWASI:
337 return ZigLLVM_WASI;
336338 }
337339 zig_unreachable();
338340}
......@@ -406,6 +408,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
406408 return OsHermitCore;
407409 case ZigLLVM_Hurd:
408410 return OsHurd;
411 case ZigLLVM_WASI:
412 return OsWASI;
409413 }
410414 zig_unreachable();
411415}
......@@ -450,6 +454,7 @@ const char *get_target_os_name(Os os_type) {
450454 case OsAMDPAL:
451455 case OsHermitCore:
452456 case OsHurd:
457 case OsWASI:
453458 return ZigLLVMGetOSTypeName(get_llvm_os_type(os_type));
454459 }
455460 zig_unreachable();
......@@ -617,7 +622,6 @@ void resolve_target_object_format(ZigTarget *target) {
617622 case ZigLLVM_mips64el:
618623 case ZigLLVM_mipsel:
619624 case ZigLLVM_msp430:
620 case ZigLLVM_nios2:
621625 case ZigLLVM_nvptx:
622626 case ZigLLVM_nvptx64:
623627 case ZigLLVM_ppc64le:
......@@ -674,7 +678,6 @@ static int get_arch_pointer_bit_width(ZigLLVM_ArchType arch) {
674678 case ZigLLVM_le32:
675679 case ZigLLVM_mips:
676680 case ZigLLVM_mipsel:
677 case ZigLLVM_nios2:
678681 case ZigLLVM_nvptx:
679682 case ZigLLVM_ppc:
680683 case ZigLLVM_r600:
......@@ -826,6 +829,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
826829 case OsAMDPAL:
827830 case OsHermitCore:
828831 case OsHurd:
832 case OsWASI:
829833 zig_panic("TODO c type size in bits for this target");
830834 }
831835 zig_unreachable();
......@@ -1014,7 +1018,6 @@ const char *arch_stack_pointer_register_name(const ArchType *arch) {
10141018 case ZigLLVM_mips64el:
10151019 case ZigLLVM_mipsel:
10161020 case ZigLLVM_msp430:
1017 case ZigLLVM_nios2:
10181021 case ZigLLVM_nvptx:
10191022 case ZigLLVM_nvptx64:
10201023 case ZigLLVM_ppc64le:
......@@ -1076,7 +1079,6 @@ bool target_is_arm(const ZigTarget *target) {
10761079 case ZigLLVM_mips64el:
10771080 case ZigLLVM_mipsel:
10781081 case ZigLLVM_msp430:
1079 case ZigLLVM_nios2:
10801082 case ZigLLVM_nvptx:
10811083 case ZigLLVM_nvptx64:
10821084 case ZigLLVM_ppc64le:
src/target.hpp+1
......@@ -52,6 +52,7 @@ enum Os {
5252 OsAMDPAL,
5353 OsHermitCore,
5454 OsHurd,
55 OsWASI,
5556 OsZen,
5657 OsUefi,
5758};
src/zig_llvm.cpp-1
......@@ -929,7 +929,6 @@ static_assert((Triple::ArchType)ZigLLVM_mipsel == Triple::mipsel, "");
929929static_assert((Triple::ArchType)ZigLLVM_mips64 == Triple::mips64, "");
930930static_assert((Triple::ArchType)ZigLLVM_mips64el == Triple::mips64el, "");
931931static_assert((Triple::ArchType)ZigLLVM_msp430 == Triple::msp430, "");
932static_assert((Triple::ArchType)ZigLLVM_nios2 == Triple::nios2, "");
933932static_assert((Triple::ArchType)ZigLLVM_ppc == Triple::ppc, "");
934933static_assert((Triple::ArchType)ZigLLVM_ppc64 == Triple::ppc64, "");
935934static_assert((Triple::ArchType)ZigLLVM_ppc64le == Triple::ppc64le, "");
src/zig_llvm.h+6-6
......@@ -226,12 +226,11 @@ enum ZigLLVM_ArchType {
226226 ZigLLVM_bpfel, // eBPF or extended BPF or 64-bit BPF (little endian)
227227 ZigLLVM_bpfeb, // eBPF or extended BPF or 64-bit BPF (big endian)
228228 ZigLLVM_hexagon, // Hexagon: hexagon
229 ZigLLVM_mips, // MIPS: mips, mipsallegrex
230 ZigLLVM_mipsel, // MIPSEL: mipsel, mipsallegrexel
231 ZigLLVM_mips64, // MIPS64: mips64
232 ZigLLVM_mips64el, // MIPS64EL: mips64el
229 ZigLLVM_mips, // MIPS: mips, mipsallegrex, mipsr6
230 ZigLLVM_mipsel, // MIPSEL: mipsel, mipsallegrexe, mipsr6el
231 ZigLLVM_mips64, // MIPS64: mips64, mips64r6, mipsn32, mipsn32r6
232 ZigLLVM_mips64el, // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el
233233 ZigLLVM_msp430, // MSP430: msp430
234 ZigLLVM_nios2, // NIOSII: nios2
235234 ZigLLVM_ppc, // PPC: powerpc
236235 ZigLLVM_ppc64, // PPC64: powerpc64, ppu
237236 ZigLLVM_ppc64le, // PPC64LE: powerpc64le
......@@ -363,8 +362,9 @@ enum ZigLLVM_OSType {
363362 ZigLLVM_AMDPAL, // AMD PAL Runtime
364363 ZigLLVM_HermitCore, // HermitCore Unikernel/Multikernel
365364 ZigLLVM_Hurd, // GNU/Hurd
365 ZigLLVM_WASI, // Experimental WebAssembly OS
366366
367 ZigLLVM_LastOSType = ZigLLVM_Hurd
367 ZigLLVM_LastOSType = ZigLLVM_WASI
368368};
369369
370370// Synchronize with target.cpp::environ_list