Makefile

@@ -43,8 +43,8 @@ build_all_targets:
 	GOOS=openbsd GOARCH=amd64 go build -v ./...
 	GOOS=openbsd GOARCH=arm64 go test -c -o /dev/null
 	GOOS=openbsd GOARCH=arm64 go build -v ./...
-	# GOOS=windows GOARCH=386 go test -c -o /dev/null
-	# GOOS=windows GOARCH=386 go build -v ./...
+	GOOS=windows GOARCH=386 go test -c -o /dev/null
+	GOOS=windows GOARCH=386 go build -v ./...
 	GOOS=windows GOARCH=amd64 go test -c -o /dev/null
 	GOOS=windows GOARCH=amd64 go build -v ./...
 	GOOS=windows GOARCH=arm64 go test -c -o /dev/null
@@ -66,7 +66,7 @@ editor:
 	go build -o /dev/null vendor_libsqlite3.go
 
 test:
-	go test -v -timeout 24h  . ./functest 2>&1 | tee log-test
+	go test -v -timeout 24h 2>&1 | tee log-test
 	
 vendor:
 	go run vendor_libsqlite3.go && make build_all_targets

builder.json

 {
 	"autogen": "<none>",
-	"autotag": "darwin/(amd64|arm64)|freebsd/(amd64|arm64)|linux/(386|amd64|arm|arm64|loong64|ppc64le|riscv64|s390x)|windows/(amd64|arm64)",
+	"autotag": "<none>",
 	"autoupdate": "<none>",
-	"test": "darwin/(amd64|arm64)|freebsd/(amd64|arm64)|linux/(386|amd64|arm|arm64|loong64|ppc64le|riscv64|s390x)|windows/(amd64|arm64)"
+	"test": "darwin/(amd64|arm64)|freebsd/(amd64|arm64)|linux/(386|amd64|arm|arm64|loong64|ppc64le|riscv64|s390x)|windows/(amd64|arm64|386)"
 }

doc.go

@@ -31,7 +31,8 @@
 //	linux	ppc64le 3.46.0
 //	linux	riscv64 3.46.0
 //	linux	s390x   3.46.0
-//	windows	amd64   3.46.0
+//	windows	386     3.46.0
+//	windows	arm64   3.46.0
 //	windows	arm64   3.46.0
 //
 // # Builders
@@ -50,6 +51,10 @@
 //
 // # Changelog
 //
+// 2024-07-22: v1.31.0
+//
+// Support windows/386.
+//
 // 2024-06-04: v1.30.0
 //
 // Upgrade to SQLite 3.46.0, release notes at https://sqlite.org/releaselog/3_46_0.html.

functest/func_test.go → func_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package functest // modernc.org/sqlite/functest
+package sqlite // import "modernc.org/sqlite"
 
 import (
 	"bytes"
@@ -20,8 +20,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	sqlite3 "modernc.org/sqlite"
 )
 
 var finalCalled bool
@@ -31,7 +29,7 @@ type sumFunction struct {
 	finalCalled *bool
 }
 
-func (f *sumFunction) Step(ctx *sqlite3.FunctionContext, args []driver.Value) error {
+func (f *sumFunction) Step(ctx *FunctionContext, args []driver.Value) error {
 	switch resTyped := args[0].(type) {
 	case int64:
 		f.sum += resTyped
@@ -41,7 +39,7 @@ func (f *sumFunction) Step(ctx *sqlite3.FunctionContext, args []driver.Value) er
 	return nil
 }
 
-func (f *sumFunction) WindowInverse(ctx *sqlite3.FunctionContext, args []driver.Value) error {
+func (f *sumFunction) WindowInverse(ctx *FunctionContext, args []driver.Value) error {
 	switch resTyped := args[0].(type) {
 	case int64:
 		f.sum -= resTyped
@@ -51,83 +49,83 @@ func (f *sumFunction) WindowInverse(ctx *sqlite3.FunctionContext, args []driver.
 	return nil
 }
 
-func (f *sumFunction) WindowValue(ctx *sqlite3.FunctionContext) (driver.Value, error) {
+func (f *sumFunction) WindowValue(ctx *FunctionContext) (driver.Value, error) {
 	return f.sum, nil
 }
 
-func (f *sumFunction) Final(ctx *sqlite3.FunctionContext) {
+func (f *sumFunction) Final(ctx *FunctionContext) {
 	*f.finalCalled = true
 }
 
 func init() {
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"test_int64",
 		0,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			return int64(42), nil
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"test_float64",
 		0,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			return float64(1e-2), nil
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"test_null",
 		0,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			return nil, nil
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"test_error",
 		0,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			return nil, errors.New("boom")
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"test_empty_byte_slice",
 		0,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			return []byte{}, nil
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"test_nonempty_byte_slice",
 		0,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			return []byte("abcdefg"), nil
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"test_empty_string",
 		0,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			return "", nil
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"test_nonempty_string",
 		0,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			return "abcdefg", nil
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"yesterday",
 		1,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			var arg time.Time
 			switch argTyped := args[0].(type) {
 			case int64:
@@ -140,10 +138,10 @@ func init() {
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"md5",
 		1,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			var arg *bytes.Buffer
 			switch argTyped := args[0].(type) {
 			case string:
@@ -161,10 +159,10 @@ func init() {
 		},
 	)
 
-	sqlite3.MustRegisterDeterministicScalarFunction(
+	MustRegisterDeterministicScalarFunction(
 		"regexp",
 		2,
-		func(ctx *sqlite3.FunctionContext, args []driver.Value) (driver.Value, error) {
+		func(ctx *FunctionContext, args []driver.Value) (driver.Value, error) {
 			var s1 string
 			var s2 string
 
@@ -193,26 +191,26 @@ func init() {
 		},
 	)
 
-	sqlite3.MustRegisterFunction("test_sum", &sqlite3.FunctionImpl{
+	MustRegisterFunction("test_sum", &FunctionImpl{
 		NArgs:         1,
 		Deterministic: true,
-		MakeAggregate: func(ctx sqlite3.FunctionContext) (sqlite3.AggregateFunction, error) {
+		MakeAggregate: func(ctx FunctionContext) (AggregateFunction, error) {
 			return &sumFunction{finalCalled: &finalCalled}, nil
 		},
 	})
 
-	sqlite3.MustRegisterFunction("test_aggregate_error", &sqlite3.FunctionImpl{
+	MustRegisterFunction("test_aggregate_error", &FunctionImpl{
 		NArgs:         1,
 		Deterministic: true,
-		MakeAggregate: func(ctx sqlite3.FunctionContext) (sqlite3.AggregateFunction, error) {
+		MakeAggregate: func(ctx FunctionContext) (AggregateFunction, error) {
 			return nil, errors.New("boom")
 		},
 	})
 
-	sqlite3.MustRegisterFunction("test_aggregate_null_pointer", &sqlite3.FunctionImpl{
+	MustRegisterFunction("test_aggregate_null_pointer", &FunctionImpl{
 		NArgs:         1,
 		Deterministic: true,
-		MakeAggregate: func(ctx sqlite3.FunctionContext) (sqlite3.AggregateFunction, error) {
+		MakeAggregate: func(ctx FunctionContext) (AggregateFunction, error) {
 			return nil, nil
 		},
 	})
@@ -675,8 +673,8 @@ func TestRegisteredFunctions(t *testing.T) {
 
 	t.Run("backup and restore", func(tt *testing.T) {
 		type backuper interface {
-			NewBackup(string) (*sqlite3.Backup, error)
-			NewRestore(string) (*sqlite3.Backup, error)
+			NewBackup(string) (*Backup, error)
+			NewRestore(string) (*Backup, error)
 		}
 
 		tmpDir, err := os.MkdirTemp(os.TempDir(), "storetest_")
@@ -758,8 +756,8 @@ func TestRegisteredFunctions(t *testing.T) {
 
 	t.Run("backup, commit and close", func(tt *testing.T) {
 		type backuper interface {
-			NewBackup(string) (*sqlite3.Backup, error)
-			NewRestore(string) (*sqlite3.Backup, error)
+			NewBackup(string) (*Backup, error)
+			NewRestore(string) (*Backup, error)
 		}
 
 		tmpDir, err := os.MkdirTemp(os.TempDir(), "storetest_")

go.mod

@@ -4,11 +4,10 @@ go 1.20
 
 require (
 	github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd
-	github.com/klauspost/cpuid/v2 v2.2.7
-	golang.org/x/sys v0.19.0
+	golang.org/x/sys v0.22.0
 	modernc.org/fileutil v1.3.0
 	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6
-	modernc.org/libc v1.52.1
+	modernc.org/libc v1.55.3
 	modernc.org/mathutil v1.6.0
 )
 

go.sum

@@ -6,8 +6,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
@@ -16,24 +14,19 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
-modernc.org/cc/v4 v4.20.0 h1:45Or8mQfbUqJOG9WaxvlFYOAQO0lQ5RvqBcFCXngjxk=
-modernc.org/ccgo/v4 v4.16.0 h1:ofwORa6vx2FMm0916/CkZjpFPSR70VwTjUCe2Eg5BnA=
+modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
+modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y=
 modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
 modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
 modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
 modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
 modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/libc v1.49.3 h1:j2MRCRdwJI2ls/sGbeSk0t2bypOG/uvPZUsGQFDulqg=
-modernc.org/libc v1.49.3/go.mod h1:yMZuGkn7pXbKfoT/M35gFJOAEdSKdxL0q64sF7KqCDo=
-modernc.org/libc v1.50.9 h1:hIWf1uz55lorXQhfoEoezdUHjxzuO6ceshET/yWjSjk=
-modernc.org/libc v1.50.9/go.mod h1:15P6ublJ9FJR8YQCGy8DeQ2Uwur7iW9Hserr/T3OFZE=
-modernc.org/libc v1.52.1 h1:uau0VoiT5hnR+SpoWekCKbLqm7v6dhRL3hI+NQhgN3M=
-modernc.org/libc v1.52.1/go.mod h1:HR4nVzFDSDizP620zcMCgjb1/8xk2lg5p/8yjfGv1IQ=
+modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U=
+modernc.org/libc v1.55.3/go.mod h1:qFXepLhz+JjFThQ4kzwzOjA/y/artDeg+pcYnY+Q83w=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
 modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=

lib/sqlite_windows.go

-// Code generated for windows/amd64 by 'generator -mlong-double-64 --package-name libsqlite3 --prefix-enumerator=_ --prefix-external=x_ --prefix-field=F --prefix-static-internal=_ --prefix-static-none=_ --prefix-tagged-enum=_ --prefix-tagged-struct=T --prefix-tagged-union=T --prefix-typename=T --prefix-undefined=_ -ignore-unsupported-alignment -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DNDEBUG -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_HAVE_ZLIB=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_WITHOUT_ZONEMALLOC -Dpread64=pread -Dpwrite64=pwrite -I /home/jnml/src/modernc.org/builder/.exclude/modernc.org/libz/include/windows/amd64 -I /home/jnml/src/modernc.org/builder/.exclude/modernc.org/libtcl8.6/include/windows/amd64 -extended-errors -o sqlite3.go sqlite3.c --cpp /usr/bin/x86_64-w64-mingw32-gcc --goarch amd64 --goos windows -DSQLITE_HAVE_C99_MATH_FUNCS=(1) -DSQLITE_OS_WIN=1 -DSQLITE_OMIT_SEH -build-lines \/\/go:build windows && (amd64 || arm64)\n\/\/ \x2bbuild windows\n\/\/ \x2bbuild amd64 arm64 -map gcc=x86_64-w64-mingw32-gcc -eval-all-macros', DO NOT EDIT.
+// Code generated for windows/amd64 by 'generator -mlong-double-64 --package-name libsqlite3 --prefix-enumerator=_ --prefix-external=x_ --prefix-field=F --prefix-static-internal=_ --prefix-static-none=_ --prefix-tagged-enum=_ --prefix-tagged-struct=T --prefix-tagged-union=T --prefix-typename=T --prefix-undefined=_ -ignore-unsupported-alignment -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DNDEBUG -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_HAVE_ZLIB=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_WITHOUT_ZONEMALLOC -Dpread64=pread -Dpwrite64=pwrite -I /home/jnml/src/modernc.org/libz/include/windows/amd64 -I /home/jnml/src/modernc.org/libtcl8.6/include/windows/amd64 -extended-errors -o sqlite3.go sqlite3.c --cpp /usr/bin/x86_64-w64-mingw32-gcc --goarch amd64 --goos windows -DSQLITE_HAVE_C99_MATH_FUNCS=(1) -DSQLITE_OS_WIN=1 -DSQLITE_OMIT_SEH -build-lines \/\/go:build windows && (amd64 || arm64)\n -map gcc=x86_64-w64-mingw32-gcc -eval-all-macros', DO NOT EDIT.
 //go:build windows && (amd64 || arm64)
-// +build windows
-// +build amd64 arm64
 package sqlite3
@@ -26332,36 +26330,6 @@ type Tfpos_t = int64
 type fpos_t = Tfpos_t
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-func _vswprintf(tls *libc.TLS, __stream1 uintptr, __count Tsize_t, __format1 uintptr, __local_argv1 t__builtin_va_list) (r int32) {
-	var v1 int32
-	_ = v1
-	v1 = libc.X__mingw_vsnwprintf(tls, __stream1, __count, __format1, __local_argv1)
-	goto _2
-_2:
-	return v1
-}
-
-func _swprintf(tls *libc.TLS, __stream uintptr, __count Tsize_t, __format uintptr, va uintptr) (r int32) {
-	var __local_argv t__builtin_va_list
-	var __retval int32
-	_, _ = __local_argv, __retval
-	__local_argv = va
-	__retval = _vswprintf(tls, __stream, __count, __format, __local_argv)
-	_ = __local_argv
-	return __retval
-}
-
 type T_onexit_t = uintptr
 type _onexit_t = T_onexit_t

vendor_libsqlite3.go

@@ -39,14 +39,15 @@ func main() {
 		{"linux", "ppc64le"},
 		{"linux", "riscv64"},
 		{"linux", "s390x"},
+		{"windows", "386"},
 		{"windows", "amd64"},
 	} {
-		fmt.Printf("%s/%s\n", v.goos, v.goarch)
 		base := fmt.Sprintf("ccgo_%s_%s.go", v.goos, v.goarch)
-		if v.goos == "windows" {
+		if v.goos == "windows" && v.goarch == "amd64" {
 			base = "ccgo_windows.go"
 		}
 		ifn := filepath.Join("..", "libsqlite3", base)
+		fmt.Printf("%s/%s\t%s\n", v.goos, v.goarch, ifn)
 		in, err := os.ReadFile(ifn)
 		if err != nil {
 			fail(1, "%s\n", err)