Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2017-08-09 10:57:40 +02:00
commit 08aca6192c

View File

@ -17,7 +17,7 @@ diff -up firefox-55.0/js/src/jit/ExecutableAllocator.h.old firefox-55.0/js/src/j
{ {
sync_instruction_memory((caddr_t)code, size); sync_instruction_memory((caddr_t)code, size);
} }
+#elif defined(__ppc__) || defined(__ppc64__) || defined(__ppc64le__) +#else
+ static void cacheFlush(void*, size_t) + static void cacheFlush(void*, size_t)
+ { + {
+ } + }