From fd9cba43ceb1015a04bfe0e951724cf734c5b94e Mon Sep 17 00:00:00 2001 From: Jan Mercl <0xjnml@gmail.com> Date: Wed, 1 Dec 2021 19:12:08 +0100 Subject: [PATCH] use -ignore-unsupported-alignment, enables generating on darwin/arm64 --- generator.go | 5 +++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/generator.go b/generator.go index 51f3f4b..e6a72b5 100644 --- a/generator.go +++ b/generator.go @@ -635,6 +635,7 @@ func makeTestfixture(goos, goarch string, more []string) { []string{ "-export-defines", "", "-export-fields", "F", + "-ignore-unsupported-alignment", "-trace-translation-units", volatiles, "-lmodernc.org/sqlite/libtest", @@ -667,6 +668,7 @@ func makeSpeedTest(goos, goarch string, more []string) { []string{ "ccgo", "-export-defines", "", + "-ignore-unsupported-alignment", "-o", filepath.FromSlash(fmt.Sprintf("speedtest1/main_%s_%s.go", goos, goarch)), "-trace-translation-units", filepath.Join(sqliteSrcDir, "test", "speedtest1.c"), @@ -690,6 +692,7 @@ func makeMpTest(goos, goarch string, more []string) { []string{ "ccgo", "-export-defines", "", + "-ignore-unsupported-alignment", "-o", filepath.FromSlash(fmt.Sprintf("internal/mptest/main_%s_%s.go", goos, goarch)), "-trace-translation-units", filepath.Join(sqliteSrcDir, "mptest", "mptest.c"), @@ -718,6 +721,7 @@ func makeSqliteProduction(goos, goarch string, more []string) { "-export-externs", "X", "-export-fields", "F", "-export-typedefs", "", + "-ignore-unsupported-alignment", "-pkgname", "sqlite3", "-o", filepath.FromSlash(fmt.Sprintf("lib/sqlite_%s_%s.go", goos, goarch)), "-trace-translation-units", @@ -745,6 +749,7 @@ func makeSqliteTest(goos, goarch string, more []string) { "-export-externs", "X", "-export-fields", "F", "-export-typedefs", "", + "-ignore-unsupported-alignment", "-pkgname", "sqlite3", "-o", filepath.FromSlash(fmt.Sprintf("libtest/sqlite_%s_%s.go", goos, goarch)), "-trace-translation-units", diff --git a/go.mod b/go.mod index f0b7ab5..a1f0d6a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/mattn/go-sqlite3 v1.14.9 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac - modernc.org/ccgo/v3 v3.12.80 + modernc.org/ccgo/v3 v3.12.81 modernc.org/libc v1.11.86 modernc.org/mathutil v1.4.1 modernc.org/tcl v1.8.13 diff --git a/go.sum b/go.sum index b53bf60..59c2d03 100644 --- a/go.sum +++ b/go.sum @@ -94,8 +94,8 @@ modernc.org/ccgo/v3 v3.12.65/go.mod h1:D6hQtKxPNZiY6wDBtehSGKFKmyXn53F8nGTpH+POm modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ= modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84= modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ= -modernc.org/ccgo/v3 v3.12.80 h1:jS1e6Onyh1Ph8Rcux7NVlIzFzXT2pmuFIrNo9cS7NM0= -modernc.org/ccgo/v3 v3.12.80/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY= +modernc.org/ccgo/v3 v3.12.81 h1:7TirzYW2d4isLGuEnvlu6zTRJWAflT+/fSgpIN2Z63U= +modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY= modernc.org/ccorpus v1.11.1 h1:K0qPfpVG1MJh5BYazccnmhywH4zHuOgJXgbjzyp6dWA= modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=