From: Steve McIntyre <steve.mcintyre@linaro.org>
To: libc-ports@sourceware.org
Cc: Carlos O'Donell <carlos@systemhalted.org>,
"Joseph S. Myers" <joseph@codesourcery.com>,
Marcus Shawcroft <marcus.shawcroft@linaro.org>
Subject: [PATCH] ARM: Tag ARM and AArch64 binaries in the ldconfig cache
Date: Mon, 03 Dec 2012 15:35:00 -0000 [thread overview]
Message-ID: <20121203153446.GD22509@einval.com> (raw)
Splitting up code as requested. Here's patch #1 for ARM. Identical to
the similar code I just posted for AArch64, so I'd suggest using
#include in AArch64 to pull in the ARM version if you're happy with
that.
==============================
Tag ARM and AArch64 binaries in the ldconfig cache
* sysdeps/unix/sysv/linux/arm/readelflib.c: New file.
Add the correct tags for ARM and AArch64 libraries in the ldconfig
cache for ARM.
Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
---
ports/sysdeps/unix/sysv/linux/arm/readelflib.c | 73 ++++++++++++++++++++++++
1 file changed, 73 insertions(+)
create mode 100644 ports/sysdeps/unix/sysv/linux/arm/readelflib.c
diff --git a/ports/sysdeps/unix/sysv/linux/arm/readelflib.c b/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
new file mode 100644
index 0000000..e4ba2b0
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
@@ -0,0 +1,73 @@
+/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Andreas Jaeger <aj@suse.de>, 1999 and
+ Jakub Jelinek <jakub@redhat.com>, 1999.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+
+int process_elf32_file (const char *file_name, const char *lib, int *flag,
+ unsigned int *osversion, char **soname,
+ void *file_contents, size_t file_length);
+int process_elf64_file (const char *file_name, const char *lib, int *flag,
+ unsigned int *osversion, char **soname,
+ void *file_contents, size_t file_length);
+
+/* Returns 0 if everything is ok, != 0 in case of error. */
+int
+process_elf_file (const char *file_name, const char *lib, int *flag,
+ unsigned int *osversion, char **soname, void *file_contents,
+ size_t file_length)
+{
+ ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
+ int ret;
+
+ if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
+ {
+ Elf32_Ehdr *elf32_header = (Elf32_Ehdr *) elf_header;
+
+ ret = process_elf32_file (file_name, lib, flag, osversion, soname,
+ file_contents, file_length);
+
+ if (!ret && EF_ARM_EABI_VERSION(elf32_header->e_flags) == EF_ARM_EABI_VER5)
+ {
+ if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD)
+ *flag = FLAG_ARM_LIBHF|FLAG_ELF_LIBC6;
+ else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT)
+ *flag = FLAG_ELF_LIBC6;
+ }
+ }
+ else
+ {
+ ret = process_elf64_file (file_name, lib, flag, osversion, soname,
+ file_contents, file_length);
+ /* AArch64 libraries are always libc.so.6+. */
+ if (!ret)
+ *flag = FLAG_AARCH64_LIB64|FLAG_ELF_LIBC6;
+ }
+ return ret;
+}
+
+#undef __ELF_NATIVE_CLASS
+#undef process_elf_file
+#define process_elf_file process_elf32_file
+#define __ELF_NATIVE_CLASS 32
+#include "elf/readelflib.c"
+
+#undef __ELF_NATIVE_CLASS
+#undef process_elf_file
+#define process_elf_file process_elf64_file
+#define __ELF_NATIVE_CLASS 64
+#include "elf/readelflib.c"
--
1.7.10.4
Cheers,
--
Steve McIntyre steve.mcintyre@linaro.org
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs
next reply other threads:[~2012-12-03 15:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-03 15:35 Steve McIntyre [this message]
2012-12-03 15:38 ` [PATCH] ARM: Check for the FLAG_ARM_LIBHF flag " Steve McIntyre
2012-12-03 15:42 ` [PATCH] ARM: Identify the hard-float ABI in older ARM binaries Steve McIntyre
2012-12-03 16:00 ` Joseph S. Myers
2012-12-03 16:44 ` Steve McIntyre
2012-12-03 16:49 ` Joseph S. Myers
2012-12-03 16:54 ` Steve McIntyre
2012-12-03 16:59 ` Joseph S. Myers
2012-12-03 17:11 ` Steve McIntyre
2012-12-03 15:59 ` [PATCH] ARM: Check for the FLAG_ARM_LIBHF flag in the ldconfig cache Joseph S. Myers
2012-12-03 16:32 ` Steve McIntyre
2012-12-03 15:44 ` [PATCH] ARM: Tag ARM libc6-dependent binaries with FLAG_ELF_LIBC6 Steve McIntyre
2012-12-03 16:00 ` Joseph S. Myers
2012-12-03 15:58 ` [PATCH] ARM: Tag ARM and AArch64 binaries in the ldconfig cache Joseph S. Myers
2012-12-03 16:31 ` Steve McIntyre
2013-01-09 2:14 ` Joseph S. Myers
2013-01-09 13:50 ` Steve McIntyre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121203153446.GD22509@einval.com \
--to=steve.mcintyre@linaro.org \
--cc=carlos@systemhalted.org \
--cc=joseph@codesourcery.com \
--cc=libc-ports@sourceware.org \
--cc=marcus.shawcroft@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).