From patchwork Mon Nov 9 19:41:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 9621 Received: (qmail 119874 invoked by alias); 9 Nov 2015 19:41:41 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 119865 invoked by uid 89); 9 Nov 2015 19:41:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Subject: [PATCH] Work around conflicting declarations of math functions To: Joseph Myers References: <5640BD9A.3090000@redhat.com> Cc: libc-alpha@sourceware.org From: Florian Weimer X-Enigmail-Draft-Status: N1110 Message-ID: <5640F6EF.2060202@redhat.com> Date: Mon, 9 Nov 2015 20:41:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: On 11/09/2015 05:24 PM, Joseph Myers wrote: > On Mon, 9 Nov 2015, Florian Weimer wrote: > >> On 11/05/2015 01:49 AM, Joseph Myers wrote: >>> bits/math-finite.h declares -ffinite-math-only variants of various >>> functions under conditions not matching those under which the normal >>> versions are declared. >> >> Joseph, >> >> I may be seeing build failures related to this change, on armhfp (which >> is, I think, ARMv7 with hardware floating point). Specifically, this: > > I think this comes from -D_Mlong_double_=double in math-CPPFLAGS, in which > case undefining _Mlong_double_ in test-signgam-finite-c99.c ought to allow > the test to build OK I can confirm that the attached patch fixes the build issue on armhfp I was seeing. Thanks! I need some help with the commit message, though. Florian Work around conflicting declarations of math functions This restores compilation on architectures such as armhfp which alias acos and acosl because double and long double are the same. 2015-11-09 Florian Weimer * math/test-signgam-finite-c99.c (_Mlong_double_): Undefine. diff --git a/math/test-signgam-finite-c99.c b/math/test-signgam-finite-c99.c index fd9cdd3..bd3bdca 100644 --- a/math/test-signgam-finite-c99.c +++ b/math/test-signgam-finite-c99.c @@ -18,6 +18,7 @@ #undef _LIBC #undef _GNU_SOURCE +#undef _Mlong_double_ #define _ISOMAC #include