From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27298 invoked by alias); 3 Dec 2012 16:32:18 -0000 Received: (qmail 27281 invoked by uid 22791); 3 Dec 2012 16:32:14 -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, 03 Dec 2012 16:32:07 +0000 Received: from bsmtp by cheddar.halon.org.uk with local-bsmtp (Exim 4.72) (envelope-from ) id 1TfYwA-0005cz-E0; Mon, 03 Dec 2012 16:32:06 +0000 Received: from steve by tack.local with local (Exim 4.80) (envelope-from ) id 1TfYvo-0007NM-17; Mon, 03 Dec 2012 16:31:44 +0000 Date: Mon, 03 Dec 2012 16:32:00 -0000 From: Steve McIntyre To: "Joseph S. Myers" Cc: libc-ports@sourceware.org, Carlos O'Donell , Marcus Shawcroft Subject: Re: [PATCH] ARM: Check for the FLAG_ARM_LIBHF flag in the ldconfig cache Message-ID: <20121203163143.GI22509@einval.com> References: <20121203153446.GD22509@einval.com> <20121203153747.GE22509@einval.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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-12/txt/msg00012.txt.bz2 On Mon, Dec 03, 2012 at 03:58:52PM +0000, Joseph S. Myers wrote: >On Mon, 3 Dec 2012, Steve McIntyre wrote: > >> +#ifdef __ARM_PCS_VFP >> +#define _dl_cache_check_flags(flags) \ >> + ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6)) >> +#else >> +#define _dl_cache_check_flags(flags) \ >> + ((flags) == FLAG_ELF_LIBC6) >> +#endif > >Missing indentation, "# define", inside #if. OK with that fixed. OK, updated: ================================================= Check for the FLAG_ARM_LIBHF flag in the ldconfig cache * sysdeps/unix/sysv/linux/arm/dl-cache.h: New file. Signed-off-by: Steve McIntyre --- ports/sysdeps/unix/sysv/linux/arm/dl-cache.h | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 ports/sysdeps/unix/sysv/linux/arm/dl-cache.h diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h b/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h new file mode 100644 index 0000000..0be68be --- /dev/null +++ b/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h @@ -0,0 +1,29 @@ +/* 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 + . */ + +#include + +#ifdef __ARM_PCS_VFP +# define _dl_cache_check_flags(flags) \ + ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6)) +#else +# define _dl_cache_check_flags(flags) \ + ((flags) == FLAG_ELF_LIBC6) +#endif + +#include_next -- 1.7.10.4 Cheers, -- Steve McIntyre steve.mcintyre@linaro.org Linaro.org | Open source software for ARM SoCs