diff options
| author | martin <martin@pkgsrc.org> | 2014-04-10 07:33:59 +0000 |
|---|---|---|
| committer | martin <martin@pkgsrc.org> | 2014-04-10 07:33:59 +0000 |
| commit | 9963a96c6fd9841398abc6fff1bd9021cfbf146b (patch) | |
| tree | 0f5901c08c41da7e3775bfc821d8c78896a96c53 /www | |
| parent | 199c98d86e0ffaddf4f5b0acdc3c115fc7d2bbf8 (diff) | |
| download | pkgsrc-9963a96c6fd9841398abc6fff1bd9021cfbf146b.tar.gz | |
Make the custom memory allocator in the JS engine deal with sparc64
TOPDOWN_VM (already reported upstream).
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox/Makefile | 4 | ||||
| -rw-r--r-- | www/firefox/distinfo | 3 | ||||
| -rw-r--r-- | www/firefox/patches/patch-js_src_gc_Memory.cpp | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 4942d36c2e7..cfd5e8b6ff7 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.157 2014/04/09 07:27:17 obache Exp $ +# $NetBSD: Makefile,v 1.158 2014/04/10 07:33:59 martin Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 28.0 @@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR= DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 23488263c36..44298dde5a1 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.135 2014/03/30 01:03:22 ryoon Exp $ +$NetBSD: distinfo,v 1.136 2014/04/10 07:33:59 martin Exp $ SHA1 (firefox-28.0.source.tar.bz2) = f78517836ceca0cd2a0d3db1f282985c616e3fae RMD160 (firefox-28.0.source.tar.bz2) = 71124b36dca319eaa0de268ce4f6133f0ceca4f9 @@ -77,6 +77,7 @@ SHA1 (patch-js_src_Makefile.in) = f6ce5f02a9292e3e524424c5e810850232efe524 SHA1 (patch-js_src_config_system-headers) = db1389af40dc0386ed8c3491a377668f5d29b6a1 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc +SHA1 (patch-js_src_gc_Memory.cpp) = 3db31553ec6f7b1fac4fd4ce11b77be1ea4208b8 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9 SHA1 (patch-mb) = b661abce429a88554fca6c930b4dbf71ba6bb5cb SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 5ef0de0ac875334e959ff0d4bfa43a2e5ab087b9 diff --git a/www/firefox/patches/patch-js_src_gc_Memory.cpp b/www/firefox/patches/patch-js_src_gc_Memory.cpp new file mode 100644 index 00000000000..b49412da1d4 --- /dev/null +++ b/www/firefox/patches/patch-js_src_gc_Memory.cpp @@ -0,0 +1,20 @@ +$NetBSD: patch-js_src_gc_Memory.cpp,v 1.1 2014/04/10 07:33:59 martin Exp $ + +Make sure mmap() delivers memory with upper 17 bits clear on sparc64 on NetBSD: +with topdown-vm we would map in the last 4 gig of the address space (past +the VA hole) otherwise by default, thus busting the JSValue restrictions. + +https://bugzilla.mozilla.org/show_bug.cgi?id=994133 + + +--- js/src/gc/Memory.cpp.orig 2014-04-09 20:42:54.000000000 +0200 ++++ js/src/gc/Memory.cpp 2014-04-09 20:38:34.000000000 +0200 +@@ -312,7 +312,7 @@ gc::InitMemorySubsystem(JSRuntime *rt) + static inline void * + MapMemory(size_t length, int prot, int flags, int fd, off_t offset) + { +-#if defined(__ia64__) ++#if defined(__ia64__) || (defined(__sparc64__) && defined(__NetBSD__)) + /* + * The JS engine assumes that all allocated pointers have their high 17 bits clear, + * which ia64's mmap doesn't support directly. However, we can emulate it by passing |