mirrors/meta-openembedded
1
0 Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-11-14 03:57:15 +00:00
Code Issues Projects Releases Wiki Activity

libhugetlbfs: Fix linking tests for riscv64 with lld

Browse Source 
ld.hugetlbfs has no case for the riscv64 elf64lriscv emulation, so the
page sizes it passes for the HTLB_ALIGN=slice tests are empty and LLD
fails with:

  ld.lld: error: invalid max-page-size:

Use 2MB, riscv64's default huge page size, and set the text segment
address explicitly as for aarch64.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Khem Raj committed 2026-11-12 20:21:02 -08:00
1 parent df8e11bdb6
commit 2e9b29943d
2 files changed
+41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

meta-oe/recipes-benchmark/libhugetlbfs/files/0017-ld.hugetlbfs-Add-riscv64-support.patch
+40
View File
@@ -0,0 +1,40 @@
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 12 Nov 2026 00:00:00 -0800
Subject: [PATCH] ld.hugetlbfs: Add riscv64 support
riscv64 was added to the Makefiles in 2.23, but ld.hugetlbfs has no
case for its elf64lriscv emulation, so HPAGE_SIZE and SLICE_SIZE stay
empty. Linking the HTLB_ALIGN=slice tests then passes
"-zcommon-page-size= -zmax-page-size=", which LLD rejects:
ld.lld: error: invalid max-page-size:
riscv64 uses 2MB (PMD) huge pages by default. Like aarch64, set the
text segment address explicitly: with a 2MB max page size the default
image base would otherwise be aligned down to 0.
Upstream-Status: Submitted [https://github.com/libhugetlbfs/libhugetlbfs/pull/119]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ld.hugetlbfs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/ld.hugetlbfs
+++ b/ld.hugetlbfs
@@ -121,6 +121,7 @@ armelf*_linux_eabi|aarch64elf*|aarch64li
hpage_kb=$(cat /proc/meminfo | grep Hugepagesize: | awk '{print $2}')
HPAGE_SIZE=$((hpage_kb * 1024))
SLICE_SIZE=$HPAGE_SIZE ;;
+elf64lriscv*) HPAGE_SIZE=$((2*$MB)) SLICE_SIZE=$HPAGE_SIZE ;;
esac
# LLD does not implement -Ttext-segment, --image-base is its equivalent
@@ -136,7 +137,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then
# targeting the ARM platform one needs to explicitly set the text segment offset
# otherwise it will be NULL.
case "$EMU" in
- armelf*_linux_eabi|aarch64elf*|aarch64linux*)
+ armelf*_linux_eabi|aarch64elf*|aarch64linux*|elf64lriscv*)
printf -v TEXTADDR "0x%x" "$SLICE_SIZE"
HTLBOPTS="$HTLBOPTS ${TEXTSEG}$TEXTADDR" ;;
elf_i386) HTLBOPTS="$HTLBOPTS ${TEXTSEG}0x08000000" ;;
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
+1
View File
@@ -27,6 +27,7 @@ SRC_URI = " \
file://0014-tests-Add-ldflags-to-linker-commandline-for-libheaps.patch \
file://0015-support-reproducible-builds.patch \
file://0016-ld.hugetlbfs-Use-image-base-with-LLD.patch \
file://0017-ld.hugetlbfs-Add-riscv64-support.patch \
"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"