lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

ARM: Support loading unmarked objects from cache.

Browse Source 
ARM now supports loading unmarked objects from
the dynamic loader cache. Unmarked objects can
be used with the hard-float or soft-float ABI.
We must support loading unmarked objects during
the transition period from a binutils that does
not mark objects to one that does mark them with
the correct ELF flags.

Signed-off-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Carlos O'Donell
2013-02-08 12:26:12 -05:00
parent a6ee178332
commit b39949d211
6 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-02-08 Carlos O'Donell <carlos@redhat.com>
* sysdeps/generic/ldconfig.h: Define FLAG_ARM_LIBSF.
* elf/cache.c (print_entry): Add FLAG_ARM_LIBSF support.
2013-02-08 Joseph Myers <joseph@codesourcery.com> 2013-02-08 Joseph Myers <joseph@codesourcery.com>
[BZ #13550] [BZ #13550]

4
elf/cache.c
View File

@ -100,6 +100,10 @@ print_entry (const char *lib, int flag, unsigned int osversion,
case FLAG_AARCH64_LIB64: case FLAG_AARCH64_LIB64:
fputs (",AArch64", stdout); fputs (",AArch64", stdout);
break; break;
/* Uses the ARM soft-float ABI. */
case FLAG_ARM_LIBSF:
fputs (",soft-float", stdout);
break;
case 0: case 0:
break; break;
default: default:

8
ports/ChangeLog.arm
View File

@ -1,3 +1,11 @@
2013-02-08 Carlos O'Donell <carlos@redhat.com>
* sysdeps/unix/sysv/linux/arm/dl-cache.h
[__ARM_PCS_VFP] (_dl_cache_check_flags): Allow plain FLAG_ELF_LIBC6.
[!__ARM_PCS_VFP] (_dl_cache_check_flags): Likewise.
* sysdeps/unix/sysv/linux/arm/readelflib.c (process_elf_file):
Set FLAG_ARM_LIBSF for soft-float ABI otherwise just FLAG_ELF_LIBC6.
2013-02-04 Joseph Myers <joseph@codesourcery.com> 2013-02-04 Joseph Myers <joseph@codesourcery.com>
[BZ #13550] [BZ #13550]

9
ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
View File

@ -18,12 +18,17 @@
#include <ldconfig.h> #include <ldconfig.h>
/* In order to support the transition from unmarked objects
to marked objects we must treat unmarked objects as
compatible with either FLAG_ARM_LIBHF or FLAG_ARM_LIBSF. */
#ifdef __ARM_PCS_VFP #ifdef __ARM_PCS_VFP
# define _dl_cache_check_flags(flags) \ # define _dl_cache_check_flags(flags) \
((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6)) ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6) \
|| (flags) == FLAG_ELF_LIBC6)
#else #else
# define _dl_cache_check_flags(flags) \ # define _dl_cache_check_flags(flags) \
((flags) == FLAG_ELF_LIBC6) ((flags) == (FLAG_ARM_LIBSF | FLAG_ELF_LIBC6) \
|| (flags) == FLAG_ELF_LIBC6)
#endif #endif
#include_next <dl-cache.h> #include_next <dl-cache.h>

6
ports/sysdeps/unix/sysv/linux/arm/readelflib.c
View File

@ -46,6 +46,12 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD) if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD)
*flag = FLAG_ARM_LIBHF|FLAG_ELF_LIBC6; *flag = FLAG_ARM_LIBHF|FLAG_ELF_LIBC6;
else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT) else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT)
*flag = FLAG_ARM_LIBSF|FLAG_ELF_LIBC6;
else
/* We must assume the unmarked objects are compatible
with all ABI variants. Such objects may have been
generated in a transitional period when the ABI
tags were not added to all objects. */
*flag = FLAG_ELF_LIBC6; *flag = FLAG_ELF_LIBC6;
} }
} }

1
sysdeps/generic/ldconfig.h
View File

@ -36,6 +36,7 @@
#define FLAG_X8664_LIBX32 0x0800 #define FLAG_X8664_LIBX32 0x0800
#define FLAG_ARM_LIBHF 0x0900 #define FLAG_ARM_LIBHF 0x0900
#define FLAG_AARCH64_LIB64 0x0a00 #define FLAG_AARCH64_LIB64 0x0a00
#define FLAG_ARM_LIBSF 0x0b00
/* Name of auxiliary cache. */ /* Name of auxiliary cache. */
#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache" #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"