From owner-svn-src-all@freebsd.org Wed Sep 13 10:56:20 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6A9AE1A358; Wed, 13 Sep 2017 10:56:20 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3E33829EC; Wed, 13 Sep 2017 10:56:20 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8DAuJdK068136; Wed, 13 Sep 2017 10:56:19 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8DAuJKs068135; Wed, 13 Sep 2017 10:56:19 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201709131056.v8DAuJKs068135@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 13 Sep 2017 10:56:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r323533 - vendor-sys/illumos/dist/uts/common/fs/zfs/lua X-SVN-Group: vendor-sys X-SVN-Commit-Author: avg X-SVN-Commit-Paths: vendor-sys/illumos/dist/uts/common/fs/zfs/lua X-SVN-Commit-Revision: 323533 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Sep 2017 10:56:21 -0000 Author: avg Date: Wed Sep 13 10:56:19 2017 New Revision: 323533 URL: https://svnweb.freebsd.org/changeset/base/323533 Log: 8552 ZFS LUA code uses floating point math illumos/illumos-gate@916c8d881190bd2c3ca20d9fca919aecff504435 https://github.com/illumos/illumos-gate/commit/916c8d881190bd2c3ca20d9fca919aecff504435 https://www.illumos.org/issues/8552 In the LUA interpreter used by "zfs program", the lua format() function accidentally includes support for '%f' and friends, which can cause compilation problems when building on platforms that don't support floating-point math in the kernel (e.g. sparc). Support for '%f' friends (%f %e %E %g %G) should be removed, since there's no way to supply a floating-point value anyway (all numbers in ZFS LUA are int64_t's). Reviewed by: Yuri Pankov Reviewed by: Igor Kozhukhov Approved by: Dan McDonald Author: Matthew Ahrens Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/lua/lstrlib.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/lua/lstrlib.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/lua/lstrlib.c Wed Sep 13 10:56:02 2017 (r323532) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/lua/lstrlib.c Wed Sep 13 10:56:19 2017 (r323533) @@ -958,6 +958,7 @@ static int str_format (lua_State *L) { nb = str_sprintf(buff, form, ni); break; } +#if defined(LUA_USE_FLOAT_FORMATS) case 'e': case 'E': case 'f': #if defined(LUA_USE_AFORMAT) case 'a': case 'A': @@ -967,6 +968,7 @@ static int str_format (lua_State *L) { nb = str_sprintf(buff, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg)); break; } +#endif case 'q': { addquoted(L, &b, arg); break;