Skip to content

Commit 938676c

Browse files
authored
Remaster picolibc patches against commit e3a4f137d85c5e9 (#590)
This deletes most of the previous patch 0002 (add bootcode for AArch64 FVPs), because it's now upstream in picolibc itself. The remaining vestige, defining picocrt_machines in the AArch32 picolibc build configuration, remains necessary until we conditionalise our definition of `test-machine` in our own builds.
1 parent be02e50 commit 938676c

5 files changed

+39
-898
lines changed

patches/picolibc/0001-Enable-libcxx-builds.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 028fe75e045951a9d091008a85971523358160db Mon Sep 17 00:00:00 2001
1+
From bd1dcaa0e3e77260e264cc0c2580bf32f704a0ed 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,10 +11,10 @@ libc++ builds.
1111
2 files changed, 15 insertions(+)
1212

1313
diff --git a/meson.build b/meson.build
14-
index 012d664bd..4161d6574 100644
14+
index b8f43c800..9d3f5c672 100644
1515
--- a/meson.build
1616
+++ b/meson.build
17-
@@ -1318,6 +1318,18 @@ if get_option('newlib-retargetable-locking') != get_option('newlib-multithread')
17+
@@ -1319,6 +1319,18 @@ if get_option('newlib-retargetable-locking') != get_option('newlib-multithread')
1818
error('newlib-retargetable-locking and newlib-multithread must be set to the same value')
1919
endif
2020

@@ -48,5 +48,5 @@ index 7b63ba172..cda5e1e7e 100644
4848
KEEP (*(.fini .fini.*))
4949
@PREFIX@__text_end = .;
5050
--
51-
2.39.5 (Apple Git-154)
51+
2.43.0
5252

0 commit comments

Comments
 (0)