From 95b7509b69ae22be793cfd86013deaa3eb9c6b4c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 7 May 2022 23:15:18 -0400 Subject: [PATCH 1/3] Use compiler-rt 13 sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c396321..013776d 100644 --- a/sources +++ b/sources @@ -2,8 +2,8 @@ SHA512 (tinygo-0.23.0.tar.gz) = 88eee87eb206c02adbf077f25f0ac1fb068827137d308cdf SHA512 (avr-6624554c02b237b23dc17d53e992bf54033fc228.tar.gz) = 1aa157bd761db38f8680614fa1cf47d7009508f65291b7eaaa5aba1ae76d35103f68a42947b7269a170d2f1cf8fb09941a5d74070fe6d204b68dd15a9ad2ed29 SHA512 (cmsis-9fe411cef1cef5de58e5957b89760759de44e393-clean.tar.xz) = f131fc241f61982c49f334eb502c2f13da61eb7bdaa641ee84a8de30c4d576b735b8aadeafd7d75351473a2df6a42de6a236ecc5dcc616ee6cfcc07af29446f9 SHA512 (cmsis_svd-df75ff974c76a911fc2815e29807f5ecaae06fc2-clean.tar.xz) = 8abbc6f366aed9571a74a4b6e7065ed2d6a59e0495c3745681d9a654d61edd136319788741f7afc781211adb64ed1faeafe9d6acc6be5a16d9ee48e98c5ddeb1 -SHA512 (compiler-rt-12.0.0.src.tar.xz) = 5823c22bca915b393fc57fff1742a4a9d7a6645e87abf89da5a3554c9aaa6039631faa69cc3798bc2dd159f0135ee84d0ed08841e24f007d06dfd284b823b281 -SHA512 (compiler-rt-12.0.0.src.tar.xz.sig) = 669a996d7ea5ed4f556ff2a1db479c5d3c1cb326dcd14b2ac112dfa876fd8928aec9e6c665e27c0f9ab046471229049e80e879867ef26f6cba5592a81f12ccb5 +SHA512 (compiler-rt-13.0.0.src.tar.xz) = b35643553d0d3d4deb2f31e2dad8bbac4b772ee3e0c86aa532ce7161da276620fe820193004ee08c62eb8dfd015e04d3853e6a7cc939ac3fb57345702386d583 +SHA512 (compiler-rt-13.0.0.src.tar.xz.sig) = c2626f6b0d813e00fdd9abc2ffcdc30d3a906e192da470ea24c010421ff4cc812b171704899ab15e53edb49ff5dd4ebd447425a2469ff80f9503a77e7ee8cdcd SHA512 (macos-minimal-sdk-ebb736fda2bec7cea38dcda807518b835a539525.tar.gz) = 2f97d5826c79116c851e1efde74faf806de56ac8acc5509d1ab7690d0edf88f6e227b273d2c5ef7d894a8ada2e316e285ef4e58d74ca0c6f91584653154eae10 SHA512 (musl-1.2.0.tar.gz) = 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1 SHA512 (musl-1.2.0.tar.gz.asc) = 1639d1f39f3c587011cc6e1ae44774d20d306f4d18fb394bfa86c40f52af53a882ebd5326553b589a1c5316494b77658dc3310c0187836dfd1fd023ccfedaaf0 From 515f3923293ee19fa4cea60eb2d4f212051cb6a8 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 8 May 2022 22:50:32 -0400 Subject: [PATCH 2/3] Drop new features from LLVM < 14 They are not available there and warn about being unused. --- 0001-Skip-WASI-tests.patch | 2 +- 0002-Use-system-mingw64-headers-and-crt.patch | 2 +- ...oss-Linux-tests-where-qemu-is-broken.patch | 2 +- ...ional-packages-to-install-if-missing.patch | 2 +- 0005-Skip-slice-copy-test-for-LLVM-14.patch | 2 +- 0006-Skip-TestDirFS-on-32-bit-systems.patch | 2 +- 0007-Skip-broken-tests-on-i686.patch | 2 +- 0008-Drop-new-feature-flags-on-LLVM-14.patch | 103 ++++++++++++++++++ tinygo.spec | 2 + 9 files changed, 112 insertions(+), 7 deletions(-) create mode 100644 0008-Drop-new-feature-flags-on-LLVM-14.patch diff --git a/0001-Skip-WASI-tests.patch b/0001-Skip-WASI-tests.patch index 6b71d1e..1687b81 100644 --- a/0001-Skip-WASI-tests.patch +++ b/0001-Skip-WASI-tests.patch @@ -1,7 +1,7 @@ From 8116847a5ef1b2127f8a0f178ae432dc41472454 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. +Subject: [PATCH 1/8] Skip WASI tests. We do not have wasmtime available. diff --git a/0002-Use-system-mingw64-headers-and-crt.patch b/0002-Use-system-mingw64-headers-and-crt.patch index c27f56d..91f9ff4 100644 --- a/0002-Use-system-mingw64-headers-and-crt.patch +++ b/0002-Use-system-mingw64-headers-and-crt.patch @@ -1,7 +1,7 @@ From 67f561400614dfde114b31f4b08a340fa352939e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 2 Jan 2022 05:47:18 -0500 -Subject: [PATCH 2/7] Use system mingw64 headers and crt +Subject: [PATCH 2/8] Use system mingw64 headers and crt Signed-off-by: Elliott Sales de Andrade --- diff --git a/0003-Skip-some-cross-Linux-tests-where-qemu-is-broken.patch b/0003-Skip-some-cross-Linux-tests-where-qemu-is-broken.patch index ed8514e..be9edf1 100644 --- a/0003-Skip-some-cross-Linux-tests-where-qemu-is-broken.patch +++ b/0003-Skip-some-cross-Linux-tests-where-qemu-is-broken.patch @@ -1,7 +1,7 @@ From b9ac4d7d45fe7710f7f5264ab182d7a2a10ddace Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 3 Jan 2022 22:39:31 -0500 -Subject: [PATCH 3/7] Skip some cross Linux tests where qemu is broken +Subject: [PATCH 3/8] Skip some cross Linux tests where qemu is broken The upstream issues will hopefully be fixed soon: diff --git a/0004-Suggest-optional-packages-to-install-if-missing.patch b/0004-Suggest-optional-packages-to-install-if-missing.patch index 1e41d76..72d229c 100644 --- a/0004-Suggest-optional-packages-to-install-if-missing.patch +++ b/0004-Suggest-optional-packages-to-install-if-missing.patch @@ -1,7 +1,7 @@ From 12016fd98fe0f0eb818f059a9b88465230817954 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 6 Feb 2022 03:49:16 -0500 -Subject: [PATCH 4/7] Suggest optional packages to install if missing +Subject: [PATCH 4/8] Suggest optional packages to install if missing Signed-off-by: Elliott Sales de Andrade --- diff --git a/0005-Skip-slice-copy-test-for-LLVM-14.patch b/0005-Skip-slice-copy-test-for-LLVM-14.patch index db3e14f..02be540 100644 --- a/0005-Skip-slice-copy-test-for-LLVM-14.patch +++ b/0005-Skip-slice-copy-test-for-LLVM-14.patch @@ -1,7 +1,7 @@ From e9592baa218826ca59faf7086838a923236baccb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 7 May 2022 19:47:59 -0400 -Subject: [PATCH 5/7] Skip slice-copy test for LLVM < 14 +Subject: [PATCH 5/8] Skip slice-copy test for LLVM < 14 Signed-off-by: Elliott Sales de Andrade --- diff --git a/0006-Skip-TestDirFS-on-32-bit-systems.patch b/0006-Skip-TestDirFS-on-32-bit-systems.patch index 96df69d..29d72ff 100644 --- a/0006-Skip-TestDirFS-on-32-bit-systems.patch +++ b/0006-Skip-TestDirFS-on-32-bit-systems.patch @@ -1,7 +1,7 @@ From a1095b1808280148cbb0f0457bf49899ba007833 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 8 May 2022 04:18:05 -0400 -Subject: [PATCH 6/7] Skip TestDirFS on 32-bit systems +Subject: [PATCH 6/8] Skip TestDirFS on 32-bit systems Because Seek is not fully implemented there. diff --git a/0007-Skip-broken-tests-on-i686.patch b/0007-Skip-broken-tests-on-i686.patch index ff1fad7..c6f4c81 100644 --- a/0007-Skip-broken-tests-on-i686.patch +++ b/0007-Skip-broken-tests-on-i686.patch @@ -1,7 +1,7 @@ From 3a2a96984d51beb348a9003ae8221a935a626918 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 8 May 2022 18:39:26 -0400 -Subject: [PATCH 7/7] Skip broken tests on i686 +Subject: [PATCH 7/8] Skip broken tests on i686 * compress/flate runs out of memory * testing/fstest uses Seek, which is not implemented there diff --git a/0008-Drop-new-feature-flags-on-LLVM-14.patch b/0008-Drop-new-feature-flags-on-LLVM-14.patch new file mode 100644 index 0000000..2d923a4 --- /dev/null +++ b/0008-Drop-new-feature-flags-on-LLVM-14.patch @@ -0,0 +1,103 @@ +From 724fbb844dbdd2df5ffaecd72c1d015c7954edd7 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Sun, 8 May 2022 20:53:27 -0400 +Subject: [PATCH 8/8] Drop new feature flags on LLVM<14 + +As they were added in LLVM 14, they cause warnings on the older +versions. + +Signed-off-by: Elliott Sales de Andrade +--- + targets/cortex-m0.json | 2 +- + targets/cortex-m0plus.json | 2 +- + targets/cortex-m3.json | 2 +- + targets/cortex-m4.json | 2 +- + targets/cortex-m7.json | 2 +- + targets/gameboy-advance.json | 2 +- + targets/nintendoswitch.json | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/targets/cortex-m0.json b/targets/cortex-m0.json +index 3df075b1..fe356805 100644 +--- a/targets/cortex-m0.json ++++ b/targets/cortex-m0.json +@@ -2,5 +2,5 @@ + "inherits": ["cortex-m"], + "llvm-target": "thumbv6m-unknown-unknown-eabi", + "cpu": "cortex-m0", +- "features": "+armv6-m,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" ++ "features": "+armv6-m,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" + } +diff --git a/targets/cortex-m0plus.json b/targets/cortex-m0plus.json +index f1d35ea1..a21d06ca 100644 +--- a/targets/cortex-m0plus.json ++++ b/targets/cortex-m0plus.json +@@ -2,5 +2,5 @@ + "inherits": ["cortex-m"], + "llvm-target": "thumbv6m-unknown-unknown-eabi", + "cpu": "cortex-m0plus", +- "features": "+armv6-m,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" ++ "features": "+armv6-m,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" + } +diff --git a/targets/cortex-m3.json b/targets/cortex-m3.json +index bb11efea..7b878d52 100644 +--- a/targets/cortex-m3.json ++++ b/targets/cortex-m3.json +@@ -2,5 +2,5 @@ + "inherits": ["cortex-m"], + "llvm-target": "thumbv7m-unknown-unknown-eabi", + "cpu": "cortex-m3", +- "features": "+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" ++ "features": "+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" + } +diff --git a/targets/cortex-m4.json b/targets/cortex-m4.json +index 58b16736..8bcbf767 100644 +--- a/targets/cortex-m4.json ++++ b/targets/cortex-m4.json +@@ -2,5 +2,5 @@ + "inherits": ["cortex-m"], + "llvm-target": "thumbv7em-unknown-unknown-eabi", + "cpu": "cortex-m4", +- "features": "+armv7e-m,+dsp,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" ++ "features": "+armv7e-m,+dsp,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" + } +diff --git a/targets/cortex-m7.json b/targets/cortex-m7.json +index e9abf1de..3ec505f6 100644 +--- a/targets/cortex-m7.json ++++ b/targets/cortex-m7.json +@@ -2,5 +2,5 @@ + "inherits": ["cortex-m"], + "llvm-target": "thumbv7em-unknown-unknown-eabi", + "cpu": "cortex-m7", +- "features": "+armv7e-m,+dsp,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" ++ "features": "+armv7e-m,+dsp,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" + } +diff --git a/targets/gameboy-advance.json b/targets/gameboy-advance.json +index 0ead0831..971c7181 100644 +--- a/targets/gameboy-advance.json ++++ b/targets/gameboy-advance.json +@@ -1,7 +1,7 @@ + { + "llvm-target": "armv4t-unknown-unknown-eabi", + "cpu": "arm7tdmi", +- "features": "+armv4t,+strict-align,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-thumb-mode,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp", ++ "features": "+armv4t,+strict-align,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-ras,-sb,-sha2,-thumb-mode,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp", + "build-tags": ["gameboyadvance", "arm7tdmi", "baremetal", "linux", "arm"], + "goos": "linux", + "goarch": "arm", +diff --git a/targets/nintendoswitch.json b/targets/nintendoswitch.json +index 24e35464..0768fc9a 100644 +--- a/targets/nintendoswitch.json ++++ b/targets/nintendoswitch.json +@@ -1,7 +1,7 @@ + { + "llvm-target": "aarch64", + "cpu": "cortex-a57", +- "features": "+aes,+crc,+crypto,+fp-armv8,+neon,+sha2,+v8a", ++ "features": "+aes,+crc,+crypto,+fp-armv8,+neon,+sha2", + "build-tags": ["nintendoswitch", "arm64"], + "scheduler": "tasks", + "goos": "linux", +-- +2.35.1 + diff --git a/tinygo.spec b/tinygo.spec index 931d207..c4a507d 100644 --- a/tinygo.spec +++ b/tinygo.spec @@ -84,6 +84,8 @@ Patch0005: 0005-Skip-slice-copy-test-for-LLVM-14.patch # https://github.com/tinygo-org/tinygo/pull/2840 Patch0006: 0006-Skip-TestDirFS-on-32-bit-systems.patch Patch0007: 0007-Skip-broken-tests-on-i686.patch +# This feature flag is not available on LLVM < 14. +Patch0008: 0008-Drop-new-feature-flags-on-LLVM-14.patch # Not supported upstream yet. ExcludeArch: armv7hl ppc64le s390x From d8239b5743e9a9da9b7eb0b41013cf1d048005b2 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 8 Jul 2022 19:25:19 -0500 Subject: [PATCH 3/3] Rebuild for CVE-2022-{24675,28327,29526} in golang