summaryrefslogtreecommitdiff
path: root/recipes/mozilla/firefox-3.6.4/Bug385583.nspr.jmp_buf.eabi.diff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-06-23 10:32:59 +0200
committerKoen Kooi <koen@openembedded.org>2010-06-23 10:32:59 +0200
commit0655e3fe0b154b19fc1d5868dada6377facc135d (patch)
tree4f373fbf942fa5e0bf7ecf38c48ec2d657975fc1 /recipes/mozilla/firefox-3.6.4/Bug385583.nspr.jmp_buf.eabi.diff
parentece52cfdb8d7560ea95f86084cdc3f7c76438473 (diff)
firefox: add 3.6.4
Diffstat (limited to 'recipes/mozilla/firefox-3.6.4/Bug385583.nspr.jmp_buf.eabi.diff')
-rw-r--r--recipes/mozilla/firefox-3.6.4/Bug385583.nspr.jmp_buf.eabi.diff33
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes/mozilla/firefox-3.6.4/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.6.4/Bug385583.nspr.jmp_buf.eabi.diff
new file mode 100644
index 0000000000..486440c30e
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.4/Bug385583.nspr.jmp_buf.eabi.diff
@@ -0,0 +1,33 @@
+diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h
+--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500
++++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500
+@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void);
+ #error "Linux/MIPS pre-glibc2 not supported yet"
+ #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+
+-#elif defined(__arm__)
+-/* ARM/Linux */
++#elif defined(__arm__) && !defined(__ARM_EABI__)
++/* ARM/Linux (old-ABI) */
+ #if defined(__GLIBC__) && __GLIBC__ >= 2
+ #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
+ #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val))
+@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void);
+ #error "ARM/Linux pre-glibc2 not supported yet"
+ #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+
++#elif defined(__arm__) && defined(__ARM_EABI__)
++/* ARM/Linux (EABI) */
++#if defined(__GLIBC__) && __GLIBC__ >= 2
++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8]
++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val))
++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7])
++#define _MD_SP_TYPE __ptr_t
++#else
++#error "ARM/Linux pre-glibc2 not supported yet"
++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
++
+ #else
+
+ #error "Unknown CPU architecture"