Remove fictitious Solaris define.

This commit is contained in:
Mike Pall 2013-01-11 12:23:44 +01:00
parent e434ab505e
commit f0a0a23533
4 changed files with 4 additions and 5 deletions

View File

@ -69,8 +69,7 @@
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
defined(__NetBSD__) || defined(__OpenBSD__) defined(__NetBSD__) || defined(__OpenBSD__)
#define LUAJIT_OS LUAJIT_OS_BSD #define LUAJIT_OS LUAJIT_OS_BSD
#elif (defined(__sun__) && defined(__svr4__)) || defined(__solaris__) || \ #elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__)
defined(__CYGWIN__)
#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

View File

@ -120,7 +120,7 @@ typedef uintptr_t BloomFilter;
#define LJ_NOINLINE __attribute__((noinline)) #define LJ_NOINLINE __attribute__((noinline))
#if defined(__ELF__) || defined(__MACH__) #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"))) #define LJ_NOAPI extern __attribute__((visibility("hidden")))
#endif #endif
#endif #endif

View File

@ -356,7 +356,7 @@ static const ELFheader elfhdr_template = {
.eosabi = 2, .eosabi = 2,
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
.eosabi = 12, .eosabi = 12,
#elif (defined(__sun__) && defined(__svr4__)) || defined(__solaris__) #elif (defined(__sun__) && defined(__svr4__))
.eosabi = 6, .eosabi = 6,
#else #else
.eosabi = 0, .eosabi = 0,

View File

@ -6151,7 +6151,7 @@ static void emit_asm_debug(BuildCtx *ctx)
"\t.align " SZPTR "\n" "\t.align " SZPTR "\n"
".LEFDE1:\n\n", (int)ctx->codesz - fcofs); ".LEFDE1:\n\n", (int)ctx->codesz - fcofs);
#endif #endif
#if (defined(__sun__) && defined(__svr4__)) || defined(__solaris_) #if (defined(__sun__) && defined(__svr4__))
fprintf(ctx->fp, "\t.section .eh_frame,\"aw\",@progbits\n"); fprintf(ctx->fp, "\t.section .eh_frame,\"aw\",@progbits\n");
#else #else
fprintf(ctx->fp, "\t.section .eh_frame,\"a\",@progbits\n"); fprintf(ctx->fp, "\t.section .eh_frame,\"a\",@progbits\n");