authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-08-27 00:28:17-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-08-27 00:28:17-04:00
logb59aa7b906c984f182b8abc8fd3e146d956a799d
tree1bf098cca4430b8afda2ab0086b48494ad381636
parent29a418c9d5b3b9c78b707e5b6a119d48ecce9a6a

fixups to linux build

3 files changed, 12 insertions(+), 11 deletions(-)

std/debug.zig+2-1
......@@ -721,7 +721,8 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe
721721 });
722722 },
723723 else => {
724 %return in_stream.seekForward(op_size - 1);
724 const fwd_amt = math.cast(isize, op_size - 1) %% return error.InvalidDebugInfo;
725 %return in_stream.seekForward(fwd_amt);
725726 },
726727 }
727728 } else if (opcode >= opcode_base) {
std/io.zig+3-3
......@@ -328,7 +328,7 @@ pub const InStream = struct {
328328 return mem.readInt(input_slice, T, is_be);
329329 }
330330
331 pub fn seekForward(is: &InStream, amount: usize) -> %void {
331 pub fn seekForward(is: &InStream, amount: isize) -> %void {
332332 switch (builtin.os) {
333333 Os.linux, Os.darwin => {
334334 const result = system.lseek(is.fd, amount, system.SEEK_CUR);
......@@ -351,7 +351,7 @@ pub const InStream = struct {
351351 pub fn seekTo(is: &InStream, pos: usize) -> %void {
352352 switch (builtin.os) {
353353 Os.linux, Os.darwin => {
354 const result = system.lseek(is.fd, pos, system.SEEK_SET);
354 const result = system.lseek(is.fd, @bitCast(isize, pos), system.SEEK_SET);
355355 const err = system.getErrno(result);
356356 if (err > 0) {
357357 return switch (err) {
......@@ -390,7 +390,7 @@ pub const InStream = struct {
390390 }
391391
392392 pub fn getEndPos(is: &InStream) -> %usize {
393 var stat: system.stat = undefined;
393 var stat: system.Stat = undefined;
394394 const err = system.getErrno(system.fstat(is.fd, &stat));
395395 if (err > 0) {
396396 return switch (err) {
std/os/linux_x86_64.zig+7-7
......@@ -370,14 +370,14 @@ pub const F_GETOWN_EX = 16;
370370
371371pub const F_GETOWNER_UIDS = 17;
372372
373pub inline fn syscall0(number: usize) -> usize {
373pub fn syscall0(number: usize) -> usize {
374374 asm volatile ("syscall"
375375 : [ret] "={rax}" (-> usize)
376376 : [number] "{rax}" (number)
377377 : "rcx", "r11")
378378}
379379
380pub inline fn syscall1(number: usize, arg1: usize) -> usize {
380pub fn syscall1(number: usize, arg1: usize) -> usize {
381381 asm volatile ("syscall"
382382 : [ret] "={rax}" (-> usize)
383383 : [number] "{rax}" (number),
......@@ -385,7 +385,7 @@ pub inline fn syscall1(number: usize, arg1: usize) -> usize {
385385 : "rcx", "r11")
386386}
387387
388pub inline fn syscall2(number: usize, arg1: usize, arg2: usize) -> usize {
388pub fn syscall2(number: usize, arg1: usize, arg2: usize) -> usize {
389389 asm volatile ("syscall"
390390 : [ret] "={rax}" (-> usize)
391391 : [number] "{rax}" (number),
......@@ -394,7 +394,7 @@ pub inline fn syscall2(number: usize, arg1: usize, arg2: usize) -> usize {
394394 : "rcx", "r11")
395395}
396396
397pub inline fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) -> usize {
397pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) -> usize {
398398 asm volatile ("syscall"
399399 : [ret] "={rax}" (-> usize)
400400 : [number] "{rax}" (number),
......@@ -404,7 +404,7 @@ pub inline fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) ->
404404 : "rcx", "r11")
405405}
406406
407pub inline fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) -> usize {
407pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) -> usize {
408408 asm volatile ("syscall"
409409 : [ret] "={rax}" (-> usize)
410410 : [number] "{rax}" (number),
......@@ -415,7 +415,7 @@ pub inline fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg
415415 : "rcx", "r11")
416416}
417417
418pub inline fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) -> usize {
418pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) -> usize {
419419 asm volatile ("syscall"
420420 : [ret] "={rax}" (-> usize)
421421 : [number] "{rax}" (number),
......@@ -427,7 +427,7 @@ pub inline fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg
427427 : "rcx", "r11")
428428}
429429
430pub inline fn syscall6(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize,
430pub fn syscall6(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize,
431431 arg5: usize, arg6: usize) -> usize
432432{
433433 asm volatile ("syscall"