Attachment #148279 for bug #193961




--- tests/mapper.c.orig	2014-10-06 14:46:27.000000000 -0400
+++ tests/mapper.c	2014-10-06 14:47:00.000000000 -0400
@@ -39,6 +39,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
 #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
 # define MAP_ANONYMOUS MAP_ANON
 #endif
+#if !defined(MAP_NORESERVE)
+# define MAP_NORESERVE 0
+#endif
 
 int
 main (void)

Line 0 Link Here

(-)devel/umem/files/patch-vmem_mmap.c (+11 lines)
	1	--- vmem_mmap.c.orig 2014-10-06 15:04:33.000000000 -0400
	2	+++ vmem_mmap.c 2014-10-06 15:08:36.000000000 -0400
	3	@@ -48,7 +48,7 @@
	4	#define FREE_PROT PROT_NONE
	5
	6	#define ALLOC_FLAGS MAP_PRIVATE \| MAP_ANON
	7	-#define FREE_FLAGS MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE
	8	+#define FREE_FLAGS MAP_PRIVATE \| MAP_ANON
	9
	10	#ifdef MAP_ALIGN
	11	#define CHUNKSIZE (641024) / 64 kilobytes */

Line 0 Link Here

(-)graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c (+11 lines)
	1	--- util/cairo-sphinx/sphinx.c.orig 2014-10-06 15:22:24.000000000 -0400
	2	+++ util/cairo-sphinx/sphinx.c 2014-10-06 15:23:04.000000000 -0400
	3	@@ -1325,7 +1325,7 @@ client_shm (const char *shm_path)
	4
	5	base = mmap (NULL, DATA_SIZE,
	6	PROT_READ \| PROT_WRITE,
	7	- MAP_SHARED \| MAP_NORESERVE,
	8	+ MAP_SHARED,
	9	fd, 0);
	10	close (fd);
	11

Lines 1442-1448 Link Here

(-)java/openjdk6/files/patch-set (-2 / +27 lines)
1442		1442
1443	// Add the appropriate client or server subdir	1443	// Add the appropriate client or server subdir
1444	len = strlen(buf);	1444	len = strlen(buf);
1445	@@ -2817,7 +2941,7 @@	1445	@@ -2752,7 +2876,7 @@
		1446	if (::write(fd, "", 1) == 1) {
		1447	mmap(base, size,
		1448	PROT_READ\|PROT_WRITE\|PROT_EXEC,
		1449	- MAP_PRIVATE\|MAP_FIXED\|MAP_NORESERVE, fd, 0);
		1450	+ MAP_PRIVATE\|MAP_FIXED, fd, 0);
		1451	}
		1452	}
		1453	::close(fd);
		1454	@@ -2815,7 +2939,7 @@
1446	}	1455	}
1447		1456
1448	void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {	1457	void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
Lines 1451-1457 Link Here
1451	}	1460	}
1452		1461
1453	void os::numa_make_global(char *addr, size_t bytes) {	1462	void os::numa_make_global(char *addr, size_t bytes) {
1454	@@ -2997,9 +3121,10 @@	1463	@@ -2962,7 +3086,7 @@
		1464	return ::mprotect(addr, size, PROT_NONE) == 0;
		1465	#else
		1466	uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
		1467	- MAP_PRIVATE\|MAP_FIXED\|MAP_NORESERVE\|MAP_ANONYMOUS, -1, 0);
		1468	+ MAP_PRIVATE\|MAP_FIXED\|MAP_ANONYMOUS, -1, 0);
		1469	return res != (uintptr_t) MAP_FAILED;
		1470	#endif
		1471	}
		1472	@@ -2989,15 +3113,16 @@
		1473	char * addr;
		1474	int flags;
		1475
		1476	- flags = MAP_PRIVATE \| MAP_NORESERVE \| MAP_ANONYMOUS;
		1477	+ flags = MAP_PRIVATE \| MAP_ANONYMOUS;
		1478	if (fixed) {
		1479	assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
1455	flags \|= MAP_FIXED;	1480	flags \|= MAP_FIXED;
1456	}	1481	}
1457		1482




$FreeBSD$

--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2014-10-06 17:10:00.000000000 -0400
+++ hotspot/src/os/bsd/vm/os_bsd.cpp	2014-10-08 10:23:14.000000000 -0400
@@ -458,7 +458,7 @@
  *        7: The default directories, normally /lib and /usr/lib.
  */
 #ifndef DEFAULT_LIBPATH
-#define DEFAULT_LIBPATH "/lib:/usr/lib"
+#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib"
 #endif
 
 #define EXTENSIONS_DIR  "/lib/ext"
@@ -2947,7 +2947,7 @@
       if (::write(fd, "", 1) == 1) {
         mmap(base, size,
              PROT_READ|PROT_WRITE|PROT_EXEC,
-             MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE, fd, 0);
+             MAP_PRIVATE|MAP_FIXED, fd, 0);
       }
     }
     ::close(fd);
@@ -3196,7 +3196,7 @@
   return ::mprotect(addr, size, PROT_NONE) == 0;
 #else
   uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
-                MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0);
+                MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
   return res  != (uintptr_t) MAP_FAILED;
 #endif
 }
@@ -3223,7 +3223,7 @@
   char * addr;
   int flags;
 
-  flags = MAP_PRIVATE | MAP_NORESERVE | MAP_ANONYMOUS;
+  flags = MAP_PRIVATE | MAP_ANONYMOUS;
   if (fixed) {
     assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
     flags |= MAP_FIXED;




   SEM_INIT(_semaphore, 0);
 }
 
@@ -2128,7 +2195,7 @@
       if (::write(fd, "", 1) == 1) {
         mmap(base, size,
              PROT_READ|PROT_WRITE|PROT_EXEC,
-             MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE, fd, 0);
+             MAP_PRIVATE|MAP_FIXED, fd, 0);
       }
     }
     ::close(fd);
@@ -2238,7 +2305,7 @@
   return ::mprotect(addr, size, PROT_NONE) == 0;
 #else
   uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
-                MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0);
+                MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
   return res  != (uintptr_t) MAP_FAILED;
 #endif
 }
@@ -2265,7 +2332,7 @@
   char * addr;
   int flags;
 
-  flags = MAP_PRIVATE | MAP_NORESERVE | MAP_ANONYMOUS;
+  flags = MAP_PRIVATE | MAP_ANONYMOUS;
   if (fixed) {
     assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
     flags |= MAP_FIXED;
@@ -2743,6 +2810,7 @@
   return OS_OK;
 #elif defined(__FreeBSD__)
   int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);




--- lisp-kernel/memory.c.orig	2014-10-08 10:40:13.000000000 -0400
+++ lisp-kernel/memory.c	2014-10-08 10:41:19.000000000 -0400
@@ -89,7 +89,7 @@ ReserveMemoryForHeap(LogicalAddress want
   start = mmap((void *)want,
 	       totalsize + heap_segment_size,
 	       PROT_NONE,
-	       MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+	       MAP_PRIVATE | MAP_ANON,
 	       -1,
 	       0);
   if (start == MAP_FAILED) {
@@ -99,7 +99,7 @@ ReserveMemoryForHeap(LogicalAddress want
   if (start != want) {
     munmap(start, totalsize+heap_segment_size);
     start = (void *)((((natural)start)+heap_segment_size-1) & ~(heap_segment_size-1));
-    if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE | MAP_ANON | MAP_FIXED | MAP_NORESERVE, -1, 0) != start) {
+    if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0) != start) {
       return NULL;
     }
   }
@@ -877,7 +877,7 @@ ReserveMemory(natural size)
                    PAGE_NOACCESS);
   return p;
 #else
-  p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE|MAP_ANON|MAP_NORESERVE,-1,0);
+  p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE|MAP_ANON,-1,0);
   if (p == MAP_FAILED) {
     return NULL;
   }




--- src/platform-freebsd.cc.orig	2014-10-08 11:14:11.000000000 -0400
+++ src/platform-freebsd.cc	2014-10-08 11:14:30.000000000 -0400
@@ -371,7 +371,7 @@ VirtualMemory::VirtualMemory(size_t size
   void* reservation = mmap(OS::GetRandomMmapAddr(),
                            request_size,
                            PROT_NONE,
-                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                           MAP_PRIVATE | MAP_ANON,
                            kMmapFd,
                            kMmapFdOffset);
   if (reservation == MAP_FAILED) return;
@@ -443,7 +443,7 @@ void* VirtualMemory::ReserveRegion(size_
   void* result = mmap(OS::GetRandomMmapAddr(),
                       size,
                       PROT_NONE,
-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                      MAP_PRIVATE | MAP_ANON,
                       kMmapFd,
                       kMmapFdOffset);
 
@@ -473,7 +473,7 @@ bool VirtualMemory::UncommitRegion(void*
   return mmap(base,
               size,
               PROT_NONE,
-              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
               kMmapFd,
               kMmapFdOffset) != MAP_FAILED;
 }




--- src/platform-freebsd.cc.orig	2014-06-03 04:52:11.000000000 -0400
+++ src/platform-freebsd.cc	2014-10-08 11:16:08.000000000 -0400
@@ -189,7 +189,7 @@ VirtualMemory::VirtualMemory(size_t size
   void* reservation = mmap(OS::GetRandomMmapAddr(),
                            request_size,
                            PROT_NONE,
-                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                           MAP_PRIVATE | MAP_ANON,
                            kMmapFd,
                            kMmapFdOffset);
   if (reservation == MAP_FAILED) return;
@@ -261,7 +261,7 @@ void* VirtualMemory::ReserveRegion(size_
   void* result = mmap(OS::GetRandomMmapAddr(),
                       size,
                       PROT_NONE,
-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                      MAP_PRIVATE | MAP_ANON,
                       kMmapFd,
                       kMmapFdOffset);
 
@@ -289,7 +289,7 @@ bool VirtualMemory::UncommitRegion(void*
   return mmap(base,
               size,
               PROT_NONE,
-              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
               kMmapFd,
               kMmapFdOffset) != MAP_FAILED;
 }




--- annoyance-filter.cc.orig	2004-08-04 16:28:36.000000000 -0400
+++ annoyance-filter.cc	2014-10-08 12:04:20.000000000 -0400
@@ -114,7 +114,7 @@
 #define __GNU_LIBRARY__
 #undef __GETOPT_H__

 #include "statlib.h" 
 
 /*237:*/
@@ -2675,7 +2675,7 @@
 fileLength= lseek(fileHandle,0,2);
 lseek(fileHandle,0,0);
 dp= static_cast<char*> (mmap((caddr_t)0,fileLength,
-PROT_READ,MAP_SHARED|MAP_NORESERVE,
+PROT_READ,MAP_SHARED,
 fileHandle,0));
 istrstream is(dp,fileLength);
 #else
@@ -7332,7 +7332,7 @@
 long fileLength= lseek(fileHandle,0,2);
 lseek(fileHandle,0,0);
 char*dp= static_cast<char*> (mmap((caddr_t)0,fileLength,
-PROT_READ,MAP_SHARED|MAP_NORESERVE,
+PROT_READ,MAP_SHARED,
 fileHandle,0));
 istrstream is(dp,fileLength);
 #else

Line 0 Link Here

(-)security/binwalk/files/patch-common.c (+11 lines)
	1	--- common.c.orig 2014-10-08 12:07:33.000000000 -0400
	2	+++ common.c 2014-10-08 12:07:45.000000000 -0400
	3	@@ -109,7 +109,7 @@
	4
	5	if(file_size > 0)
	6	{
	7	- buffer = mmap(NULL, file_size, PROT_READ, (MAP_SHARED \| MAP_NORESERVE), fd, 0);
	8	+ buffer = mmap(NULL, file_size, PROT_READ, MAP_SHARED, fd, 0);
	9	if(buffer == MAP_FAILED)
	10	{
	11	perror("mmap");




     } while (buffer[bytes_read] != '\n');
     buffer[bytes_read] = 0;
     // Ignore mappings that are not executable.
@@ -187,7 +187,7 @@
   void* reservation = mmap(OS::GetRandomMmapAddr(),
                            request_size,
                            PROT_NONE,
-                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                           MAP_PRIVATE | MAP_ANON,
                            kMmapFd,
                            kMmapFdOffset);
   if (reservation == MAP_FAILED) return;
@@ -259,7 +259,7 @@
   void* result = mmap(OS::GetRandomMmapAddr(),
                       size,
                       PROT_NONE,
-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                      MAP_PRIVATE | MAP_ANON,
                       kMmapFd,
                       kMmapFdOffset);
 
@@ -287,7 +287,7 @@
   return mmap(base,
               size,
               PROT_NONE,
-              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
               kMmapFd,
               kMmapFdOffset) != MAP_FAILED;
 }




--- deps/v8/src/platform-freebsd.cc.orig	2014-09-16 18:47:52.000000000 -0400
+++ deps/v8/src/platform-freebsd.cc	2014-10-08 13:23:25.000000000 -0400
@@ -343,7 +343,7 @@
   void* reservation = mmap(OS::GetRandomMmapAddr(),
                            request_size,
                            PROT_NONE,
-                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                           MAP_PRIVATE | MAP_ANON,
                            kMmapFd,
                            kMmapFdOffset);
   if (reservation == MAP_FAILED) return;
@@ -415,7 +415,7 @@
   void* result = mmap(OS::GetRandomMmapAddr(),
                       size,
                       PROT_NONE,
-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                      MAP_PRIVATE | MAP_ANON,
                       kMmapFd,
                       kMmapFdOffset);
 
@@ -445,7 +445,7 @@
   return mmap(base,
               size,
               PROT_NONE,
-              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
               kMmapFd,
               kMmapFdOffset) != MAP_FAILED;
 }




--- deps/v8/src/platform-freebsd.cc.orig	2014-05-01 20:49:51.000000000 -0400
+++ deps/v8/src/platform-freebsd.cc	2014-10-08 13:34:09.000000000 -0400
@@ -213,7 +213,7 @@
   void* reservation = mmap(OS::GetRandomMmapAddr(),
                            request_size,
                            PROT_NONE,
-                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                           MAP_PRIVATE | MAP_ANON,
                            kMmapFd,
                            kMmapFdOffset);
   if (reservation == MAP_FAILED) return;
@@ -285,7 +285,7 @@
   void* result = mmap(OS::GetRandomMmapAddr(),
                       size,
                       PROT_NONE,
-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                      MAP_PRIVATE | MAP_ANON,
                       kMmapFd,
                       kMmapFdOffset);
 
@@ -313,7 +313,7 @@
   return mmap(base,
               size,
               PROT_NONE,
-              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
               kMmapFd,
               kMmapFdOffset) != MAP_FAILED;
 }

Line 0 Link Here

(-)www/trafficserver/files/patch-lib__ts__Compatability.h (+11 lines)
	1	--- lib/ts/Compatability.h.orig 2014-10-08 13:41:39.000000000 -0400
	2	+++ lib/ts/Compatability.h 2014-10-08 13:42:29.000000000 -0400
	3	@@ -55,7 +55,7 @@
	4	#if defined(linux)
	5	#define NEED_ALTZONE_DEFINED
	6	#define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
	7	-#elif defined(darwin)
	8	+#elif defined(darwin) \|\| defined(__FreeBSD__)
	9	#define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
	10	#elif defined(solaris)
	11	#define NEED_ALTZONE_DEFINED

Line 0 Link Here

(-)www/trafficserver/files/patch-tools__jtest__jtest.cc (+11 lines)
	1	--- tools/jtest/jtest.cc.orig 2014-10-08 13:50:58.000000000 -0400
	2	+++ tools/jtest/jtest.cc 2014-10-08 13:51:12.000000000 -0400
	3	@@ -2689,7 +2689,7 @@
	4	ink_assert( !ftruncate(fd,numbytes) );
	5	bytes = (unsigned char *)
	6	mmap(NULL,numbytes,PROT_READ\|PROT_WRITE,
	7	- MAP_SHARED\|MAP_NORESERVE,
	8	+ MAP_SHARED,
	9	fd, 0);
	10	if (bytes == (unsigned char*)MAP_FAILED \|\| !bytes)
	11	panic("unable to map URL Hash file\n");

Return to bug 193961

Line 0 Link Here

(-)devel/libunwind/files/patch-tests-mapper.c (+12 lines)
	1	--- tests/mapper.c.orig 2014-10-06 14:46:27.000000000 -0400
	2	+++ tests/mapper.c 2014-10-06 14:47:00.000000000 -0400
	3	@@ -39,6 +39,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
	4	#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
	5	# define MAP_ANONYMOUS MAP_ANON
	6	#endif
	7	+#if !defined(MAP_NORESERVE)
	8	+# define MAP_NORESERVE 0
	9	+#endif
	10
	11	int
	12	main (void)

Lines 1-13 Link Here

(-)java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp (-4 / +31 lines)
1	$FreeBSD$	1	$FreeBSD$
2		2
3	--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2010-02-21 20:07:54.000000000 -0800	3	--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-10-06 17:10:00.000000000 -0400
4	+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2010-02-21 20:08:41.000000000 -0800	4	+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2014-10-08 10:23:14.000000000 -0400
5	@@ -358,7 +358,7 @@	5	@@ -458,7 +458,7 @@
6	* 7: The default directories, normally /lib and /usr/lib.	6	* 7: The default directories, normally /lib and /usr/lib.
7	*/	7	*/
8	#ifndef DEFAULT_LIBPATH	8	#ifndef DEFAULT_LIBPATH
9	-#define DEFAULT_LIBPATH "/lib:/usr/lib"	9	-#define DEFAULT_LIBPATH "/lib:/usr/lib"
10	+#define DEFAULT_LIBPATH "/lib:/usr/lib:%%LOCALBASE%%/lib"	10	+#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib"
11	#endif	11	#endif
12		12
13	#define EXTENSIONS_DIR "/lib/ext"	13	#define EXTENSIONS_DIR "/lib/ext"
		14	@@ -2947,7 +2947,7 @@
		15	if (::write(fd, "", 1) == 1) {
		16	mmap(base, size,
		17	PROT_READ\|PROT_WRITE\|PROT_EXEC,
		18	- MAP_PRIVATE\|MAP_FIXED\|MAP_NORESERVE, fd, 0);
		19	+ MAP_PRIVATE\|MAP_FIXED, fd, 0);
		20	}
		21	}
		22	::close(fd);
		23	@@ -3196,7 +3196,7 @@
		24	return ::mprotect(addr, size, PROT_NONE) == 0;
		25	#else
		26	uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
		27	- MAP_PRIVATE\|MAP_FIXED\|MAP_NORESERVE\|MAP_ANONYMOUS, -1, 0);
		28	+ MAP_PRIVATE\|MAP_FIXED\|MAP_ANONYMOUS, -1, 0);
		29	return res != (uintptr_t) MAP_FAILED;
		30	#endif
		31	}
		32	@@ -3223,7 +3223,7 @@
		33	char * addr;
		34	int flags;
		35
		36	- flags = MAP_PRIVATE \| MAP_NORESERVE \| MAP_ANONYMOUS;
		37	+ flags = MAP_PRIVATE \| MAP_ANONYMOUS;
		38	if (fixed) {
		39	assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
		40	flags \|= MAP_FIXED;

Lines 941-947 Link Here

(-)java/openjdk8/files/patch-bsd (-1 / +28 lines)
941	SEM_INIT(_semaphore, 0);	941	SEM_INIT(_semaphore, 0);
942	}	942	}
943		943
944	@@ -2746,6 +2813,7 @@	944	@@ -2128,7 +2195,7 @@
		945	if (::write(fd, "", 1) == 1) {
		946	mmap(base, size,
		947	PROT_READ\|PROT_WRITE\|PROT_EXEC,
		948	- MAP_PRIVATE\|MAP_FIXED\|MAP_NORESERVE, fd, 0);
		949	+ MAP_PRIVATE\|MAP_FIXED, fd, 0);
		950	}
		951	}
		952	::close(fd);
		953	@@ -2238,7 +2305,7 @@
		954	return ::mprotect(addr, size, PROT_NONE) == 0;
		955	#else
		956	uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
		957	- MAP_PRIVATE\|MAP_FIXED\|MAP_NORESERVE\|MAP_ANONYMOUS, -1, 0);
		958	+ MAP_PRIVATE\|MAP_FIXED\|MAP_ANONYMOUS, -1, 0);
		959	return res != (uintptr_t) MAP_FAILED;
		960	#endif
		961	}
		962	@@ -2265,7 +2332,7 @@
		963	char * addr;
		964	int flags;
		965
		966	- flags = MAP_PRIVATE \| MAP_NORESERVE \| MAP_ANONYMOUS;
		967	+ flags = MAP_PRIVATE \| MAP_ANONYMOUS;
		968	if (fixed) {
		969	assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
		970	flags \|= MAP_FIXED;
		971	@@ -2743,6 +2810,7 @@
945	return OS_OK;	972	return OS_OK;
946	#elif defined(__FreeBSD__)	973	#elif defined(__FreeBSD__)
947	int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);	974	int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);

Line 0 Link Here

(-)lang/ccl/files/patch-lisp-kernel_memory.c (+29 lines)
	1	--- lisp-kernel/memory.c.orig 2014-10-08 10:40:13.000000000 -0400
	2	+++ lisp-kernel/memory.c 2014-10-08 10:41:19.000000000 -0400
	3	@@ -89,7 +89,7 @@ ReserveMemoryForHeap(LogicalAddress want
	4	start = mmap((void *)want,
	5	totalsize + heap_segment_size,
	6	PROT_NONE,
	7	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	8	+ MAP_PRIVATE \| MAP_ANON,
	9	-1,
	10	0);
	11	if (start == MAP_FAILED) {
	12	@@ -99,7 +99,7 @@ ReserveMemoryForHeap(LogicalAddress want
	13	if (start != want) {
	14	munmap(start, totalsize+heap_segment_size);
	15	start = (void *)((((natural)start)+heap_segment_size-1) & ~(heap_segment_size-1));
	16	- if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE \| MAP_ANON \| MAP_FIXED \| MAP_NORESERVE, -1, 0) != start) {
	17	+ if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE \| MAP_ANON \| MAP_FIXED, -1, 0) != start) {
	18	return NULL;
	19	}
	20	}
	21	@@ -877,7 +877,7 @@ ReserveMemory(natural size)
	22	PAGE_NOACCESS);
	23	return p;
	24	#else
	25	- p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE\|MAP_ANON\|MAP_NORESERVE,-1,0);
	26	+ p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE\|MAP_ANON,-1,0);
	27	if (p == MAP_FAILED) {
	28	return NULL;
	29	}

Line 0 Link Here

(-)lang/v8/files/patch-src_platform-freebsd.cc (+29 lines)
	1	--- src/platform-freebsd.cc.orig 2014-10-08 11:14:11.000000000 -0400
	2	+++ src/platform-freebsd.cc 2014-10-08 11:14:30.000000000 -0400
	3	@@ -371,7 +371,7 @@ VirtualMemory::VirtualMemory(size_t size
	4	void* reservation = mmap(OS::GetRandomMmapAddr(),
	5	request_size,
	6	PROT_NONE,
	7	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	8	+ MAP_PRIVATE \| MAP_ANON,
	9	kMmapFd,
	10	kMmapFdOffset);
	11	if (reservation == MAP_FAILED) return;
	12	@@ -443,7 +443,7 @@ void* VirtualMemory::ReserveRegion(size_
	13	void* result = mmap(OS::GetRandomMmapAddr(),
	14	size,
	15	PROT_NONE,
	16	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	17	+ MAP_PRIVATE \| MAP_ANON,
	18	kMmapFd,
	19	kMmapFdOffset);
	20
	21	@@ -473,7 +473,7 @@ bool VirtualMemory::UncommitRegion(void*
	22	return mmap(base,
	23	size,
	24	PROT_NONE,
	25	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE \| MAP_FIXED,
	26	+ MAP_PRIVATE \| MAP_ANON \| MAP_FIXED,
	27	kMmapFd,
	28	kMmapFdOffset) != MAP_FAILED;
	29	}

Line 0 Link Here

(-)lang/v8-devel/files/patch-src_platform-freebsd.cc (+29 lines)
	1	--- src/platform-freebsd.cc.orig 2014-06-03 04:52:11.000000000 -0400
	2	+++ src/platform-freebsd.cc 2014-10-08 11:16:08.000000000 -0400
	3	@@ -189,7 +189,7 @@ VirtualMemory::VirtualMemory(size_t size
	4	void* reservation = mmap(OS::GetRandomMmapAddr(),
	5	request_size,
	6	PROT_NONE,
	7	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	8	+ MAP_PRIVATE \| MAP_ANON,
	9	kMmapFd,
	10	kMmapFdOffset);
	11	if (reservation == MAP_FAILED) return;
	12	@@ -261,7 +261,7 @@ void* VirtualMemory::ReserveRegion(size_
	13	void* result = mmap(OS::GetRandomMmapAddr(),
	14	size,
	15	PROT_NONE,
	16	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	17	+ MAP_PRIVATE \| MAP_ANON,
	18	kMmapFd,
	19	kMmapFdOffset);
	20
	21	@@ -289,7 +289,7 @@ bool VirtualMemory::UncommitRegion(void*
	22	return mmap(base,
	23	size,
	24	PROT_NONE,
	25	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE \| MAP_FIXED,
	26	+ MAP_PRIVATE \| MAP_ANON \| MAP_FIXED,
	27	kMmapFd,
	28	kMmapFdOffset) != MAP_FAILED;
	29	}

Lines 1-5 Link Here

(-)mail/annoyance-filter/files/patch-annoyance-filter.cc (-2 / +20 lines)
1	--- annoyance-filter.cc.orig Thu Sep 25 01:56:54 2003	1	--- annoyance-filter.cc.orig 2004-08-04 16:28:36.000000000 -0400
2	+++ annoyance-filter.cc Fri Jan 2 02:51:57 2004	2	+++ annoyance-filter.cc 2014-10-08 12:04:20.000000000 -0400
3	@@ -114,7 +114,7 @@	3	@@ -114,7 +114,7 @@
4	#define __GNU_LIBRARY__	4	#define __GNU_LIBRARY__
5	#undef __GETOPT_H__	5	#undef __GETOPT_H__
Lines 9-11 Link Here
9	#include "statlib.h"	9	#include "statlib.h"
10		10
11	/237:/	11	/237:/
		12	@@ -2675,7 +2675,7 @@
		13	fileLength= lseek(fileHandle,0,2);
		14	lseek(fileHandle,0,0);
		15	dp= static_cast<char*> (mmap((caddr_t)0,fileLength,
		16	-PROT_READ,MAP_SHARED\|MAP_NORESERVE,
		17	+PROT_READ,MAP_SHARED,
		18	fileHandle,0));
		19	istrstream is(dp,fileLength);
		20	#else
		21	@@ -7332,7 +7332,7 @@
		22	long fileLength= lseek(fileHandle,0,2);
		23	lseek(fileHandle,0,0);
		24	chardp= static_cast<char> (mmap((caddr_t)0,fileLength,
		25	-PROT_READ,MAP_SHARED\|MAP_NORESERVE,
		26	+PROT_READ,MAP_SHARED,
		27	fileHandle,0));
		28	istrstream is(dp,fileLength);
		29	#else

Lines 32-34 Link Here

(-)www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc (+27 lines)
32	} while (buffer[bytes_read] != '\n');	32	} while (buffer[bytes_read] != '\n');
33	buffer[bytes_read] = 0;	33	buffer[bytes_read] = 0;
34	// Ignore mappings that are not executable.	34	// Ignore mappings that are not executable.
		35	@@ -187,7 +187,7 @@
		36	void* reservation = mmap(OS::GetRandomMmapAddr(),
		37	request_size,
		38	PROT_NONE,
		39	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
		40	+ MAP_PRIVATE \| MAP_ANON,
		41	kMmapFd,
		42	kMmapFdOffset);
		43	if (reservation == MAP_FAILED) return;
		44	@@ -259,7 +259,7 @@
		45	void* result = mmap(OS::GetRandomMmapAddr(),
		46	size,
		47	PROT_NONE,
		48	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
		49	+ MAP_PRIVATE \| MAP_ANON,
		50	kMmapFd,
		51	kMmapFdOffset);
		52
		53	@@ -287,7 +287,7 @@
		54	return mmap(base,
		55	size,
		56	PROT_NONE,
		57	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE \| MAP_FIXED,
		58	+ MAP_PRIVATE \| MAP_ANON \| MAP_FIXED,
		59	kMmapFd,
		60	kMmapFdOffset) != MAP_FAILED;
		61	}

Line 0 Link Here

(-)www/node/files/patch-deps_v8_src_platform-freebsd.cc (+29 lines)
	1	--- deps/v8/src/platform-freebsd.cc.orig 2014-09-16 18:47:52.000000000 -0400
	2	+++ deps/v8/src/platform-freebsd.cc 2014-10-08 13:23:25.000000000 -0400
	3	@@ -343,7 +343,7 @@
	4	void* reservation = mmap(OS::GetRandomMmapAddr(),
	5	request_size,
	6	PROT_NONE,
	7	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	8	+ MAP_PRIVATE \| MAP_ANON,
	9	kMmapFd,
	10	kMmapFdOffset);
	11	if (reservation == MAP_FAILED) return;
	12	@@ -415,7 +415,7 @@
	13	void* result = mmap(OS::GetRandomMmapAddr(),
	14	size,
	15	PROT_NONE,
	16	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	17	+ MAP_PRIVATE \| MAP_ANON,
	18	kMmapFd,
	19	kMmapFdOffset);
	20
	21	@@ -445,7 +445,7 @@
	22	return mmap(base,
	23	size,
	24	PROT_NONE,
	25	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE \| MAP_FIXED,
	26	+ MAP_PRIVATE \| MAP_ANON \| MAP_FIXED,
	27	kMmapFd,
	28	kMmapFdOffset) != MAP_FAILED;
	29	}

Line 0 Link Here

(-)www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc (+29 lines)
	1	--- deps/v8/src/platform-freebsd.cc.orig 2014-05-01 20:49:51.000000000 -0400
	2	+++ deps/v8/src/platform-freebsd.cc 2014-10-08 13:34:09.000000000 -0400
	3	@@ -213,7 +213,7 @@
	4	void* reservation = mmap(OS::GetRandomMmapAddr(),
	5	request_size,
	6	PROT_NONE,
	7	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	8	+ MAP_PRIVATE \| MAP_ANON,
	9	kMmapFd,
	10	kMmapFdOffset);
	11	if (reservation == MAP_FAILED) return;
	12	@@ -285,7 +285,7 @@
	13	void* result = mmap(OS::GetRandomMmapAddr(),
	14	size,
	15	PROT_NONE,
	16	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
	17	+ MAP_PRIVATE \| MAP_ANON,
	18	kMmapFd,
	19	kMmapFdOffset);
	20
	21	@@ -313,7 +313,7 @@
	22	return mmap(base,
	23	size,
	24	PROT_NONE,
	25	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE \| MAP_FIXED,
	26	+ MAP_PRIVATE \| MAP_ANON \| MAP_FIXED,
	27	kMmapFd,
	28	kMmapFdOffset) != MAP_FAILED;
	29	}