add darwin/arm64 support

Makefile

@@ -36,6 +36,7 @@ all: editor
 
 build_all_targets:
 	GOOS=darwin GOARCH=amd64 go build -v ./...
+	GOOS=darwin GOARCH=arm64 go build -v ./...
 	GOOS=linux GOARCH=386 go build -v ./...
 	GOOS=linux GOARCH=amd64 go build -v ./...
 	GOOS=linux GOARCH=arm go build -v ./...
@@ -48,6 +49,10 @@ darwin_amd64:
 	TARGET_GOOS=darwin TARGET_GOARCH=amd64 go generate 2>&1 | tee /tmp/log-generate-sqlite-darwin-amd64
 	GOOS=darwin GOARCH=amd64 go build -v ./...
 
+darwin_arm64:
+	TARGET_GOOS=darwin TARGET_GOARCH=arm64 go generate 2>&1 | tee /tmp/log-generate-sqlite-darwin-arm64
+	GOOS=darwin GOARCH=arm64 go build -v ./...
+
 linux_amd64:
 	TARGET_GOOS=linux TARGET_GOARCH=amd64 go generate 2>&1 | tee /tmp/log-generate-sqlite-linux-amd64
 	GOOS=linux GOARCH=amd64 go build -v ./...
@@ -87,6 +92,9 @@ test:
 test_darwin_amd64:
 	GOOS=darwin GOARCH=amd64 make test
 
+test_darwin_arm64:
+	GOOS=darwin GOARCH=arm64 make test
+
 test_linux_amd64:
 	GOOS=linux GOARCH=amd64 make test
 

generator.go

@@ -469,7 +469,7 @@ func configure(goos, goarch string) {
 	case "linux":
 		// nop
 	case "darwin":
-		args = append(args, "--with-tcl=/Library/Frameworks/Tcl.framework")
+		args = append(args, "--with-tcl=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Tcl.framework")
 	case "windows":
 		switch goarch {
 		case "amd64":

go.mod

@@ -4,8 +4,8 @@ go 1.15
 
 require (
 	github.com/mattn/go-sqlite3 v1.14.6
-	modernc.org/libc v1.7.12
+	modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8
 	modernc.org/mathutil v1.2.2
-	modernc.org/tcl v1.4.4
+	modernc.org/tcl v1.4.5-0.20210308125415-9a47e1077a86
-	modernc.org/z v1.0.0
+	modernc.org/z v1.0.1-0.20210308123920-1f282aa71362
 )

go.sum

@@ -5,21 +5,19 @@ github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v1.7.12 h1:x4NjVrgGXghep5yT0tQr9weJc++zboRWgJqQ1cXXEug=
+modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8 h1:m/p34a6Fq+riVqUMSO0swBCBads6NXwzQ5WfTWJfrTA=
-modernc.org/libc v1.7.12/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
-modernc.org/mathutil v1.1.1 h1:FeylZSVX8S+58VsyJlkEj2bcpdytmp9MmDKZkKx8OIE=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
-modernc.org/tcl v1.4.4 h1:iXfjiGPwI451OD+ZB7VOc9vCta059avJVESusjnMf9U=
+modernc.org/tcl v1.4.5-0.20210308125415-9a47e1077a86 h1:sG15pAGzpWLD9dO6mt5VYEk30vcngjoUD5NjD1C0ztQ=
-modernc.org/tcl v1.4.4/go.mod h1:V/IPvXL2qjXdOOeB5plr6K2Hlmil2i/iW+7efdhdu20=
+modernc.org/tcl v1.4.5-0.20210308125415-9a47e1077a86/go.mod h1:gb57hj4pO8fRrK54zveIfFXBaMHK3SKJNWcmRw1cRzc=
-modernc.org/z v1.0.0 h1:mEk+jxKT03Fz+kbVWgwJRV6V82a+xEDisa7JCSHJnBA=
+modernc.org/z v1.0.1-0.20210308123920-1f282aa71362 h1:xUpazXgMcN3whs6DGzAUHVlZyQl4sahj6Lvv2kFj73w=
-modernc.org/z v1.0.0/go.mod h1:dy1pW95tOEf0gSkDFXwb2XAC+VWsFbKjZiD/qI8/9HI=
+modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=

internal/libc2/capi_darwin_arm64.go

@@ -0,0 +1,21 @@
+// Copyright 2020 The Sqlite Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package libc2 // import "modernc.org/sqlite/internal/libc2"
+
+var CAPI = map[string]struct{}{
+	"pthread_cond_broadcast": {},
+	"pthread_cond_destroy":   {},
+	"pthread_cond_init":      {},
+	"pthread_cond_signal":    {},
+	"pthread_cond_wait":      {},
+	"pthread_create":         {},
+	"pthread_detach":         {},
+	"pthread_mutex_destroy":  {},
+	"pthread_mutex_init":     {},
+	"pthread_mutex_lock":     {},
+	"pthread_mutex_trylock":  {},
+	"pthread_mutex_unlock":   {},
+	"sched_yield":            {},
+}

lib/sqlite_linux_amd64.go

@@ -156211,7 +156211,6 @@ __15:
 	goto __14
 	goto __16
 __16:
-
 }
 
 // This is a helper function for rbuObjIterCacheTableInfo(). It populates

libtest/sqlite_linux_amd64.go

@@ -157616,7 +157616,6 @@ __15:
 	goto __14
 	goto __16
 __16:
-
 }
 
 // This is a helper function for rbuObjIterCacheTableInfo(). It populates