diff options
| -rw-r--r-- | community/firefox/b3d8b08265b800165d684281d19ac845a8ff9a66.patch | 46 | ||||
| -rw-r--r-- | community/firefox/fix-toolkit.patch | 90 |
2 files changed, 0 insertions, 136 deletions
diff --git a/community/firefox/b3d8b08265b800165d684281d19ac845a8ff9a66.patch b/community/firefox/b3d8b08265b800165d684281d19ac845a8ff9a66.patch deleted file mode 100644 index 873f4c3ad4..0000000000 --- a/community/firefox/b3d8b08265b800165d684281d19ac845a8ff9a66.patch +++ /dev/null @@ -1,46 +0,0 @@ - -# HG changeset patch -# User Andrew Osmond <aosmond@mozilla.com> -# Date 1579706360 0 -# Node ID b3d8b08265b800165d684281d19ac845a8ff9a66 -# Parent 50c371b37a9fcd994a5866db73bd0d078e19f95d -Bug 1610814 - Fix NEON compile error with gcc and RGB unpacking. r=lsalzman - -This patch makes us use the correct intrinsic for loading a uint8x16 -register. It is not entirely clear why clang accepts this without -complaint but beyond the types, it should be equivalent. - -Differential Revision: https://phabricator.services.mozilla.com/D60667 - -diff --git a/gfx/2d/SwizzleNEON.cpp b/gfx/2d/SwizzleNEON.cpp ---- a/gfx/2d/SwizzleNEON.cpp -+++ b/gfx/2d/SwizzleNEON.cpp -@@ -407,25 +407,25 @@ void UnpackRowRGB24_NEON(const uint8_t* - } - - uint8x16_t alpha = vreinterpretq_u8_u32(vdupq_n_u32(0xFF000000)); - - // Process all 4-pixel chunks as one vector. - src -= 4 * 3; - dst -= 4 * 4; - while (src >= aSrc) { -- uint8x16_t px = vld1q_u16(reinterpret_cast<const uint16_t*>(src)); -+ uint8x16_t px = vld1q_u8(src); - // G2R2B1G1 R1B0G0R0 -> X1R1G1B1 X0R0G0B0 - uint8x8_t pxlo = vtbl1_u8(vget_low_u8(px), masklo); - // B3G3R3B2 G2R2B1G1 -> X3R3G3B3 X2R2G2B2 - uint8x8_t pxhi = - vtbl1_u8(vext_u8(vget_low_u8(px), vget_high_u8(px), 4), maskhi); - px = vcombine_u8(pxlo, pxhi); - px = vorrq_u8(px, alpha); -- vst1q_u16(reinterpret_cast<uint16_t*>(dst), px); -+ vst1q_u8(dst, px); - src -= 4 * 3; - dst -= 4 * 4; - } - } - - // Force instantiation of swizzle variants here. - template void UnpackRowRGB24_NEON<false>(const uint8_t*, uint8_t*, int32_t); - template void UnpackRowRGB24_NEON<true>(const uint8_t*, uint8_t*, int32_t); - diff --git a/community/firefox/fix-toolkit.patch b/community/firefox/fix-toolkit.patch deleted file mode 100644 index 414734dfec..0000000000 --- a/community/firefox/fix-toolkit.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -index 4222ce3..4d40c6a 100644 ---- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -@@ -46,6 +46,7 @@ - #include <sys/mman.h> - #include <sys/stat.h> - #include <unistd.h> -+#include <libgen.h> - - #include <iostream> - #include <set> -diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc -index 6019fc7..5953e32 100644 ---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc -+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc -@@ -41,6 +41,10 @@ - - #include "common/using_std_string.h" - -+#ifndef N_UNDF -+#define N_UNDF 0 -+#endif -+ - using std::vector; - - namespace google_breakpad { -diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h -index 98ee2dd..d57aa68 100644 ---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h -+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h -@@ -55,7 +55,7 @@ - - #ifdef HAVE_MACH_O_NLIST_H - #include <mach-o/nlist.h> --#elif defined(HAVE_A_OUT_H) -+#elif 0 - #include <a.out.h> - #endif - -diff --git a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -index 93fdad7..f34e5e0 100644 ---- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -+++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -@@ -1239,6 +1239,12 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 285 - #endif -+ -+#undef __NR_pread -+#define __NR_pread __NR_pread64 -+#undef __NR_pwrite -+#define __NR_pwrite __NR_pwrite64 -+ - /* End of x86-64 definitions */ - #elif defined(__mips__) - #if _MIPS_SIM == _MIPS_SIM_ABI32 -diff --git a/toolkit/mozapps/update/common/updatedefines.h b/toolkit/mozapps/update/common/updatedefines.h -index 79276f7..4c67976 100644 ---- a/toolkit/mozapps/update/common/updatedefines.h -+++ b/toolkit/mozapps/update/common/updatedefines.h -@@ -87,7 +87,7 @@ static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, - - # ifdef SOLARIS - # include <sys/stat.h> --# else -+# elif !defined(__linux__) || defined(__GLIBC__) - # include <fts.h> - # endif - # include <dirent.h> -diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp -index 257ccb4..01314e4 100644 ---- a/toolkit/mozapps/update/updater/updater.cpp -+++ b/toolkit/mozapps/update/updater/updater.cpp -@@ -3978,6 +3978,7 @@ - - int add_dir_entries(const NS_tchar* dirpath, ActionList* list) { - int rv = OK; -+#if !defined(__linux__) || defined(__GLIBC__) - FTS* ftsdir; - FTSENT* ftsdirEntry; - mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath)); -@@ -4085,6 +4086,7 @@ - } - - fts_close(ftsdir); -+#endif - - return rv; - } |