From owner-svn-src-head@freebsd.org Fri Feb 2 04:09:57 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 7A918EE2934 for ; Fri, 2 Feb 2018 04:09:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EE664786C0 for ; Fri, 2 Feb 2018 04:09:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-wm0-x22f.google.com with SMTP id f3so9698181wmc.1 for ; Thu, 01 Feb 2018 20:09:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=kXicLRub7dTi3DRHnRm4AVjZmiX/lJFVz4PT2N7jyV4=; b=nQGLjOTZD8eiVnwovEhcJ2Nlf2zltlaoHknEAa3pYg/flkMZLdwjE7lbtp0i97yf3b xKUQdiANOpM3s44uHJ29bkE/Qa54vI07q43W1r7em9OStzKZfjIr0gjLw+adSpCTPoWr J5nHqqwe2aZH1ji7Kq+kt5JaFMykiB6Uer7KNhHShQ1m47GeR2LmIFKqQfox346n2sEg 11RHyy0UngPdPtYUbsrPgtG+kd4ZXpfLMqgeUKm5zHk6QWWL7ERb7xzpjw8t20FZFJs5 6vxxQa+LZlHCEZa0em+v9N/fsl21MXvxeBL6QGPo0LZeiWTk/fvHA+UWouBa9Wb2q5er mYgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=kXicLRub7dTi3DRHnRm4AVjZmiX/lJFVz4PT2N7jyV4=; b=IyYksgld2dUo25yfhu2/WMbV+063WyHcURa/IObQKnefGg745Y/YuJN9JS2uFUyhAw 7IalCmtlppsU1N6cbyKQRfYVcE3+1VqB/mLRH/55FWM8lr628DlKOwDd0r5AwRzVH2h4 N5MMnlh31rAowJW2/WkQJjNudysMQvL+gxAE13Cz9J1wqgOpVpubPGanOMS5OCZ8WR9d sYiToDe8sh46V/9vgO99nmX0dOLkfki5sBTpbyhRse0g2qJz+/5zFJs4z54tmQrodaAl vyDyMjIxkB7N7eBiffNqW1PGybgGtjnrAj6bTW+1maiPloMz4m1CbIz9G18FO25dU6Co nH0Q== X-Gm-Message-State: AKwxytdBpXl/W1IQ1vzQVs5Zbp2ogwwZXTLUXTiFoSgfSKBkUpxs5g2X 6Kswwh+SQEUAGKhFPzkVtP4Z7eIBpYvbiLWpJSTvSQ== X-Google-Smtp-Source: AH8x225d656R/MXXgZFFdSHaZkZO5vbFoq0+KcFEzxU3ebSqXJOwGcWt4YNll5LQZg/ctMjqcDJ6ZMbN9rG4NkND9h8= X-Received: by 10.80.244.226 with SMTP id v31mr65117593edm.221.1517544595324; Thu, 01 Feb 2018 20:09:55 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.80.133.195 with HTTP; Thu, 1 Feb 2018 20:09:54 -0800 (PST) X-Originating-IP: [2603:300b:6:5100:18a2:a4f7:170:8dd9] In-Reply-To: References: <201801310305.w0V35EU4090569@repo.freebsd.org> From: Warner Losh Date: Thu, 1 Feb 2018 21:09:54 -0700 X-Google-Sender-Auth: 9dW1JnghCIBf6PiT1E7DeOsFGxo Message-ID: Subject: Re: svn commit: r328612 - head/lib/libc/stdlib To: Steve Wills Cc: Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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 04:09:57 -0000 On Thu, Feb 1, 2018 at 8:34 PM, Steve Wills wrote: > This, somehow, seems to have broken the mips64 build: > > https://ci.freebsd.org/job/FreeBSD-head-mips64-build/216/consoleFull > > The previous rev works. > This breaks devd, of all things, with /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libgcc.a(comparedf2.o): In function `__gedf2': /usr/src/contrib/compiler-rt/lib/builtins/comparedf2.c:96: multiple definition of `__gedf2' /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libc.a(gedf2.o):/usr/src/lib/libc/softfloat/gedf2.c:18: first defined here /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libgcc.a(comparedf2.o): In function `__eqdf2': /usr/src/contrib/compiler-rt/lib/builtins/comparedf2.c:126: multiple definition of `__eqdf2' /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libc.a(eqdf2.o):/usr/src/lib/libc/softfloat/eqdf2.c:18: first defined here /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libgcc.a(comparedf2.o): In function `__ltdf2': /usr/src/contrib/compiler-rt/lib/builtins/comparedf2.c:131: multiple definition of `__ltdf2' /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libc.a(ltdf2.o):/usr/src/lib/libc/softfloat/ltdf2.c:18: first defined here /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libgcc.a(comparedf2.o): In function `__nedf2': /usr/src/contrib/compiler-rt/lib/builtins/comparedf2.c:136: multiple definition of `__nedf2' /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libc.a(nedf2.o):/usr/src/lib/libc/softfloat/nedf2.c:18: first defined here /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libgcc.a(comparedf2.o): In function `__gtdf2': /usr/src/contrib/compiler-rt/lib/builtins/comparedf2.c:141: multiple definition of `__gtdf2' /usr/obj/usr/src/mips.mips64/tmp/usr/lib/libc.a(gtdf2.o):/usr/src/lib/libc/softfloat/gtdf2.c:18: first defined here undefined.... devd doesn't even use strtodl. (looks like the code to associate make output with the right commands is broken, since I had to dig for it. Warner > 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" >> >>