From patchwork Mon Dec 3 18:17:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve McIntyre X-Patchwork-Id: 13343 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 387A023E1A for ; Mon, 3 Dec 2012 18:18:06 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id C4DFEA19547 for ; Mon, 3 Dec 2012 18:18:05 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so4459668ieb.11 for ; Mon, 03 Dec 2012 10:18:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:date:from :to:subject:message-id:mime-version:content-type:content-disposition :x-attached:user-agent:x-gm-message-state; bh=MdvwFimhiH3qZq7bhfBWnbU2ShNmZ0jHTXKU0WQ/CvM=; b=ho5oJyuvSPaXBDBmNyrKlZVMT0/Vm9Shov/Z0+QYJVA+GtVKBrohGoZyptS5jBLjrE A129sD4hLcnB1PVGNDaMRoJBfcWXcHnBYchOSlvQ09/GEymsQj7Pvi/FdfnSeFq+01Zh 8XFijQaEOQrxxzinJyO98eusdDUPv64FOegrqkH1hHrCKuJtzFGfkgXlQPoiux6TdFgS 9P2aVgtetHmqZFaKpOlkWvN6gyMzxxBJJYsrCvyLqLKoys7tzkLLBoygNtAXwiyacDgl mqGTHxebH7OuWXCeAOYajUWGS4fKXw1y3f6phrRnrmaXhPDveJOCW8AQbi9l3FXiPDk9 RE/w== Received: by 10.50.152.137 with SMTP id uy9mr7145010igb.62.1354558685214; Mon, 03 Dec 2012 10:18:05 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp195141igt; Mon, 3 Dec 2012 10:18:04 -0800 (PST) Received: by 10.180.92.71 with SMTP id ck7mr11109806wib.20.1354558683935; Mon, 03 Dec 2012 10:18:03 -0800 (PST) Received: from cheddar.halon.org.uk (cheddar.halon.org.uk. [217.10.144.130]) by mx.google.com with ESMTPS id p6si9262651wiy.31.2012.12.03.10.18.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 10:18:03 -0800 (PST) Received-SPF: neutral (google.com: 217.10.144.130 is neither permitted nor denied by best guess record for domain of steve.mcintyre@linaro.org) client-ip=217.10.144.130; Authentication-Results: mx.google.com; spf=neutral (google.com: 217.10.144.130 is neither permitted nor denied by best guess record for domain of steve.mcintyre@linaro.org) smtp.mail=steve.mcintyre@linaro.org Received: from bsmtp by cheddar.halon.org.uk with local-bsmtp (Exim 4.72) (envelope-from ) id 1Tfaah-0001Q9-9y for patches@linaro.org; Mon, 03 Dec 2012 18:18:03 +0000 Received: from stemci01 by e102122-lin with local (Exim 4.76) (envelope-from ) id 1TfaaT-0008Nc-D0 for patches@linaro.org; Mon, 03 Dec 2012 18:17:49 +0000 Date: Mon, 3 Dec 2012 18:17:49 +0000 From: Steve McIntyre To: patches@linaro.org Subject: [steve.mcintyre@linaro.org: Re: [PATCH] ARM: Check for the FLAG_ARM_LIBHF flag in the ldconfig cache] Message-ID: <20121203181749.GL12778@linaro.org> MIME-Version: 1.0 Content-Disposition: inline X-attached: none User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQngzGh9qfvarLfVqoDZSZxDYw0DhhuwsHsD6X9DSk9LrgU9M8ZjPBq/mdAwQPkQwPPl0gv3 ----- Forwarded message from Steve McIntyre ----- Date: Mon, 3 Dec 2012 16:31:43 +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 User-Agent: Mutt/1.5.21 (2010-09-15) 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