Bug 886209 - SHT_ARM_EXIDX not defined on older glibc versions. r=glandium
authorJustin Wood <Callek@gmail.com>
Mon, 24 Jun 2013 01:00:39 -0400
changeset 136217 79194143ec895d32320c20076ebbf6fad779076d
parent 136216 d3f627a6273e6fa31ead86505060e9834f065e06
child 136218 1501850aa8ae4b57113bbd03c077481b8e7a0e3c
push id24867
push useremorley@mozilla.com
push dateMon, 24 Jun 2013 12:35:17 +0000
treeherdermozilla-central@7edda78eca8b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs886209
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 886209 - SHT_ARM_EXIDX not defined on older glibc versions. r=glandium (fixes SeaMonkey building on CentOS5.x)
toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch
toolkit/crashreporter/breakpad-patches/12-sht-arm-exidx-define.patch
toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
--- a/toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch
+++ b/toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch
@@ -2,19 +2,19 @@
 # User Julian Seward <jseward@acm.org>
 # Date 1365953823 -7200
 # Node ID 21d2964d1337c0fce7375025610298a818ddbd0f
 # Parent  ef802a6418f25841880359e6dab3e8240bfd0821
 Bug 861141 - Connect Breakpad on Android to faulty.lib's mmap interface.  r=ted.
 Adds a prototype for ReadSymbolDataInternal so it can be called from
 outside breakpad.
 
-diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
---- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
-+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
+diff --git src/common/linux/dump_symbols.h
+--- a/src/common/linux/dump_symbols.h
++++ b/src/common/linux/dump_symbols.h
 @@ -36,16 +36,17 @@
  #define COMMON_LINUX_DUMP_SYMBOLS_H__
  
  #include <iostream>
  #include <string>
  #include <vector>
  
  #include "common/symbol_data.h"
new file mode 100644
--- /dev/null
+++ b/toolkit/crashreporter/breakpad-patches/12-sht-arm-exidx-define.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Justin Wood <Callek@gmail.com>
+# Date 1372046309 14400
+# Node ID d6fc88d46b67cd522998ab6a9320b00b6091d5ce
+# Parent  aef71cf41cecf4c3d7bef313bff502c98d5883ce
+Bug 886209 - SHT_ARM_EXIDX not defined on older glibc versions. r=glandium
+(fixes SeaMonkey building on CentOS5.x)
+
+diff --git src/common/linux/dump_symbols.cc
+--- a/src/common/linux/dump_symbols.cc
++++ b/src/common/linux/dump_symbols.cc
+@@ -71,7 +71,8 @@
+ #include "common/using_std_string.h"
+ #include "common/logging.h"
+ 
+-#if defined(__ANDROID__) && !defined(SHT_ARM_EXIDX)
++#ifndef SHT_ARM_EXIDX
++// bionic and older glibc don't define it
+ # define SHT_ARM_EXIDX (SHT_LOPROC + 1)
+ #endif
+ 
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
@@ -66,17 +66,18 @@
 #include "common/scoped_ptr.h"
 #ifndef NO_STABS_SUPPORT
 #include "common/stabs_reader.h"
 #include "common/stabs_to_module.h"
 #endif
 #include "common/using_std_string.h"
 #include "common/logging.h"
 
-#if defined(__ANDROID__) && !defined(SHT_ARM_EXIDX)
+#ifndef SHT_ARM_EXIDX
+// bionic and older glibc don't define it
 # define SHT_ARM_EXIDX (SHT_LOPROC + 1)
 #endif
 
 // This namespace contains helper functions.
 namespace {
 
 using google_breakpad::DwarfCFIToModule;
 using google_breakpad::DwarfCUToModule;