From owner-svn-src-head@freebsd.org Fri Feb 2 03:35:02 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B78D5EE0DAD; Fri, 2 Feb 2018 03:35:02 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F5E67715E; Fri, 2 Feb 2018 03:35:02 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from lrrr.mouf.net (cpe-24-163-43-246.nc.res.rr.com [24.163.43.246]) (authenticated bits=0) by mouf.net (8.14.9/8.14.9) with ESMTP id w123YrPY074551 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Fri, 2 Feb 2018 03:34:59 GMT (envelope-from swills@FreeBSD.org) Subject: Re: svn commit: r328612 - head/lib/libc/stdlib To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201801310305.w0V35EU4090569@repo.freebsd.org> From: Steve Wills Message-ID: Date: Thu, 1 Feb 2018 22:34:48 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201801310305.w0V35EU4090569@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Fri, 02 Feb 2018 03:35:00 +0000 (UTC) X-Spam-Status: No, score=1.3 required=4.5 tests=RCVD_IN_RP_RNBL autolearn=no autolearn_force=no version=3.4.1 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mouf.net X-Virus-Scanned: clamav-milter 0.99.2 at mouf.net X-Virus-Status: Clean X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Feb 2018 03:35:03 -0000 This, somehow, seems to have broken the mips64 build: https://ci.freebsd.org/job/FreeBSD-head-mips64-build/216/consoleFull The previous rev works. Steve On 01/30/2018 22:05, Warner Losh wrote: > Author: imp > Date: Wed Jan 31 03:05:14 2018 > New Revision: 328612 > URL: https://svnweb.freebsd.org/changeset/base/328612 > > Log: > Move strtold wrapper from strtol.c to its own strtold.c. This code > was written by theraven@ (David Chisnall) entirely, there's no > original Berkeley code left here so just copy his copyright over. > > Added: > head/lib/libc/stdlib/strtold.c (contents, props changed) > Modified: > head/lib/libc/stdlib/Makefile.inc > head/lib/libc/stdlib/strtol.c > > Modified: head/lib/libc/stdlib/Makefile.inc > ============================================================================== > --- head/lib/libc/stdlib/Makefile.inc Wed Jan 31 01:04:36 2018 (r328611) > +++ head/lib/libc/stdlib/Makefile.inc Wed Jan 31 03:05:14 2018 (r328612) > @@ -15,7 +15,7 @@ MISRCS+=C99_Exit.c a64l.c abort.c abs.c atexit.c atof. > radixsort.c rand.c \ > random.c reallocarray.c reallocf.c realpath.c remque.c \ > set_constraint_handler_s.c strfmon.c strtoimax.c \ > - strtol.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \ > + strtol.c strtold.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \ > strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c > > # Work around an issue on case-insensitive file systems. > > Modified: head/lib/libc/stdlib/strtol.c > ============================================================================== > --- head/lib/libc/stdlib/strtol.c Wed Jan 31 01:04:36 2018 (r328611) > +++ head/lib/libc/stdlib/strtol.c Wed Jan 31 03:05:14 2018 (r328612) > @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); > #include > #include "xlocale_private.h" > > - > /* > * Convert a string to a long integer. > * > @@ -152,9 +151,4 @@ long > strtol(const char * __restrict nptr, char ** __restrict endptr, int base) > { > return strtol_l(nptr, endptr, base, __get_locale()); > -} > -long double > -strtold(const char * __restrict nptr, char ** __restrict endptr) > -{ > - return strtold_l(nptr, endptr, __get_locale()); > } > > Added: head/lib/libc/stdlib/strtold.c > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/lib/libc/stdlib/strtold.c Wed Jan 31 03:05:14 2018 (r328612) > @@ -0,0 +1,45 @@ > +/*- > + * SPDX-License-Identifier: BSD-3-Clause > + * > + * Copyright (c) 2011 The FreeBSD Foundation > + * All rights reserved. > + * Portions of this software were developed by David Chisnall > + * under sponsorship from the FreeBSD Foundation. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. Neither the name of the University nor the names of its contributors > + * may be used to endorse or promote products derived from this software > + * without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#include > +__FBSDID("$FreeBSD$"); > + > +#include > +#include "xlocale_private.h" > + > +long double > +strtold(const char * __restrict nptr, char ** __restrict endptr) > +{ > + > + return strtold_l(nptr, endptr, __get_locale()); > +} > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >