1 files changed, 20 insertions, 28 deletions
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch
index edecb7f678..800b6599b3 100644
--- a/testing/firefox/fix-tools.patch
+++ b/testing/firefox/fix-tools.patch
@@ -1,14 +1,23 @@
---- a/tools/profiler/core/platform.h
-+++ b/tools/profiler/core/platform.h
-@@ -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 --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
+@@ -498,8 +498,10 @@ static void PlatformInit(PSLockRef aLock) {}
+ ucontext_t sSyncUContext;
+ 
+ void Registers::SyncPopulate() {
+-  if (!getcontext(&sSyncUContext)) {
+-    PopulateRegsFromContext(*this, &sSyncUContext);
+-  }
++  #if defined(__GLIBC__)
++    if (!getcontext(&sSyncUContext)) {
++      PopulateRegsFromContext(*this, &sSyncUContext);
++    }
++  #endif
+ }
+ #endif
+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]) {
@@ -25,21 +34,4 @@
 +  string base = p ? p+1 : c_filename;
    return base;
  }
-
---- a/tools/profiler/core/platform-linux-android.cpp
-+++ b/tools/profiler/core/platform-linux-android.cpp
-@@ -497,8 +497,10 @@ static void PlatformInit(PSLockRef aLock) {}
- ucontext_t sSyncUContext;
-
- void Registers::SyncPopulate() {
--  if (!getcontext(&sSyncUContext)) {
--    PopulateRegsFromContext(*this, &sSyncUContext);
--  }
-+  #if defined(__GLIBC__)
-+    if (!getcontext(&sSyncUContext)) {
-+      PopulateRegsFromContext(*this, &sSyncUContext);
-+    }
-+  #endif
- }
- #endif