diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-11-27 10:51:59 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-11-27 10:53:19 +0000 |
| commit | 58c2060efdb5496c74ff9112062196b371f70d75 (patch) | |
| tree | 866ec6866c4042cb883ada07290499b85340f84f /testing/firefox/fix-tools.patch | |
| parent | edc7d52f27b03b0779ed1ea1ae401d598ee6eadf (diff) | |
| download | aports-58c2060efdb5496c74ff9112062196b371f70d75.tar.bz2 aports-58c2060efdb5496c74ff9112062196b371f70d75.tar.xz | |
testing/firefox; upgrade to 57.0
Diffstat (limited to 'testing/firefox/fix-tools.patch')
| -rw-r--r-- | testing/firefox/fix-tools.patch | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch index ff6622582f..84f7fa9cb8 100644 --- a/testing/firefox/fix-tools.patch +++ b/testing/firefox/fix-tools.patch @@ -1,25 +1,17 @@ -for basename() see https://bugzilla.mozilla.org/show_bug.cgi?id=1041962 +--- a/tools/profiler/core/platform.h ++++ b/tools/profiler/core/platform.h +@@ -29,6 +29,8 @@ + #ifndef TOOLS_PLATFORM_H_ + #define TOOLS_PLATFORM_H_ -diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp -index 70b43d5..686748e 100644 ---- a/tools/profiler/core/platform-linux-android.cpp -+++ b/tools/profiler/core/platform-linux-android.cpp -@@ -505,8 +505,10 @@ TickSample::PopulateContext(ucontext_t* aContext) - MOZ_ASSERT(mIsSynchronous); - MOZ_ASSERT(aContext); - -+#if defined(__GLIBC__) || defined(GP_OS_android) - if (!getcontext(aContext)) { - FillInSample(*this, aContext); - } -+#endif - } - -diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp -index cb5bee3..2be2aa9 100644 ++#include <sys/types.h> ++ + #include <stdint.h> + #include <math.h> + #include "MainThreadUtils.h" --- a/tools/profiler/lul/LulElf.cpp +++ b/tools/profiler/lul/LulElf.cpp -@@ -484,10 +484,10 @@ string FormatIdentifier(unsigned char identifier[16]) { +@@ -579,10 +579,10 @@ // Return the non-directory portion of FILENAME: the portion after the // last slash, or the whole filename if there are no slashes. string BaseFileName(const string &filename) { @@ -33,4 +25,18 @@ index cb5bee3..2be2aa9 100644 + string base = p ? p+1 : c_filename; return base; } + +--- a/tools/profiler/core/platform-linux-android.cpp.orig ++++ b/tools/profiler/core/platform-linux-android.cpp +@@ -534,9 +534,11 @@ + void + Registers::SyncPopulate() + { ++#if defined(__GLIBC__) + if (!getcontext(&sSyncUContext)) { + PopulateRegsFromContext(*this, &sSyncUContext); + } ++#endif + } + #endif |