Skip to content

Commit 1e4b2f2

Browse files
authored
[ATfE] Rebase picolibc patches (#225)
Recent upstream changes to picolibc mean the downstream patches no longer apply due to the context around them changing: * The retargetable locking condition was removed. * Various `_HAVE_` symbols were changed to `__HAVE_`. * `PREFER_SIZE_OVER_SPEED` changed to `__PREFER_SIZE_OVER_SPEED`. The downstream modifications themselves remain unchanged.
1 parent ef99a38 commit 1e4b2f2

File tree

3 files changed

+99
-99
lines changed

3 files changed

+99
-99
lines changed

arm-software/embedded/patches/picolibc/0001-Enable-libcxx-builds.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From cf0324ab646a164ad5b3409e1147164e076b72d0 Mon Sep 17 00:00:00 2001
1+
From a59afdaf3697da7a1cfc62e0f957be780d6ae11a Mon Sep 17 00:00:00 2001
22
From: Simi Pallipurath <[email protected]>
33
Date: Thu, 14 Nov 2024 10:07:08 +0000
44
Subject: Enable libcxx builds
@@ -11,12 +11,12 @@ libc++ builds.
1111
2 files changed, 15 insertions(+)
1212

1313
diff --git a/meson.build b/meson.build
14-
index e62ac11ab..b3881d106 100644
14+
index f33d011b2..2c653de02 100644
1515
--- a/meson.build
1616
+++ b/meson.build
17-
@@ -1373,6 +1373,18 @@ if get_option('newlib-retargetable-locking') != get_option('newlib-multithread')
18-
error('newlib-retargetable-locking and newlib-multithread must be set to the same value')
19-
endif
17+
@@ -1340,6 +1340,18 @@ NEWLIB_MAJOR_VERSION=4
18+
NEWLIB_MINOR_VERSION=3
19+
NEWLIB_PATCHLEVEL_VERSION=0
2020

2121
+conf_data.set('_GNU_SOURCE', '',
2222
+ description: '''Enable GNU functions like strtof_l.
@@ -30,11 +30,11 @@ index e62ac11ab..b3881d106 100644
3030
+and extended character sets, so picolibc's small ctype is not compatible with it'''
3131
+)
3232
+
33-
conf_data.set('_HAVE_CC_INHIBIT_LOOP_TO_LIBCALL',
33+
conf_data.set('__HAVE_CC_INHIBIT_LOOP_TO_LIBCALL',
3434
cc.has_argument('-fno-tree-loop-distribute-patterns'),
3535
description: 'Compiler flag to prevent detecting memcpy/memset patterns')
3636
diff --git a/picolibc.ld.in b/picolibc.ld.in
37-
index c6d2a7d66..b8cd3209b 100644
37+
index 0bcfe4ca8..c3055c49e 100644
3838
--- a/picolibc.ld.in
3939
+++ b/picolibc.ld.in
4040
@@ -69,6 +69,9 @@ SECTIONS

arm-software/embedded/patches/picolibc/0002-Define-picocrt_machines-for-AArch32-builds-as-well-a.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8f32c696fa3531dd557f180c09bdb6bd2689cb1c Mon Sep 17 00:00:00 2001
1+
From e8c748ad0040ad6043b4d10db681f683344f896d Mon Sep 17 00:00:00 2001
22
From: Simi Pallipurath <[email protected]>
33
Date: Thu, 14 Nov 2024 10:12:33 +0000
44
Subject: Define picocrt_machines for AArch32 builds as well as 64.

0 commit comments

Comments
 (0)