[PATCH 1/4] Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6

[PATCH 1/4] Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6

[Steve McIntyre]

I'm certain sent this and the subsequent patches out on Friday, but
I've not see them appear in the list archives. Maybe Black Friday
blues on a mailserver somewhere... :-) So, here they are again!

For some reason, we've never had tagging of ARM binaries in the same
way as lots of other architectures. I'm thinking it's time we fixed
that!

========================================================

Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6

	* sysdeps/unix/sysv/linux/arm/ldconfig.h: New file.
	* 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 +++-
 ports/sysdeps/unix/sysv/linux/arm/ldconfig.h     |   25 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 ports/sysdeps/unix/sysv/linux/arm/ldconfig.h

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 },
diff --git a/ports/sysdeps/unix/sysv/linux/arm/ldconfig.h b/ports/sysdeps/unix/sysv/linux/arm/ldconfig.h
new file mode 100644
index 0000000..bb20b79
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/arm/ldconfig.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2001-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 <sysdeps/generic/ldconfig.h>
+
+#define SYSDEP_KNOWN_INTERPRETER_NAMES \
+  { "/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

Re: [PATCH 2/4] Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache

[Steve McIntyre]

Use the new FLAG_AARCH64_LIB64 ldconfig cache tag for AArch64,
similarly to the way tags are handled for other architectures.

========================================================

Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache

      * sysdeps/unix/sysv/linux/aarch64/dl-cache.h: New file.

Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
---
 ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h |   45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h

diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h b/ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h
new file mode 100644
index 0000000..1aa1a84
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h
@@ -0,0 +1,45 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+   Copyright (C) 2003-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 <ldconfig.h>
+
+#define _DL_CACHE_DEFAULT_ID    (FLAG_AARCH64_LIB64 | FLAG_ELF_LIBC6)
+
+#define _dl_cache_check_flags(flags)                    \
+  ((flags) == _DL_CACHE_DEFAULT_ID)
+
+#define add_system_dir(dir) \
+  do								\
+    {								\
+      size_t len = strlen (dir);				\
+      char path[len + 3];					\
+      memcpy (path, dir, len + 1);				\
+      if (len >= 6 && ! memcmp (path + len - 6, "/lib64", 6))	\
+	{							\
+	  len -= 2;						\
+	  path[len] = '\0';					\
+	}							\
+      add_dir (path);						\
+      if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4))	\
+	{							\
+	  memcpy (path + len, "64", 3);				\
+	  add_dir (path);					\
+	}							\
+    } while (0)
+
+#include_next <dl-cache.h>
-- 
1.7.10.4

Cheers,
-- 
Steve McIntyre                                steve.mcintyre@linaro.org
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs

[PATCH 3/4] Tag ARM and AArch64 binaries in the ldconfig cache

[Steve McIntyre]

Again, similarly to other architectures - detect AArch64 and ARM
(soft-float and hard-float) binaries in ldconfig and tag them
appropriately. On ARM, use the new ELF flags from binutils to classify
binaries if those flags are set.

========================================================
Tag ARM and AArch64 binaries in the ldconfig cache

	* sysdeps/unix/sysv/linux/arm/readelflib.c: New file.
	* sysdeps/unix/sysv/linux/aarch64/readelflib.c: Ditto.

Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
---
 ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c |    1 +
 ports/sysdeps/unix/sysv/linux/arm/readelflib.c     |   73 ++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c
 create mode 100644 ports/sysdeps/unix/sysv/linux/arm/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..df1a822
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/readelflib.c
@@ -0,0 +1 @@
+#include "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

Re: [PATCH 1/4] Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6

[Joseph S. Myers]

On Mon, 26 Nov 2012, Steve McIntyre wrote:

> Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6
> 
> 	* sysdeps/unix/sysv/linux/arm/ldconfig.h: New file.
> 	* sysdeps/unix/sysv/linux/aarch64/ldconfig.h: Add entries
> 	for /lib/ld-linux.so.3 and /lib/ld-linux-armhf.so.3.

ARM and AArch64 are separate architectures, with separate maintainers and 
separate ChangeLog.<arch> files.  Please send patches for each in separate 
messages with their own subjects and rationale.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH 2/4] Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache

[Carlos O'Donell]

On Mon, Nov 26, 2012 at 10:04 AM, Steve McIntyre
<steve.mcintyre@linaro.org> wrote:
> Use the new FLAG_AARCH64_LIB64 ldconfig cache tag for AArch64,
> similarly to the way tags are handled for other architectures.
>
> ========================================================
>
> Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache
>
>       * sysdeps/unix/sysv/linux/aarch64/dl-cache.h: New file.
>
> Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>

Reviewed-by: Carlos O'Donell  <carlos@systemhalted.org>

This looks good to me.

Markus, as the AArch64 maintainer, should have the final word and check it in.

Feel free to include my Reviewed-by: in the git commit logs to track reviews.

Cheers,
Carlos.r

Re: [PATCH 2/4] Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache

[Marcus Shawcroft]

On 28 November 2012 20:58, Carlos O'Donell <carlos@systemhalted.org> wrote:
> On Mon, Nov 26, 2012 at 10:04 AM, Steve McIntyre
> <steve.mcintyre@linaro.org> wrote:
>> Use the new FLAG_AARCH64_LIB64 ldconfig cache tag for AArch64,
>> similarly to the way tags are handled for other architectures.
>>
>> ========================================================
>>
>> Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache
>>
>>       * sysdeps/unix/sysv/linux/aarch64/dl-cache.h: New file.
>>
>> Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
>
> Reviewed-by: Carlos O'Donell  <carlos@systemhalted.org>
>
> This looks good to me.
>
> Markus, as the AArch64 maintainer, should have the final word and check it in.
>
> Feel free to include my Reviewed-by: in the git commit logs to track reviews.
>
> Cheers,
> Carlos.r

Committed.
Thanks
/Marcus

Re: [PATCH 2/4] Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache

[Steve McIntyre]

On 28 November 2012 20:58, Carlos O'Donell <carlos@systemhalted.org> wrote:
>On Mon, Nov 26, 2012 at 03:04:34PM +0000, Steve McIntyre wrote:
>>Use the new FLAG_AARCH64_LIB64 ldconfig cache tag for AArch64,
>>similarly to the way tags are handled for other architectures.
>>
>>========================================================
>>
>>Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache
>>
>>      * sysdeps/unix/sysv/linux/aarch64/dl-cache.h: New file.
>>
>>Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
>
> Reviewed-by: Carlos O'Donell  <carlos@systemhalted.org>
>
> This looks good to me.
>
> Markus, as the AArch64 maintainer, should have the final word and
> check it in.
>
> Feel free to include my Reviewed-by: in the git commit logs to track
> reviews.

Hmmm, problem: this adds checking for the new FLAG_AARCH64_LIB64 at
runtime in ld.so, but nobody has (yet!) committed the code that will
add that flag from ldconfig (in patch #3 in my set). That's partly my
fault for not stating a direct dependency, I guess, but we'll need to
fix that ASAP. Would you prefer to revert *this* patch or take that
one too?

Related to Joseph's comment about #1 in the set (tagging binaries
based on interpreter names): splitting up ARM and AArch64 patches. I
can easily split #1 that way if preferred, but to my mind it makes no
sense to split #3 as it's a lump of common code that will run on both
ARM and AArch64. What do people think about that, please?

Cheers,
-- 
Steve McIntyre                                steve.mcintyre@linaro.org
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs

Re: [PATCH 2/4] Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache

[Carlos O'Donell]

On Fri, Nov 30, 2012 at 10:01 AM, Steve McIntyre
<steve.mcintyre@linaro.org> wrote:
> On 28 November 2012 20:58, Carlos O'Donell <carlos@systemhalted.org> wrote:
>>On Mon, Nov 26, 2012 at 03:04:34PM +0000, Steve McIntyre wrote:
>>>Use the new FLAG_AARCH64_LIB64 ldconfig cache tag for AArch64,
>>>similarly to the way tags are handled for other architectures.
>>>
>>>========================================================
>>>
>>>Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache
>>>
>>>      * sysdeps/unix/sysv/linux/aarch64/dl-cache.h: New file.
>>>
>>>Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
>>
>> Reviewed-by: Carlos O'Donell  <carlos@systemhalted.org>
>>
>> This looks good to me.
>>
>> Markus, as the AArch64 maintainer, should have the final word and
>> check it in.
>>
>> Feel free to include my Reviewed-by: in the git commit logs to track
>> reviews.
>
> Hmmm, problem: this adds checking for the new FLAG_AARCH64_LIB64 at
> runtime in ld.so, but nobody has (yet!) committed the code that will
> add that flag from ldconfig (in patch #3 in my set). That's partly my
> fault for not stating a direct dependency, I guess, but we'll need to
> fix that ASAP. Would you prefer to revert *this* patch or take that
> one too?

Thanks, I hadn't noticed the dependency.

Please work on getting this fixed ASAP.

We want AArch64 into 2.17.

> Related to Joseph's comment about #1 in the set (tagging binaries
> based on interpreter names): splitting up ARM and AArch64 patches. I
> can easily split #1 that way if preferred, but to my mind it makes no
> sense to split #3 as it's a lump of common code that will run on both
> ARM and AArch64. What do people think about that, please?

Split them up please.

Push them out again for review, and CC me and Joseph.

Cheers,
Carlos.

Re: [PATCH 2/4] Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache

[Steve McIntyre]

On Fri, Nov 30, 2012 at 11:37:48AM -0500, Carlos O'Donell wrote:
>On Fri, Nov 30, 2012 at 10:01 AM, Steve McIntyre
><steve.mcintyre@linaro.org> wrote:
>> On 28 November 2012 20:58, Carlos O'Donell <carlos@systemhalted.org> wrote:
>>>On Mon, Nov 26, 2012 at 03:04:34PM +0000, Steve McIntyre wrote:
>>>>Use the new FLAG_AARCH64_LIB64 ldconfig cache tag for AArch64,
>>>>similarly to the way tags are handled for other architectures.
>>>>
>>>>========================================================
>>>>
>>>>Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache
>>>>
>>>>      * sysdeps/unix/sysv/linux/aarch64/dl-cache.h: New file.
>>>>
>>>>Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
>>>
>>> Reviewed-by: Carlos O'Donell  <carlos@systemhalted.org>
>>>
>>> This looks good to me.
>>>
>>> Markus, as the AArch64 maintainer, should have the final word and
>>> check it in.
>>>
>>> Feel free to include my Reviewed-by: in the git commit logs to track
>>> reviews.
>>
>> Hmmm, problem: this adds checking for the new FLAG_AARCH64_LIB64 at
>> runtime in ld.so, but nobody has (yet!) committed the code that will
>> add that flag from ldconfig (in patch #3 in my set). That's partly my
>> fault for not stating a direct dependency, I guess, but we'll need to
>> fix that ASAP. Would you prefer to revert *this* patch or take that
>> one too?
>
>Thanks, I hadn't noticed the dependency.
>
>Please work on getting this fixed ASAP.
>
>We want AArch64 into 2.17.
>
>> Related to Joseph's comment about #1 in the set (tagging binaries
>> based on interpreter names): splitting up ARM and AArch64 patches. I
>> can easily split #1 that way if preferred, but to my mind it makes no
>> sense to split #3 as it's a lump of common code that will run on both
>> ARM and AArch64. What do people think about that, please?
>
>Split them up please.
>
>Push them out again for review, and CC me and Joseph.

OK. Coming in a mo, in two separate threads. I'll CC you both on both
threads too.

Cheers,
-- 
Steve McIntyre                                steve.mcintyre@linaro.org
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs

Re: [PATCH 2/4] Check for the FLAG_AARCH64_LIB64 flag in the ldconfig cache

[Andreas Schwab]

Steve McIntyre <steve.mcintyre@linaro.org> writes:

> +#define add_system_dir(dir) \
> +  do								\
> +    {								\
> +      size_t len = strlen (dir);				\
> +      char path[len + 3];					\
> +      memcpy (path, dir, len + 1);				\
> +      if (len >= 6 && ! memcmp (path + len - 6, "/lib64", 6))	\

Is aarch64 supposed to be using lib64?  If yes there should be a sysdeps
configure script that sets libc_cv_slibdir and libdir similar to
sysdeps/gnu/configure.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."