Date: Thu, 26 Mar 2015 05:37:45 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280666 - in projects/lua-bootloader/sys/boot: . i386/loader liblua liblua32 Message-ID: <201503260537.t2Q5bjw0050671@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.lib.mk> 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503260537.t2Q5bjw0050671>