Skip to content

Commit bb4b95e

Browse files
committed
Temp fix pioasm build with gcc 15 on Windows
1 parent cb6a1d0 commit bb4b95e

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

packages/windows/picotool/build-picotool.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ export LDFLAGS="-static -static-libgcc -static-libstdc++"
1111

1212
git -C "$PICO_SDK_PATH" submodule update --init --depth=1 lib/mbedtls
1313

14+
# Apply https://github.com/raspberrypi/pico-sdk/commit/66540fe88e86a9f324422b7451a3b5dff4c0449f
15+
git -C "$PICO_SDK_PATH" apply "$PWD/../packages/windows/picotool/pioasm-cstdint.diff"
16+
1417
echo "Version is $sdkVersion"
1518
if [ ${sdkVersion:0:1} -ge 2 ]; then
1619
echo "Version 2+"
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/tools/pioasm/output_format.h b/tools/pioasm/output_format.h
2+
index 405a5ae75..d42ea73b4 100644
3+
--- a/tools/pioasm/output_format.h
4+
+++ b/tools/pioasm/output_format.h
5+
@@ -7,6 +7,7 @@
6+
#ifndef _OUTPUT_FORMAT_H
7+
#define _OUTPUT_FORMAT_H
8+
9+
+#include <cstdint>
10+
#include <vector>
11+
#include <map>
12+
#include <string>
13+
@@ -120,4 +121,4 @@ struct output_format {
14+
output_format(std::string name) : name(std::move(name)) {}
15+
};
16+
17+
-#endif
18+
\ No newline at end of file
19+
+#endif
20+
diff --git a/tools/pioasm/pio_types.h b/tools/pioasm/pio_types.h
21+
index 9f9fb0e3e..755eb75a0 100644
22+
--- a/tools/pioasm/pio_types.h
23+
+++ b/tools/pioasm/pio_types.h
24+
@@ -7,6 +7,7 @@
25+
#ifndef _PIO_TYPES_H
26+
#define _PIO_TYPES_H
27+
28+
+#include <cstdint>
29+
#include <string>
30+
#include <map>
31+
#include <set>

0 commit comments

Comments
 (0)