2befab6352
This also attempts to enable at least some degree of debug info on 32-bit hosts as well as prepare for future ppc32 support. It also synchronizes patches with firefox.
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
--- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig 2016-07-05 21:00:03.672000517 +0200
|
|
+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200
|
|
@@ -1134,6 +1134,12 @@
|
|
#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
|
|
--- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000
|
|
+++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-04-17 10:24:33.793431933 +0000
|
|
@@ -45,6 +45,7 @@
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
+#include <libgen.h>
|
|
|
|
#include <iostream>
|
|
#include <set>
|
|
--- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-03-15 05:19:36.000000000 +0000
|
|
+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-04-17 10:24:33.793431933 +0000
|
|
@@ -41,6 +41,10 @@
|
|
|
|
#include "common/using_std_string.h"
|
|
|
|
+#ifndef N_UNDF
|
|
+#define N_UNDF 0
|
|
+#endif
|
|
+
|
|
using std::vector;
|
|
|
|
namespace google_breakpad {
|
|
--- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000
|
|
+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000
|
|
@@ -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
|
|
|
|
--- toolkit.orig/mozapps/update/common/updatedefines.h 2019-01-29 11:34:36.416804577 +0100
|
|
+++ toolkit/mozapps/update/common/updatedefines.h 2019-01-29 11:34:59.193583777 +0100
|
|
@@ -102,7 +102,7 @@
|
|
|
|
# ifdef SOLARIS
|
|
# include <sys/stat.h>
|
|
-# else
|
|
+# elif !(defined(__linux__)) || defined(__GLIBC__)
|
|
# include <fts.h>
|
|
# endif
|
|
# include <dirent.h>
|
|
--- toolkit.orig/mozapps/update/updater/updater.cpp 2014-03-15 05:19:37.000000000 +0000
|
|
+++ toolkit/mozapps/update/updater/updater.cpp 2014-04-17 10:24:33.796765327 +0000
|
|
@@ -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;
|
|
}
|