From owner-svn-src-all@freebsd.org Fri Feb 23 04:04:04 2018 Return-Path: Delivered-To: svn-src-all@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 1B1E8F249AB; Fri, 23 Feb 2018 04:04:04 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BA4036A602; Fri, 23 Feb 2018 04:04:03 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B49E011759; Fri, 23 Feb 2018 04:04:03 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1N4430f053719; Fri, 23 Feb 2018 04:04:03 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1N443dd053717; Fri, 23 Feb 2018 04:04:03 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201802230404.w1N443dd053717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 23 Feb 2018 04:04:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329857 - in head/stand: . liblua X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/stand: . liblua X-SVN-Commit-Revision: 329857 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.25 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: Fri, 23 Feb 2018 04:04:04 -0000 Author: imp Date: Fri Feb 23 04:04:03 2018 New Revision: 329857 URL: https://svnweb.freebsd.org/changeset/base/329857 Log: Centralize lua defines We need to ensure that we defined Numbers as int64_t everywhere we build for lua. Previously, we were compiling part of the code with Numbers as int64_t and part as double. Move lua number definition to a more-central location Modified: head/stand/liblua/Makefile head/stand/lua.mk Modified: head/stand/liblua/Makefile ============================================================================== --- head/stand/liblua/Makefile Fri Feb 23 04:03:07 2018 (r329856) +++ head/stand/liblua/Makefile Fri Feb 23 04:04:03 2018 (r329857) @@ -5,6 +5,8 @@ .PATH: ${LUASRC} .PATH: ${LIBLUASRC} +.include "${BOOTSRC}/lua.mk" + LIB= lua INTERNALLIB= @@ -25,9 +27,8 @@ SRCS+= lerrno.c lfs.c lstd.c lutils.c WARNS= 3 -CFLAGS+= -DLUA_FLOAT_TYPE=LUA_FLOAT_INT64 CFLAGS+= -DLUA_PATH_DEFAULT=\"/boot/lua/\?.lua\" -CFLAGS+= -ffreestanding -nostdlib -DBOOT_LUA -DLUA_USE_POSIX +CFLAGS+= -ffreestanding -nostdlib -DLUA_USE_POSIX CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC} Modified: head/stand/lua.mk ============================================================================== --- head/stand/lua.mk Fri Feb 23 04:03:07 2018 (r329856) +++ head/stand/lua.mk Fri Feb 23 04:04:03 2018 (r329857) @@ -2,11 +2,6 @@ # Common flags to build lua related files -.include "defs.mk" - -.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0 -CFLAGS+= -fPIC -.endif - CFLAGS+= -I${LUASRC} -I${LDRSRC} -I${LIBLUASRC} -CFLAGS+= -DBOOT_LUA +# CFLAGS+= -Ddouble=jagged-little-pill -Dfloat=poison-shake -D__OMIT_FLOAT +CFLAGS+= -DLUA_FLOAT_TYPE=LUA_FLOAT_INT64