From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18243 invoked by alias); 26 Nov 2012 15:02:18 -0000 Received: (qmail 18232 invoked by uid 22791); 26 Nov 2012 15:02:17 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from cheddar.halon.org.uk (HELO cheddar.halon.org.uk) (217.10.144.130) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 26 Nov 2012 15:02:08 +0000 Received: from bsmtp by cheddar.halon.org.uk with local-bsmtp (Exim 4.72) (envelope-from ) id 1Td0CE-0006sq-SU for libc-ports@sourceware.org; Mon, 26 Nov 2012 15:02:06 +0000 Received: from steve by tack.local with local (Exim 4.80) (envelope-from ) id 1Td0Bs-0007tW-KB for libc-ports@sourceware.org; Mon, 26 Nov 2012 15:01:44 +0000 Date: Mon, 26 Nov 2012 15:02:00 -0000 From: Steve McIntyre To: libc-ports@sourceware.org Subject: [PATCH 1/4] Tag ARM libc6-dependent libraries with FLAG_ELF_LIBC6 Message-ID: <20121126150131.GA28791@einval.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-attached: none User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-11/txt/msg00109.txt.bz2 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 --- 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 #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 + . */ + +#include + +#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 Linaro.org | Open source software for ARM SoCs