diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-05-09 10:39:10 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-05-09 10:39:10 +0000 |
| commit | ff0fe2be89778bf06ba0287911eac31c141be415 (patch) | |
| tree | 434c9872c2c522fec9dfa616284d9b130b7cfe4d /meta/packages/mozilla/files | |
| parent | 79efb6c8b3e9926d8ba591391bfc8b9e58c39896 (diff) | |
| download | poky-ff0fe2be89778bf06ba0287911eac31c141be415.tar.gz | |
minimo: added 0.016 version with EABI patches - works in qemuarm
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1622 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/mozilla/files')
| -rw-r--r-- | meta/packages/mozilla/files/eabi-fix.patch | 66 | ||||
| -rw-r--r-- | meta/packages/mozilla/files/eabi-fix2.patch | 56 | ||||
| -rw-r--r-- | meta/packages/mozilla/files/eabi-fix3.patch | 15 |
3 files changed, 137 insertions, 0 deletions
diff --git a/meta/packages/mozilla/files/eabi-fix.patch b/meta/packages/mozilla/files/eabi-fix.patch new file mode 100644 index 0000000000..fd3bb88683 --- /dev/null +++ b/meta/packages/mozilla/files/eabi-fix.patch | |||
| @@ -0,0 +1,66 @@ | |||
| 1 | http://lists.debian.org/debian-arm/2007/05/msg00039.html | ||
| 2 | |||
| 3 | From: Lennert Buytenhek <buytenh@wantstofly.org> | ||
| 4 | |||
| 5 | Hi, | ||
| 6 | |||
| 7 | The reason that building nss (i.e., firefox) would segfault on ARM EABI | ||
| 8 | systems is an assumption about the layout of the jmp_buf structure in | ||
| 9 | the nspr library (which nss depends on) that does hold on old-ABI but | ||
| 10 | no longer holds on EABI. The attached patch fixes this assumption, | ||
| 11 | and fixes the shlibsign segfault during the building of nss (it also | ||
| 12 | fixes a floating point byte order assumption.) | ||
| 13 | |||
| 14 | Looks sane? | ||
| 15 | |||
| 16 | It's of course a stupid idea to depend on a particular layout of the | ||
| 17 | jmp_buf structure in application programs, but oh well. People write | ||
| 18 | ugly buggy code, film at 11. | ||
| 19 | |||
| 20 | |||
| 21 | --- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig 2007-05-06 02:39:00.000000000 +0200 | ||
| 22 | +++ mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-06 02:39:22.000000000 +0200 | ||
| 23 | @@ -59,8 +59,8 @@ | ||
| 24 | /* FIXME: deal with freelist and p5s. */ | ||
| 25 | } | ||
| 26 | |||
| 27 | -#if defined(__arm) || defined(__arm__) || defined(__arm26__) \ | ||
| 28 | - || defined(__arm32__) | ||
| 29 | +#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \ | ||
| 30 | + || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__) | ||
| 31 | #define IEEE_ARM | ||
| 32 | #elif defined(IS_LITTLE_ENDIAN) | ||
| 33 | #define IEEE_8087 | ||
| 34 | --- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-05-06 02:39:45.000000000 +0200 | ||
| 35 | +++ mozilla/nsprpub/pr/include/md/_linux.h 2007-05-06 02:40:57.000000000 +0200 | ||
| 36 | @@ -346,7 +346,7 @@ | ||
| 37 | #error "Linux/MIPS pre-glibc2 not supported yet" | ||
| 38 | #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ | ||
| 39 | |||
| 40 | -#elif defined(__arm__) | ||
| 41 | +#elif defined(__arm__) && !defined(__ARM_EABI__) | ||
| 42 | /* ARM/Linux */ | ||
| 43 | #if defined(__GLIBC__) && __GLIBC__ >= 2 | ||
| 44 | #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] | ||
| 45 | @@ -358,6 +358,18 @@ | ||
| 46 | #error "ARM/Linux pre-glibc2 not supported yet" | ||
| 47 | #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ | ||
| 48 | |||
| 49 | +#elif defined(__arm__) && defined(__ARM_EABI__) | ||
| 50 | +/* ARM/Linux */ | ||
| 51 | +#if defined(__GLIBC__) && __GLIBC__ >= 2 | ||
| 52 | +#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] | ||
| 53 | +#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) | ||
| 54 | +#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) | ||
| 55 | +#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) | ||
| 56 | +#define _MD_SP_TYPE __ptr_t | ||
| 57 | +#else | ||
| 58 | +#error "ARM/Linux pre-glibc2 not supported yet" | ||
| 59 | +#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ | ||
| 60 | + | ||
| 61 | #else | ||
| 62 | |||
| 63 | #error "Unknown CPU architecture" | ||
| 64 | |||
| 65 | |||
| 66 | |||
diff --git a/meta/packages/mozilla/files/eabi-fix2.patch b/meta/packages/mozilla/files/eabi-fix2.patch new file mode 100644 index 0000000000..5f64e7f796 --- /dev/null +++ b/meta/packages/mozilla/files/eabi-fix2.patch | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | https://bugzilla.mozilla.org/show_bug.cgi?id=369722 | ||
| 2 | |||
| 3 | Index: js/src/jsnum.h | ||
| 4 | =================================================================== | ||
| 5 | RCS file: /cvsroot/mozilla/js/src/jsnum.h,v | ||
| 6 | retrieving revision 3.27 | ||
| 7 | diff -p -u -8 -r3.27 jsnum.h | ||
| 8 | --- mozilla/js/src/jsnum.h 21 Dec 2006 01:00:32 -0000 3.27 | ||
| 9 | +++ mozilla/js/src/jsnum.h 8 Feb 2007 12:13:01 -0000 | ||
| 10 | @@ -52,23 +52,24 @@ JS_BEGIN_EXTERN_C | ||
| 11 | |||
| 12 | /* | ||
| 13 | * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports: | ||
| 14 | * ARM is a little endian architecture but 64 bit double words are stored | ||
| 15 | * differently: the 32 bit words are in little endian byte order, the two words | ||
| 16 | * are stored in big endian`s way. | ||
| 17 | */ | ||
| 18 | |||
| 19 | -#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) | ||
| 20 | -#define CPU_IS_ARM | ||
| 21 | +#if !defined(__ARM_EABI__) && \ | ||
| 22 | + (defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)) | ||
| 23 | +#define IEEE_ARM | ||
| 24 | #endif | ||
| 25 | |||
| 26 | typedef union jsdpun { | ||
| 27 | struct { | ||
| 28 | -#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) | ||
| 29 | +#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM) | ||
| 30 | uint32 lo, hi; | ||
| 31 | #else | ||
| 32 | uint32 hi, lo; | ||
| 33 | #endif | ||
| 34 | } s; | ||
| 35 | jsdouble d; | ||
| 36 | } jsdpun; | ||
| 37 | |||
| 38 | @@ -87,17 +88,17 @@ typedef union jsdpun { | ||
| 39 | |||
| 40 | #else /* not or old GNUC */ | ||
| 41 | |||
| 42 | /* | ||
| 43 | * We don't know of any non-gcc compilers that perform alias optimization, | ||
| 44 | * so this code should work. | ||
| 45 | */ | ||
| 46 | |||
| 47 | -#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) | ||
| 48 | +#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM) | ||
| 49 | #define JSDOUBLE_HI32(x) (((uint32 *)&(x))[1]) | ||
| 50 | #define JSDOUBLE_LO32(x) (((uint32 *)&(x))[0]) | ||
| 51 | #else | ||
| 52 | #define JSDOUBLE_HI32(x) (((uint32 *)&(x))[0]) | ||
| 53 | #define JSDOUBLE_LO32(x) (((uint32 *)&(x))[1]) | ||
| 54 | #endif | ||
| 55 | |||
| 56 | #define JSDOUBLE_SET_HI32(x, y) (JSDOUBLE_HI32(x)=(y)) | ||
diff --git a/meta/packages/mozilla/files/eabi-fix3.patch b/meta/packages/mozilla/files/eabi-fix3.patch new file mode 100644 index 0000000000..8bf8c2f4da --- /dev/null +++ b/meta/packages/mozilla/files/eabi-fix3.patch | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | From: Marcin Juszkiewicz <openembedded@hrw.one.pl> | ||
| 2 | |||
| 3 | Index: mozilla/extensions/transformiix/source/base/Double.cpp | ||
| 4 | =================================================================== | ||
| 5 | --- mozilla.orig/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:21:34.000000000 +0200 | ||
| 6 | +++ mozilla/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:23:59.000000000 +0200 | ||
| 7 | @@ -71,7 +71,7 @@ | ||
| 8 | * are stored in big endian`s way. | ||
| 9 | */ | ||
| 10 | |||
| 11 | -#if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__) | ||
| 12 | +#if !defined(__ARM_EABI__) && defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__) | ||
| 13 | #define CPU_IS_ARM | ||
| 14 | #endif | ||
| 15 | |||
