{"id":808302,"url":"http://patchwork.ozlabs.org/api/patches/808302/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/patch/alpine.DEB.2.20.1708311613100.24662@digraph.polyomino.org.uk/","project":{"id":41,"url":"http://patchwork.ozlabs.org/api/projects/41/?format=json","name":"GNU C Library","link_name":"glibc","list_id":"libc-alpha.sourceware.org","list_email":"libc-alpha@sourceware.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"","list_archive_url":null,"date":"2017-08-31T16:13:28","name":"Simplify INFINITY definitions [committed]","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"40868d72e24dc6f94539452c0f23aa1bcc4ea660","submitter":{"id":4349,"url":"http://patchwork.ozlabs.org/api/people/4349/?format=json","name":"Joseph Myers","email":"joseph@codesourcery.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/glibc/patch/alpine.DEB.2.20.1708311613100.24662@digraph.polyomino.org.uk/mbox/","series":[{"id":867,"url":"http://patchwork.ozlabs.org/api/series/867/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/list/?series=867","date":"2017-08-31T16:13:28","name":"Simplify INFINITY definitions [committed]","version":1,"mbox":"http://patchwork.ozlabs.org/series/867/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808302/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808302/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list libc-alpha@sourceware.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-83945-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"ELyJbGHZ\"; dkim-atps=neutral","sourceware.org; auth=none"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjnVp0Y8Xz9sNr\n\tfor ;\n\tFri, 1 Sep 2017 02:13:53 +1000 (AEST)","(qmail 93831 invoked by alias); 31 Aug 2017 16:13:47 -0000","(qmail 93811 invoked by uid 89); 31 Aug 2017 16:13:47 -0000"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:date:from:to:subject:message-id:mime-version\n\t:content-type; q=dns; s=default; b=YRK3h+z8u8DMp+DOJYU3VcA01YIRJ\n\tjFKy+JoshVXihpLs1Ik7Db5C261dnbv1wUfofbDo+0GZsVReGzPpHXgiFxu32paW\n\tWnbksCfMaHHriIajr/NQNHD4izJ5vchQppWIZBNm9i2grj4gEBrGJVsZekrgYRAQ\n\tl87eeiw7IhxOMg=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:date:from:to:subject:message-id:mime-version\n\t:content-type; s=default; bh=7pGrNt4ovdwRlmB/zedczRY0Pr4=; b=ELy\n\tJbGHZcZovwUJgMSMg1wP4X+Ds8LwswZxb1hxUnAqcWeTJIxBJ6awT/eKo3UfjhZO\n\tD7EYA1FmOmLuv33prwjKr6UyPDCa5JIuVknX1aderfBsErtd1sHgmG+iipj9M0S0\n\ta8nrOloSTpfNwwhYfrym3ZFUbLP+vFl2iSN2WBQQ=","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":",\n\t","Sender":"libc-alpha-owner@sourceware.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-24.5 required=5.0 tests=AWL, BAYES_00,\n\tGIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,\n\tRCVD_IN_DNSWL_NONE, SPF_PASS,\n\tURIBL_RED autolearn=ham version=3.3.2 spammy=","X-HELO":"relay1.mentorg.com","Date":"Thu, 31 Aug 2017 16:13:28 +0000","From":"Joseph Myers ","To":"","Subject":"Simplify INFINITY definitions [committed]","Message-ID":"","User-Agent":"Alpine 2.20 (DEB 67 2015-01-07)","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"US-ASCII\"","X-ClientProxiedBy":"svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To\n\tsvr-ies-mbx-01.mgc.mentorg.com (139.181.222.1)"},"content":"Similar to my patch for HUGE_VAL, this patch eliminates the bits/inf.h\nheaders and just unconditionally uses the same definitions as the\nsysdeps/ieee754 version did (__builtin_inff () for GCC >= 3.3,\notherwise HUGE_VALF), directly in math.h, so removing an unnecessary\nlevel of indirection.\n\nTested for x86_64. Committed.\n\n2017-08-31 Joseph Myers \n\n\t* math/math.h [__USE_ISOC99] (INFINITY): Define directly here. Do\n\tnot include .\n\t* math/Makefile (headers): Remove bits/inf.h.\n\t* bits/inf.h: Remove.\n\t* sysdeps/ieee754/bits/inf.h: Likewise.","diff":"diff --git a/bits/inf.h b/bits/inf.h\ndeleted file mode 100644\nindex 5c66ca3..0000000\n--- a/bits/inf.h\n+++ /dev/null\n@@ -1,32 +0,0 @@\n-/* Default `INFINITY' constant.\n- Copyright (C) 2004-2017 Free Software Foundation, Inc.\n- This file is part of the GNU C Library.\n-\n- The GNU C Library is free software; you can redistribute it and/or\n- modify it under the terms of the GNU Lesser General Public\n- License as published by the Free Software Foundation; either\n- version 2.1 of the License, or (at your option) any later version.\n-\n- The GNU C Library is distributed in the hope that it will be useful,\n- but WITHOUT ANY WARRANTY; without even the implied warranty of\n- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n- Lesser General Public License for more details.\n-\n- You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, see\n- . */\n-\n-#ifndef _MATH_H\n-# error \"Never use directly; include instead.\"\n-#endif\n-\n-/* If we don't have real infinity, then we're supposed to produce a float\n- value that overflows at translation time, which is required to produce\n- a diagnostic. GCC's __builtin_inff produces a quite nice diagnostic\n- that tells the user that the target doesn't support infinities. */\n-\n-#if __GNUC_PREREQ(3,3)\n-# define INFINITY\t(__builtin_inff())\n-#else\n-# define INFINITY\t(1e9999f)\n-#endif\ndiff --git a/math/Makefile b/math/Makefile\nindex 01345fb..b9a06f0 100644\n--- a/math/Makefile\n+++ b/math/Makefile\n@@ -23,7 +23,7 @@ include ../Makeconfig\n \n # Installed header files.\n headers\t\t:= math.h bits/mathcalls.h bits/mathinline.h \\\n-\t\t bits/inf.h bits/nan.h \\\n+\t\t bits/nan.h \\\n \t\t fpu_control.h complex.h bits/cmathcalls.h fenv.h \\\n \t\t bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \\\n \t\t bits/math-finite.h bits/math-vector.h \\\ndiff --git a/math/math.h b/math/math.h\nindex dcccf8e..5f5a498 100644\n--- a/math/math.h\n+++ b/math/math.h\n@@ -58,8 +58,12 @@ __BEGIN_DECLS\n #endif\n \n #ifdef __USE_ISOC99\n-/* Get machine-dependent INFINITY value. */\n-# include \n+/* IEEE positive infinity. */\n+# if __GNUC_PREREQ (3, 3)\n+# define INFINITY (__builtin_inff ())\n+# else\n+# define INFINITY HUGE_VALF\n+# endif\n \n /* Get machine-dependent NAN value (returned for some domain errors). */\n # include \ndiff --git a/sysdeps/ieee754/bits/inf.h b/sysdeps/ieee754/bits/inf.h\ndeleted file mode 100644\nindex eee0f2e..0000000\n--- a/sysdeps/ieee754/bits/inf.h\n+++ /dev/null\n@@ -1,29 +0,0 @@\n-/* `INFINITY' constant for IEEE 754 machines.\n- Copyright (C) 2004-2017 Free Software Foundation, Inc.\n- This file is part of the GNU C Library.\n-\n- The GNU C Library is free software; you can redistribute it and/or\n- modify it under the terms of the GNU Lesser General Public\n- License as published by the Free Software Foundation; either\n- version 2.1 of the License, or (at your option) any later version.\n-\n- The GNU C Library is distributed in the hope that it will be useful,\n- but WITHOUT ANY WARRANTY; without even the implied warranty of\n- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n- Lesser General Public License for more details.\n-\n- You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, see\n- . */\n-\n-#ifndef _MATH_H\n-# error \"Never use directly; include instead.\"\n-#endif\n-\n-/* IEEE positive infinity. */\n-\n-#if __GNUC_PREREQ(3,3)\n-# define INFINITY\t(__builtin_inff())\n-#else\n-# define INFINITY\tHUGE_VALF\n-#endif\n","prefixes":[]}