205 lines
6.7 KiB
Diff
205 lines
6.7 KiB
Diff
diff -Naur old/src/3rdparty/javascriptcore/JavaScriptCore/bytecode/Opcode.h new/src/3rdparty/javascriptcore/JavaScriptCore/bytecode/Opcode.h
|
|
--- old/src/3rdparty/javascriptcore/JavaScriptCore/bytecode/Opcode.h 2019-08-27 17:37:21.257397915 +0300
|
|
+++ new/src/3rdparty/javascriptcore/JavaScriptCore/bytecode/Opcode.h 2019-08-27 17:38:08.650305454 +0300
|
|
@@ -196,7 +196,7 @@
|
|
#undef VERIFY_OPCODE_ID
|
|
|
|
#if HAVE(COMPUTED_GOTO)
|
|
-#if COMPILER(RVCT) || COMPILER(INTEL)
|
|
+#if COMPILER(RVCT) || COMPILER(INTEL) || COMPILER(LCC)
|
|
typedef void* Opcode;
|
|
#else
|
|
typedef const void* Opcode;
|
|
diff -Naur old/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h new/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
|
--- old/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2019-08-27 17:37:21.265398068 +0300
|
|
+++ new/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2019-08-27 17:53:04.343446229 +0300
|
|
@@ -113,6 +113,10 @@
|
|
#define WTF_COMPILER_XLC 1
|
|
#endif
|
|
|
|
+/* COMPILER(LCC) - Elbrus C Compiler */
|
|
+#if defined(__LCC__)
|
|
+#define WTF_COMPILER_LCC 1
|
|
+#endif
|
|
|
|
/* ==== CPU() - the target CPU architecture ==== */
|
|
|
|
@@ -198,6 +202,11 @@
|
|
#define WTF_CPU_X86 1
|
|
#endif
|
|
|
|
+/* CPU(E2K) - elbrus 64-bit */
|
|
+#if defined(__e2k__)
|
|
+#define WTF_CPU_E2K 1
|
|
+#endif
|
|
+
|
|
/* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
|
|
#if defined(__x86_64__) \
|
|
|| defined(_M_X64)
|
|
@@ -903,7 +912,7 @@
|
|
#endif
|
|
|
|
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
|
|
-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
|
|
+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(E2K)
|
|
#define WTF_USE_JSVALUE64 1
|
|
#elif CPU(ARM) || CPU(PPC64)
|
|
#define WTF_USE_JSVALUE32 1
|
|
@@ -975,6 +984,10 @@
|
|
#endif
|
|
#endif
|
|
|
|
+#if CPU(E2K)
|
|
+#define ENABLE_JIT 0
|
|
+#endif
|
|
+
|
|
#if CPU(X86) && COMPILER(MSVC)
|
|
#define JSC_HOST_CALL __fastcall
|
|
#elif CPU(X86) && COMPILER(GCC)
|
|
@@ -983,7 +996,7 @@
|
|
#define JSC_HOST_CALL
|
|
#endif
|
|
|
|
-#if COMPILER(GCC) && !ENABLE(JIT)
|
|
+#if COMPILER(GCC) && !ENABLE(JIT) && !COMPILER(LCC)
|
|
#define HAVE_COMPUTED_GOTO 1
|
|
#endif
|
|
|
|
diff -Naur old/src/corelib/global/qglobal.h new/src/corelib/global/qglobal.h
|
|
--- old/src/corelib/global/qglobal.h 2019-08-27 18:06:43.163075794 +0300
|
|
+++ new/src/corelib/global/qglobal.h 2019-08-27 18:12:04.537194994 +0300
|
|
@@ -501,6 +501,9 @@
|
|
# if defined(__MINGW32__)
|
|
# define Q_CC_MINGW
|
|
# endif
|
|
+# if defined(__LCC__)
|
|
+# define Q_CC_LCC
|
|
+# endif
|
|
# if defined(__INTEL_COMPILER)
|
|
/* Intel C++ also masquerades as GCC 3.2.0 */
|
|
# define Q_CC_INTEL
|
|
diff -Naur old/src/corelib/tools/qsimd.cpp new/src/corelib/tools/qsimd.cpp
|
|
--- old/src/corelib/tools/qsimd.cpp 2019-08-27 18:06:43.179076100 +0300
|
|
+++ new/src/corelib/tools/qsimd.cpp 2019-08-27 18:20:46.915146356 +0300
|
|
@@ -147,6 +147,13 @@
|
|
return features;
|
|
}
|
|
|
|
+#elif defined(__e2k__)
|
|
+static inline uint detectProcessorFeatures()
|
|
+{
|
|
+ uint features = MMX|MMXEXT|SSE|SSE2|SSE3|SSSE3|CMOV;
|
|
+ return features;
|
|
+}
|
|
+
|
|
#elif defined(__i386__) || defined(_M_IX86)
|
|
static inline uint detectProcessorFeatures()
|
|
{
|
|
diff -Naur old/src/declarative/qml/qdeclarativecontext.cpp new/src/declarative/qml/qdeclarativecontext.cpp
|
|
--- old/src/declarative/qml/qdeclarativecontext.cpp 2019-08-27 18:23:30.078255778 +0300
|
|
+++ new/src/declarative/qml/qdeclarativecontext.cpp 2019-08-27 18:24:03.106885273 +0300
|
|
@@ -606,7 +606,8 @@
|
|
if (optimizedBindings)
|
|
optimizedBindings->release();
|
|
|
|
- delete [] idValues;
|
|
+ if (idValues)
|
|
+ delete [] idValues;
|
|
|
|
if (isInternal)
|
|
delete publicContext;
|
|
diff -Naur old/src/declarative/qml/qdeclarativevmemetaobject.cpp new/src/declarative/qml/qdeclarativevmemetaobject.cpp
|
|
--- old/src/declarative/qml/qdeclarativevmemetaobject.cpp 2019-08-27 18:23:30.082255855 +0300
|
|
+++ new/src/declarative/qml/qdeclarativevmemetaobject.cpp 2019-08-27 18:27:25.030734192 +0300
|
|
@@ -88,8 +88,13 @@
|
|
inline void setValue(const QDateTime &);
|
|
inline void setValue(const QScriptValue &);
|
|
private:
|
|
+#ifdef __sparc__
|
|
+ void *data[4]; // Large enough to hold all types
|
|
+ int type;
|
|
+#else
|
|
int type;
|
|
void *data[4]; // Large enough to hold all types
|
|
+#endif
|
|
|
|
inline void cleanup();
|
|
};
|
|
diff -Naur old/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h new/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
|
|
--- old/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2019-08-27 18:28:59.728539504 +0300
|
|
+++ new/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2019-08-28 14:19:24.456679972 +0300
|
|
@@ -126,6 +126,11 @@
|
|
#define WTF_COMPILER_SUNCC 1
|
|
#endif
|
|
|
|
+/* COMPILER(LCC) - Elbrus C Compiler */
|
|
+#if defined(__LCC__)
|
|
+#define WTF_COMPILER_LCC 1
|
|
+#endif
|
|
+
|
|
/* ==== CPU() - the target CPU architecture ==== */
|
|
|
|
/* This also defines CPU(BIG_ENDIAN) or CPU(MIDDLE_ENDIAN) or neither, as appropriate. */
|
|
@@ -236,6 +241,11 @@
|
|
#define WTF_CPU_X86_64 1
|
|
#endif
|
|
|
|
+/* CPU(E2K) - elbrus 64-bit */
|
|
+#if defined(__e2k__)
|
|
+#define WTF_CPU_E2K 1
|
|
+#endif
|
|
+
|
|
/* CPU(ARM) - ARM, any version*/
|
|
#if defined(arm) \
|
|
|| defined(__arm__) \
|
|
@@ -1003,7 +1013,8 @@
|
|
|| CPU(SPARC64) \
|
|
|| CPU(S390X) \
|
|
|| CPU(PPC64) \
|
|
- || CPU(MIPS64)
|
|
+ || CPU(MIPS64) \
|
|
+ || CPU(E2K)
|
|
#define WTF_USE_JSVALUE64 1
|
|
#else
|
|
#define WTF_USE_JSVALUE32_64 1
|
|
@@ -1029,6 +1040,10 @@
|
|
#define ENABLE_JIT 0
|
|
#endif
|
|
|
|
+#if CPU(E2K)
|
|
+#define ENABLE_JIT 0
|
|
+#endif
|
|
+
|
|
/* The JIT is enabled by default on all x86, x64-64, ARM & MIPS platforms. */
|
|
#if !defined(ENABLE_JIT) \
|
|
&& (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
|
|
@@ -1092,7 +1107,7 @@
|
|
#endif
|
|
|
|
/* Configure the interpreter */
|
|
-#if COMPILER(GCC) || (RVCT_VERSION_AT_LEAST(4, 0, 0, 0) && defined(__GNUC__))
|
|
+#if (COMPILER(GCC) || (RVCT_VERSION_AT_LEAST(4, 0, 0, 0) && defined(__GNUC__))) && !COMPILER(LCC)
|
|
#define HAVE_COMPUTED_GOTO 1
|
|
#endif
|
|
#if HAVE(COMPUTED_GOTO) && ENABLE(INTERPRETER)
|
|
diff -Naur old/src/corelib/tools/qlocale_tools.cpp new/src/corelib/tools/qlocale_tools.cpp
|
|
--- old/src/corelib/tools/qlocale_tools.cpp 2019-08-28 14:22:13.659965087 +0300
|
|
+++ new/src/corelib/tools/qlocale_tools.cpp 2019-08-28 16:12:19.266002322 +0300
|
|
@@ -2285,7 +2285,7 @@
|
|
_control87(MCW_EM, MCW_EM);
|
|
#endif
|
|
|
|
-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
|
|
+#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) && !defined(__e2k__)
|
|
fenv_t envp;
|
|
feholdexcept(&envp);
|
|
#endif
|
|
@@ -2301,7 +2301,7 @@
|
|
#endif //_M_X64
|
|
#endif //Q_OS_WIN
|
|
|
|
-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
|
|
+#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) && !defined(__e2k__)
|
|
fesetenv(&envp);
|
|
#endif
|