summarylogtreecommitdiffstats
path: root/e31d79e8da99456247df84c2f99ba9083d46efe1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'e31d79e8da99456247df84c2f99ba9083d46efe1.patch')
-rw-r--r--e31d79e8da99456247df84c2f99ba9083d46efe1.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/e31d79e8da99456247df84c2f99ba9083d46efe1.patch b/e31d79e8da99456247df84c2f99ba9083d46efe1.patch
deleted file mode 100644
index eb265155de8a..000000000000
--- a/e31d79e8da99456247df84c2f99ba9083d46efe1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e31d79e8da99456247df84c2f99ba9083d46efe1 Mon Sep 17 00:00:00 2001
-From: "Matt A. Tobin" <email@mattatobin.com>
-Date: Wed, 16 Oct 2019 12:37:07 -0400
-Subject: [PATCH] Fix build errors with newer glibc versions
-
----
- js/src/jsnativestack.cpp | 6 +-----
- tools/profiler/tasktracer/GeckoTaskTracer.cpp | 12 +++---------
- 2 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
-index 98f8fc7416..94a296bd0e 100644
---- a/js/src/jsnativestack.cpp
-+++ b/js/src/jsnativestack.cpp
-@@ -26,11 +26,7 @@
- # include <sys/syscall.h>
- # include <sys/types.h>
- # include <unistd.h>
--static pid_t
--gettid()
--{
-- return syscall(__NR_gettid);
--}
-+# define gettid() static_cast<pid_t>(syscall(SYS_gettid))
- # endif
-
- #else
-diff --git a/tools/profiler/tasktracer/GeckoTaskTracer.cpp b/tools/profiler/tasktracer/GeckoTaskTracer.cpp
-index ada6956148..36d1bffc38 100644
---- a/tools/profiler/tasktracer/GeckoTaskTracer.cpp
-+++ b/tools/profiler/tasktracer/GeckoTaskTracer.cpp
-@@ -20,22 +20,16 @@
-
- #include <stdarg.h>
-
--// We need a definition of gettid(), but glibc doesn't provide a
-+// We need a definition of gettid(), but older glibc versions don't provide a
- // wrapper for it.
- #if defined(__GLIBC__)
- #include <unistd.h>
- #include <sys/syscall.h>
--static inline pid_t gettid()
--{
-- return (pid_t) syscall(SYS_gettid);
--}
-+#define gettid() static_cast<pid_t>(syscall(SYS_gettid))
- #elif defined(XP_MACOSX)
- #include <unistd.h>
- #include <sys/syscall.h>
--static inline pid_t gettid()
--{
-- return (pid_t) syscall(SYS_thread_selfid);
--}
-+#define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid))
- #elif defined(LINUX)
- #include <sys/types.h>
- pid_t gettid();