summaryrefslogtreecommitdiff
path: root/sysdeps/generic/ldconfig.h
diff options
context:
space:
mode:
authorWilhelm Eger <wilhelm.eger@googlemail.com>2013-05-22 16:33:03 -0400
committerCarlos O'Donell <carlos@redhat.com>2013-05-22 16:33:03 -0400
commit2b863a1b2dcbe2589d27646447d9ef88f9beffa5 (patch)
treeb78ecc20215f535774184f8e0e80cae9acdd4b34 /sysdeps/generic/ldconfig.h
parent1032040da284af3b9fe5870c54b0dae246bc0c02 (diff)
downloadglibc-2b863a1b2dcbe2589d27646447d9ef88f9beffa5.tar.gz
Backport fixes for BZ #15006 from master.
Resolved backport request BZ #15122. Assume all unmarked objects are compatible with all ABI variants. Such objects may have been generated in a transitional period when ABI tags were not added to all objects. --- 2013-02-08 Carlos O'Donell <carlos@redhat.com> [BZ #15006] * sysdeps/generic/ldconfig.h: Define FLAG_ARM_LIBSF. * elf/cache.c (print_entry): Add FLAG_ARM_LIBSF support. ports/ 2013-02-08 Carlos O'Donell <carlos@redhat.com> [BZ #15006] * 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.
Diffstat (limited to 'sysdeps/generic/ldconfig.h')
-rw-r--r--sysdeps/generic/ldconfig.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
index 43cb9bdb0c..91190aa0cd 100644
--- a/sysdeps/generic/ldconfig.h
+++ b/sysdeps/generic/ldconfig.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 1999.
@@ -36,6 +36,7 @@
#define FLAG_X8664_LIBX32 0x0800
#define FLAG_ARM_LIBHF 0x0900
#define FLAG_AARCH64_LIB64 0x0a00
+#define FLAG_ARM_LIBSF 0x0b00
/* Name of auxiliary cache. */
#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"