gh-mirror/mikepaul-LuaJIT
1
0
Fork 1
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-12 17:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2016-04-03 19:08:32 +02:00
commit 25b377942a
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lj_alloc.c
View File

@ -196,7 +196,7 @@ static LJ_AINLINE void *CALL_MMAP(size_t size)
return ptr; return ptr;
} }
#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__) || defined(__CYGWIN__) #elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__) || LJ_TARGET_CYGWIN
/* OSX and FreeBSD mmap() use a naive first-fit linear search. /* OSX and FreeBSD mmap() use a naive first-fit linear search.
** That's perfect for us. Except that -pagezero_size must be set for OSX, ** That's perfect for us. Except that -pagezero_size must be set for OSX,

9
src/lj_arch.h
View File

@ -68,7 +68,10 @@
defined(__NetBSD__) || defined(__OpenBSD__) || \ defined(__NetBSD__) || defined(__OpenBSD__) || \
defined(__DragonFly__)) && !defined(__ORBIS__) defined(__DragonFly__)) && !defined(__ORBIS__)
#define LUAJIT_OS LUAJIT_OS_BSD #define LUAJIT_OS LUAJIT_OS_BSD
#elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__) #elif (defined(__sun__) && defined(__svr4__))
#define LUAJIT_OS LUAJIT_OS_POSIX
#elif defined(__CYGWIN__)
#define LJ_TARGET_CYGWIN 1
#define LUAJIT_OS LUAJIT_OS_POSIX #define LUAJIT_OS LUAJIT_OS_POSIX
#else #else
#define LUAJIT_OS LUAJIT_OS_OTHER #define LUAJIT_OS LUAJIT_OS_OTHER
@ -137,7 +140,7 @@
#define LJ_ARCH_NAME "x86" #define LJ_ARCH_NAME "x86"
#define LJ_ARCH_BITS 32 #define LJ_ARCH_BITS 32
#define LJ_ARCH_ENDIAN LUAJIT_LE #define LJ_ARCH_ENDIAN LUAJIT_LE
#if LJ_TARGET_WINDOWS || __CYGWIN__ #if LJ_TARGET_WINDOWS || LJ_TARGET_CYGWIN
#define LJ_ABI_WIN 1 #define LJ_ABI_WIN 1
#else #else
#define LJ_ABI_WIN 0 #define LJ_ABI_WIN 0
@ -155,7 +158,7 @@
#define LJ_ARCH_NAME "x64" #define LJ_ARCH_NAME "x64"
#define LJ_ARCH_BITS 64 #define LJ_ARCH_BITS 64
#define LJ_ARCH_ENDIAN LUAJIT_LE #define LJ_ARCH_ENDIAN LUAJIT_LE
#if LJ_TARGET_WINDOWS || __CYGWIN__ #if LJ_TARGET_WINDOWS || LJ_TARGET_CYGWIN
#define LJ_ABI_WIN 1 #define LJ_ABI_WIN 1
#else #else
#define LJ_ABI_WIN 0 #define LJ_ABI_WIN 0

8
src/lj_clib.c
View File

@ -40,7 +40,7 @@ LJ_NORET LJ_NOINLINE static void clib_error_(lua_State *L)
#define clib_error(L, fmt, name) clib_error_(L) #define clib_error(L, fmt, name) clib_error_(L)
#if defined(__CYGWIN__) #if LJ_TARGET_CYGWIN
#define CLIB_SOPREFIX "cyg" #define CLIB_SOPREFIX "cyg"
#else #else
#define CLIB_SOPREFIX "lib" #define CLIB_SOPREFIX "lib"
@ -48,7 +48,7 @@ LJ_NORET LJ_NOINLINE static void clib_error_(lua_State *L)
#if LJ_TARGET_OSX #if LJ_TARGET_OSX
#define CLIB_SOEXT "%s.dylib" #define CLIB_SOEXT "%s.dylib"
#elif defined(__CYGWIN__) #elif LJ_TARGET_CYGWIN
#define CLIB_SOEXT "%s.dll" #define CLIB_SOEXT "%s.dll"
#else #else
#define CLIB_SOEXT "%s.so" #define CLIB_SOEXT "%s.so"
@ -57,14 +57,14 @@ LJ_NORET LJ_NOINLINE static void clib_error_(lua_State *L)
static const char *clib_extname(lua_State *L, const char *name) static const char *clib_extname(lua_State *L, const char *name)
{ {
if (!strchr(name, '/') if (!strchr(name, '/')
#ifdef __CYGWIN__ #if LJ_TARGET_CYGWIN
&& !strchr(name, '\\') && !strchr(name, '\\')
#endif #endif
) { ) {
if (!strchr(name, '.')) { if (!strchr(name, '.')) {
name = lj_strfmt_pushf(L, CLIB_SOEXT, name); name = lj_strfmt_pushf(L, CLIB_SOEXT, name);
L->top--; L->top--;
#ifdef __CYGWIN__ #if LJ_TARGET_CYGWIN
} else { } else {
return name; return name;
#endif #endif