Import of pkgsrc-2015Q2

www/firefox31/patches/patch-js_src_gc_Memory.cpp

@@ -1,4 +1,4 @@
-$NetBSD: patch-js_src_gc_Memory.cpp,v 1.1 2014/11/03 12:18:32 ryoon Exp $
+$NetBSD: patch-js_src_gc_Memory.cpp,v 1.2 2015/05/26 12:18:23 ryoon 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
@@ -7,10 +7,10 @@ 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 *
+--- js/src/gc/Memory.cpp.orig	2015-05-05 02:53:53.000000000 +0000
++++ js/src/gc/Memory.cpp
+@@ -212,7 +212,7 @@ gc::InitMemorySubsystem(JSRuntime* rt)
+ static inline void*
  MapMemory(size_t length, int prot, int flags, int fd, off_t offset)
  {
 -#if defined(__ia64__)