summaryrefslogtreecommitdiff
path: root/sljit/sljitConfigInternal.h
diff options
context:
space:
mode:
authorMatthew Vernon <matthew@debian.org>2015-06-13 11:46:28 +0100
committerMatthew Vernon <matthew@debian.org>2015-06-13 11:46:28 +0100
commit76007cb8847da991dd95182ce60526b740eeee37 (patch)
treee7da23650c3ebf5fbe96cfcbd79b5e91dbcdd095 /sljit/sljitConfigInternal.h
parent9badd2ec79637d3077365475f457a8e46e6f8208 (diff)
Patch from Thorsten Glaser (fixes #760327)
This disables JIT on powerpcspe and x32; it was previously applied and then reverted (I think due to miscommunication). The changelog entries relating to the changes that ended up being reverted are also restored.
Diffstat (limited to 'sljit/sljitConfigInternal.h')
-rw-r--r--sljit/sljitConfigInternal.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h
index 89be38b..8219e73 100644
--- a/sljit/sljitConfigInternal.h
+++ b/sljit/sljitConfigInternal.h
@@ -97,7 +97,11 @@
#if defined(__i386__) || defined(__i386)
#define SLJIT_CONFIG_X86_32 1
#elif defined(__x86_64__)
-#define SLJIT_CONFIG_X86_64 1
+# if defined(__ILP32__)
+# define SLJIT_CONFIG_UNSUPPORTED 1
+# else
+# define SLJIT_CONFIG_X86_64 1
+# endif
#elif defined(__arm__) || defined(__ARM__)
#ifdef __thumb2__
#define SLJIT_CONFIG_ARM_THUMB2 1
@@ -111,7 +115,11 @@
#elif defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64) || (defined(_POWER) && defined(__64BIT__))
#define SLJIT_CONFIG_PPC_64 1
#elif defined(__ppc__) || defined(__powerpc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
-#define SLJIT_CONFIG_PPC_32 1
+# ifndef __NO_FPRS__
+# define SLJIT_CONFIG_PPC_32 1
+# else
+# define SLJIT_CONFIG_UNSUPPORTED 1
+# endif
#elif defined(__mips__) && !defined(_LP64)
#define SLJIT_CONFIG_MIPS_32 1
#elif defined(__mips64)