diff options
| author | Mike Pall <mike> | 2013-01-11 12:23:44 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-01-11 12:23:44 +0100 |
| commit | f0a0a235335867a8999785fc6c11db459e637d1c (patch) | |
| tree | 6996e8b2a90b3dd7850f84adb92758a214d6590e | |
| parent | e434ab505e52cc2cb4ae13b79e7bdf03014cfad7 (diff) | |
| download | luajit2-f0a0a235335867a8999785fc6c11db459e637d1c.tar.gz | |
Remove fictitious Solaris define.
| -rw-r--r-- | src/lj_arch.h | 3 | ||||
| -rw-r--r-- | src/lj_def.h | 2 | ||||
| -rw-r--r-- | src/lj_gdbjit.c | 2 | ||||
| -rw-r--r-- | src/vm_x86.dasc | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index 960998ab..10071ca4 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h @@ -69,8 +69,7 @@ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ defined(__NetBSD__) || defined(__OpenBSD__) #define LUAJIT_OS LUAJIT_OS_BSD -#elif (defined(__sun__) && defined(__svr4__)) || defined(__solaris__) || \ - defined(__CYGWIN__) +#elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__) #define LUAJIT_OS LUAJIT_OS_POSIX #else #define LUAJIT_OS LUAJIT_OS_OTHER diff --git a/src/lj_def.h b/src/lj_def.h index 26cf7fdc..a28d84d7 100644 --- a/src/lj_def.h +++ b/src/lj_def.h @@ -120,7 +120,7 @@ typedef uintptr_t BloomFilter; #define LJ_NOINLINE __attribute__((noinline)) #if defined(__ELF__) || defined(__MACH__) -#if !((defined(__sun__) && defined(__svr4__)) || defined(__solaris__) || defined(__CELLOS_LV2__)) +#if !((defined(__sun__) && defined(__svr4__)) || defined(__CELLOS_LV2__)) #define LJ_NOAPI extern __attribute__((visibility("hidden"))) #endif #endif diff --git a/src/lj_gdbjit.c b/src/lj_gdbjit.c index 0cff11b0..063ccd71 100644 --- a/src/lj_gdbjit.c +++ b/src/lj_gdbjit.c @@ -356,7 +356,7 @@ static const ELFheader elfhdr_template = { .eosabi = 2, #elif defined(__OpenBSD__) .eosabi = 12, -#elif (defined(__sun__) && defined(__svr4__)) || defined(__solaris__) +#elif (defined(__sun__) && defined(__svr4__)) .eosabi = 6, #else .eosabi = 0, diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index e2b6a078..9e373382 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc @@ -6151,7 +6151,7 @@ static void emit_asm_debug(BuildCtx *ctx) "\t.align " SZPTR "\n" ".LEFDE1:\n\n", (int)ctx->codesz - fcofs); #endif -#if (defined(__sun__) && defined(__svr4__)) || defined(__solaris_) +#if (defined(__sun__) && defined(__svr4__)) fprintf(ctx->fp, "\t.section .eh_frame,\"aw\",@progbits\n"); #else fprintf(ctx->fp, "\t.section .eh_frame,\"a\",@progbits\n"); |