Skip to content

Commit d8d3fd2

Browse files
authored
Update picolibc patch file (#541)
Patch no longer cleanly applies, so this updates the diff.
1 parent 8b733dd commit d8d3fd2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

patches/picolibc.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/meson.build b/meson.build
2-
index 0fdfa0412..8e679f166 100644
2+
index f90f5b818..2f8d63733 100644
33
--- a/meson.build
44
+++ b/meson.build
5-
@@ -1224,6 +1224,18 @@ if get_option('newlib-retargetable-locking') != get_option('newlib-multithread')
5+
@@ -1310,6 +1310,18 @@ if get_option('newlib-retargetable-locking') != get_option('newlib-multithread')
66
error('newlib-retargetable-locking and newlib-multithread must be set to the same value')
77
endif
88

@@ -22,13 +22,13 @@ index 0fdfa0412..8e679f166 100644
2222
cc.has_argument('-fno-tree-loop-distribute-patterns'),
2323
description: 'Compiler flag to prevent detecting memcpy/memset patterns')
2424
diff --git a/picolibc.ld.in b/picolibc.ld.in
25-
index b97ea3300..04b94f35c 100644
25+
index 7b63ba172..cda5e1e7e 100644
2626
--- a/picolibc.ld.in
2727
+++ b/picolibc.ld.in
2828
@@ -68,6 +68,9 @@ SECTIONS
29-
*(.text.unlikely .text.unlikely.*)
30-
*(.text.startup .text.startup.*)
31-
*(.text .text.* .opd .opd.*)
29+
*(.literal.unlikely .text.unlikely .literal.unlikely.* .text.unlikely.*)
30+
*(.literal.startup .text.startup .literal.startup.* .text.startup.*)
31+
*(.literal .text .literal.* .text.* .opd .opd.*)
3232
+ PROVIDE (__start___lcxx_override = .);
3333
+ *(__lcxx_override)
3434
+ PROVIDE (__stop___lcxx_override = .);

0 commit comments

Comments
 (0)