From 5c81169782d8877836324d39a9f0d05593c4e3c0 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Aug 28 2023 00:51:46 +0000 Subject: Updte to latest version (#2214119) --- diff --git a/0001-Skip-WASI-tests.patch b/0001-Skip-WASI-tests.patch index 3a8cc13..cf22b80 100644 --- a/0001-Skip-WASI-tests.patch +++ b/0001-Skip-WASI-tests.patch @@ -1,4 +1,4 @@ -From cbac45f83e2867012c9092024679beb1c9134435 Mon Sep 17 00:00:00 2001 +From 206888b5a100d9ff58008dad4fbb9a45b1265a6b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 15 Dec 2020 05:06:04 -0500 Subject: [PATCH 1/7] Skip WASI tests. @@ -11,10 +11,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 5 deletions(-) diff --git a/main_test.go b/main_test.go -index 59254656..cab523b7 100644 +index ae7aed56..ac204f0c 100644 --- a/main_test.go +++ b/main_test.go -@@ -151,10 +151,6 @@ func TestBuild(t *testing.T) { +@@ -171,10 +171,6 @@ func TestBuild(t *testing.T) { t.Parallel() runPlatTests(optionsFromTarget("wasm", sema), tests, t) }) @@ -25,7 +25,7 @@ index 59254656..cab523b7 100644 } } -@@ -403,7 +399,6 @@ func TestTest(t *testing.T) { +@@ -425,7 +421,6 @@ func TestTest(t *testing.T) { // Node/Wasmtime targ{"WASM", optionsFromTarget("wasm", sema)}, diff --git a/0002-Skip-some-cross-Linux-tests-where-qemu-is-broken.patch b/0002-Skip-some-cross-Linux-tests-where-qemu-is-broken.patch index 9a3a70d..a324db8 100644 --- a/0002-Skip-some-cross-Linux-tests-where-qemu-is-broken.patch +++ b/0002-Skip-some-cross-Linux-tests-where-qemu-is-broken.patch @@ -1,4 +1,4 @@ -From dcd2dcba814f7d910af630a3dd2e760c6fc21dd6 Mon Sep 17 00:00:00 2001 +From df546b002b1d2d38e71b8d2e2c0e8f2c419b16c1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 3 Jan 2022 22:39:31 -0500 Subject: [PATCH 2/7] Skip some cross Linux tests where qemu is broken @@ -14,10 +14,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 14 insertions(+) diff --git a/main_test.go b/main_test.go -index cab523b7..798f0ec9 100644 +index ac204f0c..5407ce09 100644 --- a/main_test.go +++ b/main_test.go -@@ -242,6 +242,13 @@ func runPlatTests(options compileopts.Options, tests []string, t *testing.T) { +@@ -264,6 +264,13 @@ func runPlatTests(options compileopts.Options, tests []string, t *testing.T) { } func emuCheck(t *testing.T, options compileopts.Options) { @@ -31,7 +31,7 @@ index cab523b7..798f0ec9 100644 // Check if the emulator is installed. spec, err := compileopts.LoadTarget(&options) if err != nil { -@@ -331,6 +338,13 @@ func runTestWithConfig(name string, t *testing.T, options compileopts.Options, c +@@ -353,6 +360,13 @@ func runTestWithConfig(name string, t *testing.T, options compileopts.Options, c return } diff --git a/0003-Suggest-optional-packages-to-install-if-missing.patch b/0003-Suggest-optional-packages-to-install-if-missing.patch index 8193c76..df446aa 100644 --- a/0003-Suggest-optional-packages-to-install-if-missing.patch +++ b/0003-Suggest-optional-packages-to-install-if-missing.patch @@ -1,4 +1,4 @@ -From e3bc238eadcd1d3bad8e10a1496ef496d90090cd Mon Sep 17 00:00:00 2001 +From 118b4127ed490d74429759f4fb8bf5a38b528fba Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 6 Feb 2022 03:49:16 -0500 Subject: [PATCH 3/7] Suggest optional packages to install if missing diff --git a/0004-cgo-Handle-elaborated-typedefs-from-libclang.patch b/0004-cgo-Handle-elaborated-typedefs-from-libclang.patch index 5731382..7c99fe0 100644 --- a/0004-cgo-Handle-elaborated-typedefs-from-libclang.patch +++ b/0004-cgo-Handle-elaborated-typedefs-from-libclang.patch @@ -1,4 +1,4 @@ -From aac3fe147d69800f2b909454815f5b2ed52800eb Mon Sep 17 00:00:00 2001 +From 9c3e5f72d571027689dba37cceb2a592dfcfdb5c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 12 Apr 2023 04:55:27 -0400 Subject: [PATCH 4/7] cgo: Handle elaborated typedefs from libclang diff --git a/0005-Add-CPU-to-RISCV-targets.patch b/0005-Add-CPU-to-RISCV-targets.patch index 7613f14..b574fdb 100644 --- a/0005-Add-CPU-to-RISCV-targets.patch +++ b/0005-Add-CPU-to-RISCV-targets.patch @@ -1,4 +1,4 @@ -From 084466294beb16440244374251ac9e6258929f18 Mon Sep 17 00:00:00 2001 +From 18428dbfd276b19797cd1ec0ba36bd5d370c2477 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 13 Apr 2023 05:51:10 -0400 Subject: [PATCH 5/7] Add CPU to RISCV targets @@ -11,7 +11,7 @@ Signed-off-by: Elliott Sales de Andrade 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/compileopts/target.go b/compileopts/target.go -index 40a1d445..68f12707 100644 +index f83464b2..1e3995bb 100644 --- a/compileopts/target.go +++ b/compileopts/target.go @@ -14,6 +14,7 @@ import ( @@ -22,7 +22,7 @@ index 40a1d445..68f12707 100644 "github.com/tinygo-org/tinygo/goenv" ) -@@ -135,7 +136,11 @@ func (spec *TargetSpec) loadFromGivenStr(str string) error { +@@ -134,7 +135,11 @@ func (spec *TargetSpec) loadFromGivenStr(str string) error { return err } defer fp.Close() diff --git a/0006-Handle-argmemonly-attribute-change-in-LLVM16.patch b/0006-Handle-argmemonly-attribute-change-in-LLVM16.patch index f4e6f85..83f2411 100644 --- a/0006-Handle-argmemonly-attribute-change-in-LLVM16.patch +++ b/0006-Handle-argmemonly-attribute-change-in-LLVM16.patch @@ -1,4 +1,4 @@ -From 75e30cb418519e03b50fc64aa3a109376e612af0 Mon Sep 17 00:00:00 2001 +From bb4cd90c053be0a8d2a4ec1ddfb91cef538f5ae1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 15 Apr 2023 03:41:21 -0400 Subject: [PATCH 6/7] Handle argmemonly attribute change in LLVM16 @@ -11,7 +11,7 @@ Signed-off-by: Elliott Sales de Andrade 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/compiler/compiler_test.go b/compiler/compiler_test.go -index 6b5fbe13..b8cff5e8 100644 +index 92ce31b0..440dcc13 100644 --- a/compiler/compiler_test.go +++ b/compiler/compiler_test.go @@ -4,11 +4,11 @@ import ( @@ -27,7 +27,7 @@ index 6b5fbe13..b8cff5e8 100644 "github.com/tinygo-org/tinygo/goenv" "github.com/tinygo-org/tinygo/loader" "tinygo.org/x/go-llvm" -@@ -151,12 +151,7 @@ func fuzzyEqualIR(s1, s2 string) bool { +@@ -154,12 +154,7 @@ func fuzzyEqualIR(s1, s2 string) bool { // stripped out. func filterIrrelevantIRLines(lines []string) []string { var out []string @@ -41,7 +41,7 @@ index 6b5fbe13..b8cff5e8 100644 for _, line := range lines { line = strings.Split(line, ";")[0] // strip out comments/info line = strings.TrimRight(line, "\r ") // drop '\r' on Windows and remove trailing spaces from comments -@@ -171,6 +166,12 @@ func filterIrrelevantIRLines(lines []string) []string { +@@ -174,6 +169,12 @@ func filterIrrelevantIRLines(lines []string) []string { // Right now test outputs are for LLVM 14 and higher. continue } diff --git a/0007-Update-types-in-cgo-tests-for-LLVM-16.patch b/0007-Update-types-in-cgo-tests-for-LLVM-16.patch index ebfacb5..41dd054 100644 --- a/0007-Update-types-in-cgo-tests-for-LLVM-16.patch +++ b/0007-Update-types-in-cgo-tests-for-LLVM-16.patch @@ -1,4 +1,4 @@ -From 56388dc66838222c7ffb98e30221ef72f6316dcf Mon Sep 17 00:00:00 2001 +From 2d424012a1000a5e28a777536d32ab1faa8c9fbb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 15 Apr 2023 19:41:18 -0400 Subject: [PATCH 7/7] Update types in cgo tests for LLVM 16 diff --git a/tinygo.spec b/tinygo.spec index 00100e4..eae8cfc 100644 --- a/tinygo.spec +++ b/tinygo.spec @@ -6,7 +6,7 @@ # https://github.com/tinygo-org/tinygo %global goipath github.com/tinygo-org/tinygo -Version: 0.28.1 +Version: 0.29.0 %global CMSIS_commit 9fe411cef1cef5de58e5957b89760759de44e393 %global avr_commit 6624554c02b237b23dc17d53e992bf54033fc228