Commit dc325669e360f7a9dfa24f85a62fa386529dade6 | zig

author	Michael Dusan <michael.dusan@gmail.com> 2021-02-25 21:14:40-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-02-25 19:41:30-08:00
log	dc325669e360f7a9dfa24f85a62fa386529dade6
tree	d541362d9af40cca2e9e0f531a5f316e95839d3a
parent	1ac512df70465629d1e80ff02be51c121c6f4c07

fix to compile against 12.0.0-rc2

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

src
- stage1
  - target.cpp
- zig_clang_cc1_main.cpp
- zig_llvm.cpp
- zig_llvm.h

src/stage1/target.cpp+7

...	...	@@ -31,6 +31,7 @@ static const ZigLLVM_ArchType arch_list[] = {
31	31	ZigLLVM_mips64el, // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el
32	32	ZigLLVM_msp430, // MSP430: msp430
33	33	ZigLLVM_ppc, // PPC: powerpc
	34	ZigLLVM_ppcle, // PPCLE: powerpc (little endian)
34	35	ZigLLVM_ppc64, // PPC64: powerpc64, ppu
35	36	ZigLLVM_ppc64le, // PPC64LE: powerpc64le
36	37	ZigLLVM_r600, // R600: AMD GPUs HD2XXX - HD6XXX
...	...	@@ -134,6 +135,7 @@ static const ZigLLVM_EnvironmentType abi_list[] = {
134	135	ZigLLVM_GNUEABI,
135	136	ZigLLVM_GNUEABIHF,
136	137	ZigLLVM_GNUX32,
	138	ZigLLVM_GNUILP32,
137	139	ZigLLVM_CODE16,
138	140	ZigLLVM_EABI,
139	141	ZigLLVM_EABIHF,
...	...	@@ -484,6 +486,7 @@ uint32_t target_arch_pointer_bit_width(ZigLLVM_ArchType arch) {
484	486	case ZigLLVM_mipsel:
485	487	case ZigLLVM_nvptx:
486	488	case ZigLLVM_ppc:
	489	case ZigLLVM_ppcle:
487	490	case ZigLLVM_r600:
488	491	case ZigLLVM_riscv32:
489	492	case ZigLLVM_sparc:
...	...	@@ -550,6 +553,7 @@ uint32_t target_arch_largest_atomic_bits(ZigLLVM_ArchType arch) {
550	553	case ZigLLVM_mipsel:
551	554	case ZigLLVM_nvptx:
552	555	case ZigLLVM_ppc:
	556	case ZigLLVM_ppcle:
553	557	case ZigLLVM_r600:
554	558	case ZigLLVM_riscv32:
555	559	case ZigLLVM_sparc:
...	...	@@ -800,6 +804,7 @@ const char *arch_stack_pointer_register_name(ZigLLVM_ArchType arch) {
800	804	case ZigLLVM_riscv64:
801	805	case ZigLLVM_mipsel:
802	806	case ZigLLVM_ppc:
	807	case ZigLLVM_ppcle:
803	808	case ZigLLVM_ppc64:
804	809	case ZigLLVM_ppc64le:
805	810	return "sp";
...	...	@@ -904,6 +909,7 @@ bool target_is_arm(const ZigTarget *target) {
904	909	case ZigLLVM_wasm64:
905	910	case ZigLLVM_xcore:
906	911	case ZigLLVM_ppc:
	912	case ZigLLVM_ppcle:
907	913	case ZigLLVM_ppc64:
908	914	case ZigLLVM_ve:
909	915	return false;
...	...	@@ -1097,6 +1103,7 @@ const char target_libc_generic_name(const ZigTarget target) {
1097	1103	case ZigLLVM_GNUEABI:
1098	1104	case ZigLLVM_GNUEABIHF:
1099	1105	case ZigLLVM_GNUX32:
	1106	case ZigLLVM_GNUILP32:
1100	1107	return "glibc";
1101	1108	case ZigLLVM_Musl:
1102	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	251	if (auto profilerOutput =
252	252	Clang->createOutputFile(Path.str(),
253	253	/Binary=/false,
254		/RemoveFileOnSignal=/false, "",
255		/Extension=/"json",
	254	/RemoveFileOnSignal=/false,
256	255	/useTemporary=/false)) {
257	256
258	257	llvm::timeTraceProfilerWrite(*profilerOutput);

src/zig_llvm.cpp+2

...	...	@@ -1190,6 +1190,7 @@ static_assert((Triple::ArchType)ZigLLVM_mips64 == Triple::mips64, "");
1190	1190	static_assert((Triple::ArchType)ZigLLVM_mips64el == Triple::mips64el, "");
1191	1191	static_assert((Triple::ArchType)ZigLLVM_msp430 == Triple::msp430, "");
1192	1192	static_assert((Triple::ArchType)ZigLLVM_ppc == Triple::ppc, "");
	1193	static_assert((Triple::ArchType)ZigLLVM_ppcle == Triple::ppcle, "");
1193	1194	static_assert((Triple::ArchType)ZigLLVM_ppc64 == Triple::ppc64, "");
1194	1195	static_assert((Triple::ArchType)ZigLLVM_ppc64le == Triple::ppc64le, "");
1195	1196	static_assert((Triple::ArchType)ZigLLVM_r600 == Triple::r600, "");
...	...	@@ -1291,6 +1292,7 @@ static_assert((Triple::EnvironmentType)ZigLLVM_GNUABI64 == Triple::GNUABI64, "")
1291	1292	static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABI == Triple::GNUEABI, "");
1292	1293	static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABIHF == Triple::GNUEABIHF, "");
1293	1294	static_assert((Triple::EnvironmentType)ZigLLVM_GNUX32 == Triple::GNUX32, "");
	1295	static_assert((Triple::EnvironmentType)ZigLLVM_GNUILP32 == Triple::GNUILP32, "");
1294	1296	static_assert((Triple::EnvironmentType)ZigLLVM_CODE16 == Triple::CODE16, "");
1295	1297	static_assert((Triple::EnvironmentType)ZigLLVM_EABI == Triple::EABI, "");
1296	1298	static_assert((Triple::EnvironmentType)ZigLLVM_EABIHF == Triple::EABIHF, "");

src/zig_llvm.h+2

...	...	@@ -296,6 +296,7 @@ enum ZigLLVM_ArchType {
296	296	ZigLLVM_mips64el, // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el
297	297	ZigLLVM_msp430, // MSP430: msp430
298	298	ZigLLVM_ppc, // PPC: powerpc
	299	ZigLLVM_ppcle, // PPCLE: powerpc (little endian)
299	300	ZigLLVM_ppc64, // PPC64: powerpc64, ppu
300	301	ZigLLVM_ppc64le, // PPC64LE: powerpc64le
301	302	ZigLLVM_r600, // R600: AMD GPUs HD2XXX - HD6XXX
...	...	@@ -408,6 +409,7 @@ enum ZigLLVM_EnvironmentType {
408	409	ZigLLVM_GNUEABI,
409	410	ZigLLVM_GNUEABIHF,
410	411	ZigLLVM_GNUX32,
	412	ZigLLVM_GNUILP32,
411	413	ZigLLVM_CODE16,
412	414	ZigLLVM_EABI,
413	415	ZigLLVM_EABIHF,