mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-07 11:49:40 +00:00
Code Issues Releases Activity

Fix build on recent head by removing references to the MAP_NORESERVE

Browse Source 
flag to mmap(2). It has never been implemented in FreeBSD and thus
was being ignored before anyway.

No functional change, so no PORTREVISION bump.

PR:	193961 (related)
This commit is contained in:
Guido Falsi 2014-12-09 14:06:58 +00:00
parent be5c138c78
commit 86c89fea9b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=374392
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
games/0ad/files/patch-source_lib_allocators_page__aligned.cpp Normal file
View File

@ -0,0 +1,20 @@
--- source/lib/allocators/page_aligned.cpp.orig 2011-05-03 12:38:42 UTC
+++ source/lib/allocators/page_aligned.cpp
@@ -49,7 +49,7 @@ static const int mmap_flags = MAP_PRIVAT
Status mem_Reserve(size_t size, u8** pp)
{
errno = 0;
- void* ret = mmap(0, size, PROT_NONE, mmap_flags|MAP_NORESERVE, -1, 0);
+ void* ret = mmap(0, size, PROT_NONE, mmap_flags, -1, 0);
*pp = (u8*)ret;
return StatusFromMap(ret);
}
@@ -76,7 +76,7 @@ Status mem_Commit(u8* p, size_t size, in
Status mem_Decommit(u8* p, size_t size)
{
errno = 0;
- void* ret = mmap(p, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0);
+ void* ret = mmap(p, size, PROT_NONE, mmap_flags|MAP_FIXED, -1, 0);
return StatusFromMap(ret);
}

20
games/0ad/files/patch-source_lib_sysdep_os_unix_uvm.cpp Normal file
View File

@ -0,0 +1,20 @@
--- source/lib/sysdep/os/unix/uvm.cpp.orig 2013-12-06 00:42:50 UTC
+++ source/lib/sysdep/os/unix/uvm.cpp
@@ -40,7 +40,7 @@ namespace vm {
void* ReserveAddressSpace(size_t size, size_t UNUSED(commitSize), PageType UNUSED(pageType), int UNUSED(prot))
{
errno = 0;
- void* p = mmap(0, size, PROT_NONE, mmap_flags|MAP_NORESERVE, -1, 0);
+ void* p = mmap(0, size, PROT_NONE, mmap_flags, -1, 0);
if(p == MAP_FAILED)
return 0;
return p;
@@ -77,7 +77,7 @@ bool Commit(uintptr_t address, size_t si
bool Decommit(uintptr_t address, size_t size)
{
errno = 0;
- if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_NORESERVE|MAP_FIXED, -1, 0) == MAP_FAILED)
+ if(mmap((void*)address, size, PROT_NONE, mmap_flags|MAP_FIXED, -1, 0) == MAP_FAILED)
return false;
return true;
}