authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2019-12-22 13:28:00+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2019-12-29 11:04:58+02:00
log1a3633d78664701557ddf47651ea2d9d408859c5
tree5612b6db51120515442e08477fa577dd8594158e
parent3f7bab73734ce19615e131bd5ec3146ac30a9a85
signature Commit is signed but in an unrecognized format.

fix stage2 build

2 files changed, 27 insertions(+), 27 deletions(-)

src-self-hosted/link.zig+5-5
...@@ -119,11 +119,11 @@ fn linkDiagCallbackErrorable(ctx: *Context, msg: []const u8) !void {...@@ -119,11 +119,11 @@ fn linkDiagCallbackErrorable(ctx: *Context, msg: []const u8) !void {
119119
120fn toExternObjectFormatType(ofmt: ObjectFormat) c.ZigLLVM_ObjectFormatType {120fn toExternObjectFormatType(ofmt: ObjectFormat) c.ZigLLVM_ObjectFormatType {
121 return switch (ofmt) {121 return switch (ofmt) {
122 .unknown => c.ZigLLVM_UnknownObjectFormat,122 .unknown => .ZigLLVM_UnknownObjectFormat,
123 .coff => c.ZigLLVM_COFF,123 .coff => .ZigLLVM_COFF,
124 .elf => c.ZigLLVM_ELF,124 .elf => .ZigLLVM_ELF,
125 .macho => c.ZigLLVM_MachO,125 .macho => .ZigLLVM_MachO,
126 .wasm => c.ZigLLVM_Wasm,126 .wasm => .ZigLLVM_Wasm,
127 };127 };
128}128}
129129
src-self-hosted/llvm.zig+22-22
...@@ -226,24 +226,24 @@ pub const PrintMessageAction = VerifierFailureAction.LLVMPrintMessageAction;...@@ -226,24 +226,24 @@ pub const PrintMessageAction = VerifierFailureAction.LLVMPrintMessageAction;
226pub const ReturnStatusAction = VerifierFailureAction.LLVMReturnStatusAction;226pub const ReturnStatusAction = VerifierFailureAction.LLVMReturnStatusAction;
227pub const VerifierFailureAction = c.LLVMVerifierFailureAction;227pub const VerifierFailureAction = c.LLVMVerifierFailureAction;
228228
229pub const CodeGenLevelNone = c.LLVMCodeGenOptLevel.LLVMCodeGenLevelNone;229pub const CodeGenLevelNone = CodeGenOptLevel.LLVMCodeGenLevelNone;
230pub const CodeGenLevelLess = c.LLVMCodeGenOptLevel.LLVMCodeGenLevelLess;230pub const CodeGenLevelLess = CodeGenOptLevel.LLVMCodeGenLevelLess;
231pub const CodeGenLevelDefault = c.LLVMCodeGenOptLevel.LLVMCodeGenLevelDefault;231pub const CodeGenLevelDefault = CodeGenOptLevel.LLVMCodeGenLevelDefault;
232pub const CodeGenLevelAggressive = c.LLVMCodeGenOptLevel.LLVMCodeGenLevelAggressive;232pub const CodeGenLevelAggressive = CodeGenOptLevel.LLVMCodeGenLevelAggressive;
233pub const CodeGenOptLevel = c.LLVMCodeGenOptLevel;233pub const CodeGenOptLevel = c.LLVMCodeGenOptLevel;
234234
235pub const RelocDefault = c.LLVMRelocMode.LLVMRelocDefault;235pub const RelocDefault = RelocMode.LLVMRelocDefault;
236pub const RelocStatic = c.LLVMRelocMode.LLVMRelocStatic;236pub const RelocStatic = RelocMode.LLVMRelocStatic;
237pub const RelocPIC = c.LLVMRelocMode.LLVMRelocPIC;237pub const RelocPIC = RelocMode.LLVMRelocPIC;
238pub const RelocDynamicNoPic = c.LLVMRelocMode.LLVMRelocDynamicNoPic;238pub const RelocDynamicNoPic = RelocMode.LLVMRelocDynamicNoPic;
239pub const RelocMode = c.LLVMRelocMode;239pub const RelocMode = c.LLVMRelocMode;
240240
241pub const CodeModelDefault = c.LLVMCodeModel.LLVMCodeModelDefault;241pub const CodeModelDefault = CodeModel.LLVMCodeModelDefault;
242pub const CodeModelJITDefault = c.LLVMCodeModel.LLVMCodeModelJITDefault;242pub const CodeModelJITDefault = CodeModel.LLVMCodeModelJITDefault;
243pub const CodeModelSmall = c.LLVMCodeModel.LLVMCodeModelSmall;243pub const CodeModelSmall = CodeModel.LLVMCodeModelSmall;
244pub const CodeModelKernel = c.LLVMCodeModel.LLVMCodeModelKernel;244pub const CodeModelKernel = CodeModel.LLVMCodeModelKernel;
245pub const CodeModelMedium = c.LLVMCodeModel.LLVMCodeModelMedium;245pub const CodeModelMedium = CodeModel.LLVMCodeModelMedium;
246pub const CodeModelLarge = c.LLVMCodeModel.LLVMCodeModelLarge;246pub const CodeModelLarge = CodeModel.LLVMCodeModelLarge;
247pub const CodeModel = c.LLVMCodeModel;247pub const CodeModel = c.LLVMCodeModel;
248248
249pub const EmitAssembly = EmitOutputType.ZigLLVM_EmitAssembly;249pub const EmitAssembly = EmitOutputType.ZigLLVM_EmitAssembly;
...@@ -251,13 +251,13 @@ pub const EmitBinary = EmitOutputType.ZigLLVM_EmitBinary;...@@ -251,13 +251,13 @@ pub const EmitBinary = EmitOutputType.ZigLLVM_EmitBinary;
251pub const EmitLLVMIr = EmitOutputType.ZigLLVM_EmitLLVMIr;251pub const EmitLLVMIr = EmitOutputType.ZigLLVM_EmitLLVMIr;
252pub const EmitOutputType = c.ZigLLVM_EmitOutputType;252pub const EmitOutputType = c.ZigLLVM_EmitOutputType;
253253
254pub const CCallConv = c.LLVMCCallConv;254pub const CCallConv = CallConv.LLVMCCallConv;
255pub const FastCallConv = c.LLVMFastCallConv;255pub const FastCallConv = CallConv.LLVMFastCallConv;
256pub const ColdCallConv = c.LLVMColdCallConv;256pub const ColdCallConv = CallConv.LLVMColdCallConv;
257pub const WebKitJSCallConv = c.LLVMWebKitJSCallConv;257pub const WebKitJSCallConv = CallConv.LLVMWebKitJSCallConv;
258pub const AnyRegCallConv = c.LLVMAnyRegCallConv;258pub const AnyRegCallConv = CallConv.LLVMAnyRegCallConv;
259pub const X86StdcallCallConv = c.LLVMX86StdcallCallConv;259pub const X86StdcallCallConv = CallConv.LLVMX86StdcallCallConv;
260pub const X86FastcallCallConv = c.LLVMX86FastcallCallConv;260pub const X86FastcallCallConv = CallConv.LLVMX86FastcallCallConv;
261pub const CallConv = c.LLVMCallConv;261pub const CallConv = c.LLVMCallConv;
262262
263pub const CallAttr = extern enum {263pub const CallAttr = extern enum {
...@@ -288,6 +288,6 @@ extern fn ZigLLVMTargetMachineEmitToFile(...@@ -288,6 +288,6 @@ extern fn ZigLLVMTargetMachineEmitToFile(
288) bool;288) bool;
289289
290pub const BuildCall = ZigLLVMBuildCall;290pub const BuildCall = ZigLLVMBuildCall;
291extern fn ZigLLVMBuildCall(B: *Builder, Fn: *Value, Args: [*]*Value, NumArgs: c_uint, CC: c_uint, fn_inline: CallAttr, Name: [*:0]const u8) ?*Value;291extern fn ZigLLVMBuildCall(B: *Builder, Fn: *Value, Args: [*]*Value, NumArgs: c_uint, CC: CallConv, fn_inline: CallAttr, Name: [*:0]const u8) ?*Value;
292292
293pub const PrivateLinkage = c.LLVMLinkage.LLVMPrivateLinkage;293pub const PrivateLinkage = c.LLVMLinkage.LLVMPrivateLinkage;