* [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache
@ 2012-12-03 15:26 Steve McIntyre
2012-12-03 15:28 ` [PATCH] AArch64: Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6 cache Steve McIntyre
2012-12-04 13:02 ` [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache Marcus Shawcroft
0 siblings, 2 replies; 5+ messages in thread
From: Steve McIntyre @ 2012-12-03 15:26 UTC (permalink / raw)
To: libc-ports; +Cc: Carlos O'Donell, Joseph S. Myers, Marcus Shawcroft
Hey guys,
Splitting up code as requested. Here's patch #1 for AArch64.
=======================================
Tag ARM and AArch64 binaries in the ldconfig cache
* sysdeps/unix/sysv/linux/aarch64/readelflib.c: New file.
Add the correct tags for ARM and AArch64 libraries in the ldconfig
cache for AArch64.
Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
---
ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c | 73 ++++++++++++++++++++++++
1 file changed, 73 insertions(+)
create mode 100644 ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c b/ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c
new file mode 100644
index 0000000..e4ba2b0
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] AArch64: Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6 cache
2012-12-03 15:26 [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache Steve McIntyre
@ 2012-12-03 15:28 ` Steve McIntyre
2012-12-04 12:52 ` Marcus Shawcroft
2012-12-04 13:02 ` [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache Marcus Shawcroft
1 sibling, 1 reply; 5+ messages in thread
From: Steve McIntyre @ 2012-12-03 15:28 UTC (permalink / raw)
To: libc-ports; +Cc: Carlos O'Donell, Joseph S. Myers, Marcus Shawcroft
And here's my second patch for AArch64 - tag programs depending on the
interpreter name.
=========================================================================
Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6
* sysdeps/unix/sysv/linux/aarch64/ldconfig.h: Add entries
for /lib/ld-linux.so.3 and /lib/ld-linux-armhf.so.3.
Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
---
ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h b/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h
index 4c1af06..d0517d8 100644
--- a/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h
@@ -19,7 +19,9 @@
#include <sysdeps/generic/ldconfig.h>
#define SYSDEP_KNOWN_INTERPRETER_NAMES \
- { "/lib/ld-linux-aarch64.so.1", FLAG_ELF_LIBC6 },
+ { "/lib/ld-linux-aarch64.so.1", FLAG_ELF_LIBC6 }, \
+ { "/lib/ld-linux.so.3", FLAG_ELF_LIBC6 }, \
+ { "/lib/ld-linux-armhf.so.3", FLAG_ELF_LIBC6 },
#define SYSDEP_KNOWN_LIBRARY_NAMES \
{ "libc.so.6", FLAG_ELF_LIBC6 }, \
{ "libm.so.6", FLAG_ELF_LIBC6 },
--
1.7.10.4
Cheers,
--
Steve McIntyre steve.mcintyre@linaro.org
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] AArch64: Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6 cache
2012-12-03 15:28 ` [PATCH] AArch64: Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6 cache Steve McIntyre
@ 2012-12-04 12:52 ` Marcus Shawcroft
0 siblings, 0 replies; 5+ messages in thread
From: Marcus Shawcroft @ 2012-12-04 12:52 UTC (permalink / raw)
To: Steve McIntyre; +Cc: libc-ports, Carlos O'Donell, Joseph S. Myers
On 3 December 2012 15:27, Steve McIntyre <steve.mcintyre@linaro.org> wrote:
> And here's my second patch for AArch64 - tag programs depending on the
> interpreter name.
>
> =========================================================================
> Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6
>
> * sysdeps/unix/sysv/linux/aarch64/ldconfig.h: Add entries
> for /lib/ld-linux.so.3 and /lib/ld-linux-armhf.so.3.
>
> Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
> ---
> ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h b/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h
> index 4c1af06..d0517d8 100644
> --- a/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h
> +++ b/ports/sysdeps/unix/sysv/linux/aarch64/ldconfig.h
> @@ -19,7 +19,9 @@
> #include <sysdeps/generic/ldconfig.h>
>
> #define SYSDEP_KNOWN_INTERPRETER_NAMES \
> - { "/lib/ld-linux-aarch64.so.1", FLAG_ELF_LIBC6 },
> + { "/lib/ld-linux-aarch64.so.1", FLAG_ELF_LIBC6 }, \
> + { "/lib/ld-linux.so.3", FLAG_ELF_LIBC6 }, \
> + { "/lib/ld-linux-armhf.so.3", FLAG_ELF_LIBC6 },
> #define SYSDEP_KNOWN_LIBRARY_NAMES \
> { "libc.so.6", FLAG_ELF_LIBC6 }, \
> { "libm.so.6", FLAG_ELF_LIBC6 },
OK,
Ill apply this for you shortly.
/Marcus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache
2012-12-03 15:26 [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache Steve McIntyre
2012-12-03 15:28 ` [PATCH] AArch64: Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6 cache Steve McIntyre
@ 2012-12-04 13:02 ` Marcus Shawcroft
2012-12-04 13:13 ` Steve McIntyre
1 sibling, 1 reply; 5+ messages in thread
From: Marcus Shawcroft @ 2012-12-04 13:02 UTC (permalink / raw)
To: Steve McIntyre; +Cc: libc-ports, Carlos O'Donell, Joseph S. Myers
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
On 3 December 2012 15:25, Steve McIntyre <steve.mcintyre@linaro.org> wrote:
> Hey guys,
>
> Splitting up code as requested. Here's patch #1 for AArch64.
>
> =======================================
> Tag ARM and AArch64 binaries in the ldconfig cache
>
> * sysdeps/unix/sysv/linux/aarch64/readelflib.c: New file.
>
> Add the correct tags for ARM and AArch64 libraries in the ldconfig
> cache for AArch64.
Steve, Rather than replicate the code from arm/readelflib.c into
aarch64/readelflib.c I'll apply the attached patch which uses the
include mechanism you originally propsed here:
http://sourceware.org/ml/libc-ports/2012-11/msg00111.html
/Marcus
[-- Attachment #2: aarch64-readelflib.patch --]
[-- Type: application/octet-stream, Size: 1082 bytes --]
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c b/ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c
new file mode 100644
index 0000000..87994a4
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c
@@ -0,0 +1,18 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ 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/>. */
+
+#include "../arm/readelflib.c"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache
2012-12-04 13:02 ` [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache Marcus Shawcroft
@ 2012-12-04 13:13 ` Steve McIntyre
0 siblings, 0 replies; 5+ messages in thread
From: Steve McIntyre @ 2012-12-04 13:13 UTC (permalink / raw)
To: Marcus Shawcroft; +Cc: libc-ports, Carlos O'Donell, Joseph S. Myers
On Tue, Dec 04, 2012 at 01:02:38PM +0000, Marcus Shawcroft wrote:
>On 3 December 2012 15:25, Steve McIntyre <steve.mcintyre@linaro.org> wrote:
>> Hey guys,
>>
>> Splitting up code as requested. Here's patch #1 for AArch64.
>>
>> =======================================
>> Tag ARM and AArch64 binaries in the ldconfig cache
>>
>> * sysdeps/unix/sysv/linux/aarch64/readelflib.c: New file.
>>
>> Add the correct tags for ARM and AArch64 libraries in the ldconfig
>> cache for AArch64.
>
>
>Steve, Rather than replicate the code from arm/readelflib.c into
>aarch64/readelflib.c I'll apply the attached patch which uses the
>include mechanism you originally propsed here:
>
>http://sourceware.org/ml/libc-ports/2012-11/msg00111.html
Lovely, thanks. :-)
Cheers,
--
Steve McIntyre steve.mcintyre@linaro.org
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-12-04 13:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-03 15:26 [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache Steve McIntyre
2012-12-03 15:28 ` [PATCH] AArch64: Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6 cache Steve McIntyre
2012-12-04 12:52 ` Marcus Shawcroft
2012-12-04 13:02 ` [PATCH] AArch64: Tag ARM and AArch64 binaries in the ldconfig cache Marcus Shawcroft
2012-12-04 13:13 ` Steve McIntyre
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).