Skip to content

Commit ed96d9f

Browse files
committed
Remove picolibc patches that have been applied upstream
1 parent aebf03d commit ed96d9f

File tree

1 file changed

+1
-67
lines changed

1 file changed

+1
-67
lines changed

patches/picolibc-HEAD.patch

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,5 @@
1-
diff --git a/newlib/libc/include/bits/types/mbstate_t.h b/newlib/libc/include/bits/types/mbstate_t.h
2-
new file mode 100644
3-
index 0000000..fae326c
4-
--- /dev/null
5-
+++ b/newlib/libc/include/bits/types/mbstate_t.h
6-
@@ -0,0 +1,8 @@
7-
+#ifndef _PICOLIBC_BITS_TYPES_MBSTATE_T_H
8-
+#define _PICOLIBC_BITS_TYPES_MBSTATE_T_H
9-
+
10-
+#include <sys/_types.h>
11-
+
12-
+typedef _mbstate_t mbstate_t;
13-
+
14-
+#endif /* _PICOLIBC_BITS_TYPES_MBSTATE_T_H */
15-
diff --git a/newlib/libc/include/meson.build b/newlib/libc/include/meson.build
16-
index 4696e94..f5cf6a3 100644
17-
--- a/newlib/libc/include/meson.build
18-
+++ b/newlib/libc/include/meson.build
19-
@@ -111,3 +111,7 @@ endif
20-
21-
install_headers(inc_headers,
22-
install_dir: include_dir)
23-
+
24-
+# For compatibility with libc++'s __mbstate_t.h:
25-
+install_headers(['bits/types/mbstate_t.h'],
26-
+ install_dir: include_dir / 'bits/types')
27-
diff --git a/picocrt/machine/arm/crt0.c b/picocrt/machine/arm/crt0.c
28-
index 037baf9..bee07b3 100644
29-
--- a/picocrt/machine/arm/crt0.c
30-
+++ b/picocrt/machine/arm/crt0.c
31-
@@ -176,7 +176,7 @@ void __attribute__((naked))
32-
arm_hardfault_isr(void)
33-
{
34-
__asm__("mov r0, sp");
35-
- __asm__("mov r1, #" REASON(REASON_HARDFAULT));
36-
+ __asm__("movs r1, #" REASON(REASON_HARDFAULT));
37-
__asm__("bl arm_fault");
38-
}
39-
40-
@@ -184,7 +184,7 @@ void __attribute__((naked))
41-
arm_memmange_isr(void)
42-
{
43-
__asm__("mov r0, sp");
44-
- __asm__("mov r1, #" REASON(REASON_MEMMANAGE));
45-
+ __asm__("movs r1, #" REASON(REASON_MEMMANAGE));
46-
__asm__("bl arm_fault");
47-
}
48-
49-
@@ -192,7 +192,7 @@ void __attribute__((naked))
50-
arm_busfault_isr(void)
51-
{
52-
__asm__("mov r0, sp");
53-
- __asm__("mov r1, #" REASON(REASON_BUSFAULT));
54-
+ __asm__("movs r1, #" REASON(REASON_BUSFAULT));
55-
__asm__("bl arm_fault");
56-
}
57-
58-
@@ -200,7 +200,7 @@ void __attribute__((naked))
59-
arm_usagefault_isr(void)
60-
{
61-
__asm__("mov r0, sp");
62-
- __asm__("mov r1, #" REASON(REASON_USAGE));
63-
+ __asm__("movs r1, #" REASON(REASON_USAGE));
64-
__asm__("bl arm_fault");
65-
}
66-
671
diff --git a/picolibc.ld.in b/picolibc.ld.in
68-
index c69ad3c..7f4d2fc 100644
2+
index c69ad3c3a..7f4d2fc43 100644
693
--- a/picolibc.ld.in
704
+++ b/picolibc.ld.in
715
@@ -42,8 +42,8 @@ ENTRY(_start)

0 commit comments

Comments
 (0)