1 files changed, 18 insertions, 25 deletions
diff --git a/community/firefox-esr/fix-tools.patch b/community/firefox-esr/fix-tools.patch
index fdb08845d9..93b9d19c84 100644
--- a/community/firefox-esr/fix-tools.patch
+++ b/community/firefox-esr/fix-tools.patch
@@ -1,33 +1,26 @@
-diff -upr /tmp/firefox-60.5.0.orig/tools/profiler/core/platform-linux-android.cpp firefox-60.5.0/tools/profiler/core/platform-linux-android.cpp
---- /tmp/firefox-60.5.0.orig/tools/profiler/core/platform-linux-android.cpp	2019-02-11 18:55:48.543925300 +0100
-+++ firefox-60.5.0/tools/profiler/core/platform-linux-android.cpp	2019-02-12 10:00:02.735569929 +0100
-@@ -497,8 +497,10 @@ static void PlatformInit(PSLockRef aLock
+diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp
+index 19d0a5c56d..b64b543066 100644
+--- a/tools/profiler/core/platform-linux-android.cpp
++++ b/tools/profiler/core/platform-linux-android.cpp
+@@ -506,8 +506,10 @@ static void PlatformInit(PSLockRef aLock) {}
  ucontext_t sSyncUContext;
  
  void Registers::SyncPopulate() {
-+#if defined(__GLIBC__)
-   if (!getcontext(&sSyncUContext)) {
-     PopulateRegsFromContext(*this, &sSyncUContext);
-   }
-+#endif
+-  if (!getcontext(&sSyncUContext)) {
+-    PopulateRegsFromContext(*this, &sSyncUContext);
+-  }
++  #if defined(__GLIBC__)
++    if (!getcontext(&sSyncUContext)) {
++      PopulateRegsFromContext(*this, &sSyncUContext);
++    }
++  #endif
  }
  #endif
-diff -upr /tmp/firefox-60.5.0.orig/tools/profiler/core/platform.h firefox-60.5.0/tools/profiler/core/platform.h
---- /tmp/firefox-60.5.0.orig/tools/profiler/core/platform.h	2019-02-11 18:55:48.540591965 +0100
-+++ firefox-60.5.0/tools/profiler/core/platform.h	2019-02-12 10:00:02.735569929 +0100
-@@ -29,6 +29,8 @@
- #ifndef TOOLS_PLATFORM_H_
- #define TOOLS_PLATFORM_H_
- 
-+#include <sys/types.h>
-+
- #include <stdint.h>
- #include <math.h>
- #include "MainThreadUtils.h"
-diff -upr /tmp/firefox-60.5.0.orig/tools/profiler/lul/LulElf.cpp firefox-60.5.0/tools/profiler/lul/LulElf.cpp
---- /tmp/firefox-60.5.0.orig/tools/profiler/lul/LulElf.cpp	2019-02-11 18:55:48.547258635 +0100
-+++ firefox-60.5.0/tools/profiler/lul/LulElf.cpp	2019-02-12 10:00:59.802296448 +0100
-@@ -459,10 +459,10 @@ string FormatIdentifier(unsigned char id
+diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp
+index 9998d04d0d..348a7086fc 100644
+--- a/tools/profiler/lul/LulElf.cpp
++++ b/tools/profiler/lul/LulElf.cpp
+@@ -469,10 +469,10 @@ string FormatIdentifier(unsigned char identifier[16]) {
  // 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) {