Eigenstate: myrddin-dev mailing list

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Make-bootstrap failed


Ah, this is because I split some recent timespec and futex changes into two patches and didn't test only applying the first one. This patch should temporarily fix things until the second one lands.

diff --git a/lib/thread/futex+osx.myr b/lib/thread/futex+osx.myr
index 17478703..8d4bfb96 100644
--- a/lib/thread/futex+osx.myr
+++ b/lib/thread/futex+osx.myr
@@ -34,7 +34,7 @@ const ftxwait = {uaddr, val, timeout
 	std.assert(sec <= 0xffffffff, "error: maximum futex timeout exceeded\n")
 	usec = (sec : uint32)
 	if timeout.nsec > ts.nsec
-		var nsec = (timeout.nsec - ts.nsec) / 1000
+		var nsec = ((timeout.nsec - ts.nsec) / 1000 : uint32)
 		std.assert(usec + nsec > usec, "error: maximum futex timeout exceeded\n")
 		usec += nsec
 	;;

 ---- On Sun, 19 Aug 2018 03:18:46 -0700 nml <arumakanil@xxxxxxxxx> wrote ---- 
 > It seems to be caused by 1db9bc54f according to git-bisect.Tested on MacOS 10.13.5
 > 
 >  



References:
Make-bootstrap failednml <arumakanil@xxxxxxxxx>