commit ca1089a4f48cee4516fd4a90801ae09059e4a51d · pyrox.dev/nixpkgs

pkgs/development/compilers/go/1.6.nix

···

       113
       113
        
         patches = [

     

       114
       114
        
           ./remove-tools-1.5.patch

     

       115
       115
        
           ./creds-test.patch

     

       116
       116
       +
           ./fix-systime-1.6.patch

     

       116
       117
        
       

     

       117
       118
        
           # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch

     

       118
       119
        
           # actually works on old versions too.

+45

pkgs/development/compilers/go/fix-systime-1.6.patch

···

       1
       1
       +
       diff --git a/src/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s

     

       2
       2
       +
       index e09b906ba5..fa8ff2f65c 100644

     

       3
       3
       +
       --- a/src/runtime/sys_darwin_amd64.s

     

       4
       4
       +
       +++ b/src/runtime/sys_darwin_amd64.s

     

       5
       5
       +
       @@ -157,6 +157,7 @@ systime:

     

       6
       6
       +
        	// Fall back to system call (usually first call in this thread).

     

       7
       7
       +
        	MOVQ	SP, DI

     

       8
       8
       +
        	MOVQ	$0, SI

     

       9
       9
       +
       +	MOVQ	$0, DX  // required as of Sierra; Issue 16570

     

       10
       10
       +
        	MOVL	$(0x2000000+116), AX

     

       11
       11
       +
        	SYSCALL

     

       12
       12
       +
        	CMPQ	AX, $0

     

       13
       13
       +
       diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go

     

       14
       14
       +
       index 70b53b87f4..79083117b6 100644

     

       15
       15
       +
       --- a/src/syscall/syscall_darwin_amd64.go

     

       16
       16
       +
       +++ b/src/syscall/syscall_darwin_amd64.go

     

       17
       17
       +
       @@ -26,14 +26,21 @@ func NsecToTimeval(nsec int64) (tv Timeval) {

     

       18
       18
       +
        }

     

       19
       19
       +
        

     

       20
       20
       +
        //sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)

     

       21
       21
       +
       -func Gettimeofday(tv *Timeval) (err error) {

     

       22
       22
       +
       -	// The tv passed to gettimeofday must be non-nil

     

       23
       23
       +
       -	// but is otherwise unused.  The answers come back

     

       24
       24
       +
       -	// in the two registers.

     

       25
       25
       +
       +func Gettimeofday(tv *Timeval) error {

     

       26
       26
       +
       +	// The tv passed to gettimeofday must be non-nil.

     

       27
       27
       +
       +	// Before macOS Sierra (10.12), tv was otherwise unused and

     

       28
       28
       +
       +	// the answers came back in the two registers.

     

       29
       29
       +
       +	// As of Sierra, gettimeofday return zeros and populates

     

       30
       30
       +
       +	// tv itself.

     

       31
       31
       +
        	sec, usec, err := gettimeofday(tv)

     

       32
       32
       +
       -	tv.Sec = sec

     

       33
       33
       +
       -	tv.Usec = usec

     

       34
       34
       +
       -	return err

     

       35
       35
       +
       +	if err != nil {

     

       36
       36
       +
       +		return err

     

       37
       37
       +
       +	}

     

       38
       38
       +
       +	if sec != 0 || usec != 0 {

     

       39
       39
       +
       +		tv.Sec = sec

     

       40
       40
       +
       +		tv.Usec = usec

     

       41
       41
       +
       +	}

     

       42
       42
       +
       +	return nil

     

       43
       43
       +
        }

     

       44
       44
       +
        

     

       45
       45
       +
        func SetKevent(k *Kevent_t, fd, mode, flags int) {