Bug 886209 - SHT_ARM_EXIDX not defined on older glibc versions. r=glandium

(fixes SeaMonkey building on CentOS5.x)
This commit is contained in:
Justin Wood 2013-06-24 01:00:39 -04:00
parent cfb015452b
commit ce065ee7e3
3 changed files with 26 additions and 4 deletions

View File

@ -7,9 +7,9 @@ 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 Adds a prototype for ReadSymbolDataInternal so it can be called from
outside breakpad. 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 diff --git src/common/linux/dump_symbols.h
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h --- a/src/common/linux/dump_symbols.h
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h +++ b/src/common/linux/dump_symbols.h
@@ -36,16 +36,17 @@ @@ -36,16 +36,17 @@
#define COMMON_LINUX_DUMP_SYMBOLS_H__ #define COMMON_LINUX_DUMP_SYMBOLS_H__

View File

@ -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

View File

@ -71,7 +71,8 @@
#include "common/using_std_string.h" #include "common/using_std_string.h"
#include "common/logging.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) # define SHT_ARM_EXIDX (SHT_LOPROC + 1)
#endif #endif