Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make fvp work for anything other than aarch64 when being set as the test machine #574

Merged
merged 4 commits into from
Nov 25, 2024
Merged

Make fvp work for anything other than aarch64 when being set as the test machine #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c875ec
Make fvp work for anything other than aarch64 when being set as the t…
simpal01 Nov 21, 2024
47c5d90
fixup! Make fvp work for anything other than aarch64 when being set a…
simpal01 Nov 21, 2024
fe07e26
fixup! fixup! Make fvp work for anything other than aarch64 when bein…
simpal01 Nov 25, 2024
e8cb074
fixup! Make fvp work for anything other than aarch64 when being set a…
simpal01 Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arm-runtimes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ if(C_LIBRARY STREQUAL picolibc)
-Dmultilib=false
-Dtests-enable-stack-protector=false
-Dtest-long-double=${enable_picolibc_long_double_test}
-Dtest-machine=${TEST_EXECUTOR}
-Dnewlib-nano-malloc=${newlib_nano_malloc}
-Dtests=false
--prefix <INSTALL_DIR>
Expand Down
27 changes: 23 additions & 4 deletions patches/picolibc/0002-Add-bootcode-for-AArch64-FVPs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From f2ca20cebc85850a50b80424bb0f81c927edd04b Mon Sep 17 00:00:00 2001
From 3b0b62ce6d81211a71eebe63b4b4ef0732da93ef Mon Sep 17 00:00:00 2001
From: Simi Pallipurath <[email protected]>
Date: Thu, 14 Nov 2024 10:12:33 +0000
Date: Mon, 25 Nov 2024 11:13:50 +0000
Subject: [PATCH 2/2] [PATCH 2/2] Add bootcode for AArch64 FVPs

The AArch64 FVP (Fixed Virtual Platform) models differ from QEMU in a
Expand All @@ -18,12 +18,13 @@ few ways which affect the crt0 code:
picocrt/machine/aarch64/crt0.S | 200 +++++++++++++++++++
picocrt/machine/aarch64/crt0.c | 198 +++----------------
picocrt/machine/aarch64/meson.build | 9 +-
picocrt/machine/arm/meson.build | 7 +
picocrt/meson.build | 296 ++++++++++++++++------------
6 files changed, 404 insertions(+), 303 deletions(-)
7 files changed, 411 insertions(+), 303 deletions(-)
create mode 100644 picocrt/machine/aarch64/crt0.S

diff --git a/meson.build b/meson.build
index 4161d6574..9d3f5c672 100644
index 012d664bd..b8f43c800 100644
--- a/meson.build
+++ b/meson.build
@@ -151,6 +151,7 @@ multilib_exclude = get_option('multilib-exclude')
Expand Down Expand Up @@ -534,6 +535,21 @@ index 808d691a5..923d32c3b 100644
+ 'suffix': '-fvp',
+ },
+]
diff --git a/picocrt/machine/arm/meson.build b/picocrt/machine/arm/meson.build
index 808d691a5..ecc9a485b 100644
--- a/picocrt/machine/arm/meson.build
+++ b/picocrt/machine/arm/meson.build
@@ -33,3 +33,10 @@
# OF THE POSSIBILITY OF SUCH DAMAGE.
#
src_picocrt += files('crt0.c')
+
+picocrt_machines += [
+ {
+ 'name': 'fvp',
+ 'suffix': '-fvp',
+ },
+]
diff --git a/picocrt/meson.build b/picocrt/meson.build
index 76965990f..be8f875be 100644
--- a/picocrt/meson.build
Expand Down Expand Up @@ -868,3 +884,6 @@ index 76965990f..be8f875be 100644
+ endforeach

endforeach
--
2.34.1

Loading