From owner-svn-src-projects@FreeBSD.ORG Thu Mar 26 07:27:40 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B142C4D; Thu, 26 Mar 2015 07:27:40 +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 2BE40AD6; Thu, 26 Mar 2015 07:27:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2Q7Rew5002160; Thu, 26 Mar 2015 07:27:40 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2Q7RdUs002156; Thu, 26 Mar 2015 07:27:39 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201503260727.t2Q7RdUs002156@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 07:27:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280676 - projects/lua-bootloader/sys/boot/liblua 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 07:27:40 -0000 Author: rpaulo Date: Thu Mar 26 07:27:38 2015 New Revision: 280676 URL: https://svnweb.freebsd.org/changeset/base/280676 Log: Add more compatibility functions for lua 5.3.0. Modified: projects/lua-bootloader/sys/boot/liblua/Makefile projects/lua-bootloader/sys/boot/liblua/lstd.c projects/lua-bootloader/sys/boot/liblua/lstd.h Modified: projects/lua-bootloader/sys/boot/liblua/Makefile ============================================================================== --- projects/lua-bootloader/sys/boot/liblua/Makefile Thu Mar 26 07:26:28 2015 (r280675) +++ projects/lua-bootloader/sys/boot/liblua/Makefile Thu Mar 26 07:27:38 2015 (r280676) @@ -10,6 +10,8 @@ INTERNALLIB= SRCS= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c \ lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c \ ltm.c lundump.c lvm.c lzio.c +SRCS+= lauxlib.c lbaselib.c lbitlib.c ldblib.c lstrlib.c ltablib.c loadlib.c \ + linit.c # Our utilities. SRCS+= lstd.c lutils.c @@ -17,7 +19,7 @@ SRCS+= lstd.c lutils.c WARNS= 3 CFLAGS+= -DBOOT_LUA -ffreestanding -nostdlib -CFLAGS+= -fno-stack-protector +CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE CFLAGS+= -I${.CURDIR}/../liblua -I${LUA_PATH} -I${.CURDIR}/../common .if ${MACHINE_CPUARCH} == "i386" || \ Modified: projects/lua-bootloader/sys/boot/liblua/lstd.c ============================================================================== --- projects/lua-bootloader/sys/boot/liblua/lstd.c Thu Mar 26 07:26:28 2015 (r280675) +++ projects/lua-bootloader/sys/boot/liblua/lstd.c Thu Mar 26 07:27:38 2015 (r280676) @@ -462,4 +462,12 @@ memchr(const void *s, int c, size_t n) return (NULL); } +void +abort(void) +{ + printf("abort called!\n"); + for (;;) + ; +} + #endif /* BOOT_LUA */ Modified: projects/lua-bootloader/sys/boot/liblua/lstd.h ============================================================================== --- projects/lua-bootloader/sys/boot/liblua/lstd.h Thu Mar 26 07:26:28 2015 (r280675) +++ projects/lua-bootloader/sys/boot/liblua/lstd.h Thu Mar 26 07:27:38 2015 (r280676) @@ -38,6 +38,7 @@ #include #include + typedef struct FILE { int fd; @@ -97,5 +98,43 @@ int ispunct(int c); void * memchr(const void *ptr, int value, size_t num); +void abort(void) __dead2; + +static inline char +_l_getlocaledecpoint(void) +{ + return ('.'); +} + +#ifndef l_getlocaledecpoint +#define l_getlocaledecpoint _l_getlocaledecpoint +#endif + +#ifndef lua_writestringerror +#define lua_writestringerror(s,p) \ + (printf((s), (p))) +#endif + +#ifndef lua_writestring +#define lua_writestring(s,l) \ + (write(1, __DECONST(void *, (s)), (l))) +#endif + +#define stdout 1 +#define fflush /* */ +#define fgets(b,l,s) fgetstr((b), (l), 0) + +static inline double +frexp(double value, int *exp) +{ + return 0; /* XXX */ +} + +static inline double +fmod(double x, double y) +{ + return 0; /* XXX */ +} + #endif #endif //LSTD_H