UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-05-29 01:33:26 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix resolution of libs in LDCache on ARM

Browse Source 
Since we explicitly check for the architecture of the
libraries in the ldcache, we need to also check the architecture
flag against the ARM constants.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2025-04-23 14:28:26 +02:00
parent de3d736663
commit e6cd7a3b53
No known key found for this signature in database
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/ldcache/ldcache.go
View File

@ -47,6 +47,11 @@ const (
flagArchX8664 = 0x0300 flagArchX8664 = 0x0300
flagArchX32 = 0x0800 flagArchX32 = 0x0800
flagArchPpc64le = 0x0500 flagArchPpc64le = 0x0500
// flagArch_ARM_LIBHF is the flag value for 32-bit ARM libs using hard-float.
flagArch_ARM_LIBHF = 0x0900
// flagArch_AARCH64_LIB64 is the flag value for 64-bit ARM libs.
flagArch_AARCH64_LIB64 = 0x0a00
) )
var errInvalidCache = errors.New("invalid ld.so.cache file") var errInvalidCache = errors.New("invalid ld.so.cache file")
@ -195,10 +200,14 @@ func (c *ldcache) getEntries() []entry {
switch e.Flags & flagArchMask { switch e.Flags & flagArchMask {
case flagArchX8664: case flagArchX8664:
fallthrough fallthrough
case flagArch_AARCH64_LIB64:
fallthrough
case flagArchPpc64le: case flagArchPpc64le:
bits = 64 bits = 64
case flagArchX32: case flagArchX32:
fallthrough fallthrough
case flagArch_ARM_LIBHF:
fallthrough
case flagArchI386: case flagArchI386:
bits = 32 bits = 32
default: default: