aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2013-01-11 12:23:44 +0100
committerMike Pall <mike>2013-01-11 12:23:44 +0100
commitf0a0a235335867a8999785fc6c11db459e637d1c (patch)
tree6996e8b2a90b3dd7850f84adb92758a214d6590e /src
parente434ab505e52cc2cb4ae13b79e7bdf03014cfad7 (diff)
downloadluajit-f0a0a235335867a8999785fc6c11db459e637d1c.tar.gz
luajit-f0a0a235335867a8999785fc6c11db459e637d1c.tar.bz2
luajit-f0a0a235335867a8999785fc6c11db459e637d1c.zip
Remove fictitious Solaris define.
Diffstat (limited to 'src')
-rw-r--r--src/lj_arch.h3
-rw-r--r--src/lj_def.h2
-rw-r--r--src/lj_gdbjit.c2
-rw-r--r--src/vm_x86.dasc2
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 @@
69#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ 69#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
70 defined(__NetBSD__) || defined(__OpenBSD__) 70 defined(__NetBSD__) || defined(__OpenBSD__)
71#define LUAJIT_OS LUAJIT_OS_BSD 71#define LUAJIT_OS LUAJIT_OS_BSD
72#elif (defined(__sun__) && defined(__svr4__)) || defined(__solaris__) || \ 72#elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__)
73 defined(__CYGWIN__)
74#define LUAJIT_OS LUAJIT_OS_POSIX 73#define LUAJIT_OS LUAJIT_OS_POSIX
75#else 74#else
76#define LUAJIT_OS LUAJIT_OS_OTHER 75#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;
120#define LJ_NOINLINE __attribute__((noinline)) 120#define LJ_NOINLINE __attribute__((noinline))
121 121
122#if defined(__ELF__) || defined(__MACH__) 122#if defined(__ELF__) || defined(__MACH__)
123#if !((defined(__sun__) && defined(__svr4__)) || defined(__solaris__) || defined(__CELLOS_LV2__)) 123#if !((defined(__sun__) && defined(__svr4__)) || defined(__CELLOS_LV2__))
124#define LJ_NOAPI extern __attribute__((visibility("hidden"))) 124#define LJ_NOAPI extern __attribute__((visibility("hidden")))
125#endif 125#endif
126#endif 126#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 = {
356 .eosabi = 2, 356 .eosabi = 2,
357#elif defined(__OpenBSD__) 357#elif defined(__OpenBSD__)
358 .eosabi = 12, 358 .eosabi = 12,
359#elif (defined(__sun__) && defined(__svr4__)) || defined(__solaris__) 359#elif (defined(__sun__) && defined(__svr4__))
360 .eosabi = 6, 360 .eosabi = 6,
361#else 361#else
362 .eosabi = 0, 362 .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)
6151 "\t.align " SZPTR "\n" 6151 "\t.align " SZPTR "\n"
6152 ".LEFDE1:\n\n", (int)ctx->codesz - fcofs); 6152 ".LEFDE1:\n\n", (int)ctx->codesz - fcofs);
6153#endif 6153#endif
6154#if (defined(__sun__) && defined(__svr4__)) || defined(__solaris_) 6154#if (defined(__sun__) && defined(__svr4__))
6155 fprintf(ctx->fp, "\t.section .eh_frame,\"aw\",@progbits\n"); 6155 fprintf(ctx->fp, "\t.section .eh_frame,\"aw\",@progbits\n");
6156#else 6156#else
6157 fprintf(ctx->fp, "\t.section .eh_frame,\"a\",@progbits\n"); 6157 fprintf(ctx->fp, "\t.section .eh_frame,\"a\",@progbits\n");