From owner-svn-src-projects@FreeBSD.ORG Thu Mar 26 05:37:46 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0F483AF; Thu, 26 Mar 2015 05:37:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A1B39E47; Thu, 26 Mar 2015 05:37:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2Q5bk4Y050675; Thu, 26 Mar 2015 05:37:46 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2Q5bjw0050671; Thu, 26 Mar 2015 05:37:45 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201503260537.t2Q5bjw0050671@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Thu, 26 Mar 2015 05:37:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280666 - in projects/lua-bootloader/sys/boot: . i386/loader liblua liblua32 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2015 05:37:47 -0000 Author: rpaulo Date: Thu Mar 26 05:37:44 2015 New Revision: 280666 URL: https://svnweb.freebsd.org/changeset/base/280666 Log: Add a liblua32 to cope with i386/amd64 loaders. Added: projects/lua-bootloader/sys/boot/liblua32/ projects/lua-bootloader/sys/boot/liblua32/Makefile (contents, props changed) Modified: projects/lua-bootloader/sys/boot/Makefile.amd64 projects/lua-bootloader/sys/boot/i386/loader/Makefile projects/lua-bootloader/sys/boot/liblua/Makefile Modified: projects/lua-bootloader/sys/boot/Makefile.amd64 ============================================================================== --- projects/lua-bootloader/sys/boot/Makefile.amd64 Thu Mar 26 05:20:18 2015 (r280665) +++ projects/lua-bootloader/sys/boot/Makefile.amd64 Thu Mar 26 05:37:44 2015 (r280666) @@ -8,3 +8,7 @@ SUBDIR+= userboot .if ${MK_FORTH} != "no" SUBDIR+= ficl32 .endif + +.if ${MK_LUA} != "no" +SUBDIR+= liblua32 +.endif Modified: projects/lua-bootloader/sys/boot/i386/loader/Makefile ============================================================================== --- projects/lua-bootloader/sys/boot/i386/loader/Makefile Thu Mar 26 05:20:18 2015 (r280665) +++ projects/lua-bootloader/sys/boot/i386/loader/Makefile Thu Mar 26 05:37:44 2015 (r280666) @@ -50,8 +50,12 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .if ${MK_LUA} != "no" BOOT_LUA= yes +.if ${MACHINE_CPUARCH} == "amd64" +LIBLUA= ${.OBJDIR}/../../liblua32/liblua.a +.else LIBLUA= ${.OBJDIR}/../../liblua/liblua.a .endif +.endif .if defined(LOADER_BZIP2_SUPPORT) CFLAGS+= -DLOADER_BZIP2_SUPPORT Modified: projects/lua-bootloader/sys/boot/liblua/Makefile ============================================================================== --- projects/lua-bootloader/sys/boot/liblua/Makefile Thu Mar 26 05:20:18 2015 (r280665) +++ projects/lua-bootloader/sys/boot/liblua/Makefile Thu Mar 26 05:37:44 2015 (r280666) @@ -16,7 +16,28 @@ SRCS+= lstd.c lutils.c WARNS= 3 -CFLAGS+= -I${.CURDIR} -DBOOT_LUA -ffreestanding -nostdlib -fno-stack-protector -CFLAGS+= -I${LUA_PATH} -I${.CURDIR}/../common +CFLAGS+= -DBOOT_LUA -ffreestanding -nostdlib +CFLAGS+= -fno-stack-protector +CFLAGS+= -I${.CURDIR}/../liblua -I${LUA_PATH} -I${.CURDIR}/../common + +.if ${MACHINE_CPUARCH} == "i386" || \ + (${MACHINE_CPUARCH} == "amd64" && defined(LUA32)) +CFLAGS+= -march=i386 +CFLAGS.gcc+= -mpreferred-stack-boundary=2 +.endif +.if ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -mno-red-zone +.endif +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float +.endif + +.if ${MACHINE_CPUARCH} == "amd64" +.if defined(LUA32) +CFLAGS+= -m32 +.else +CFLAGS+= -fPIC +.endif +.endif .include Added: projects/lua-bootloader/sys/boot/liblua32/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/lua-bootloader/sys/boot/liblua32/Makefile Thu Mar 26 05:37:44 2015 (r280666) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +LUA32= +LUADIR= ${.CURDIR}/../liblua + +.PATH: ${LUADIR} + +.include "${LUADIR}/Makefile"