From 89bf0f4b179f8c896b06e969ed97d4102b1ce904 Mon Sep 17 00:00:00 2001 From: Alejandro Pulver Date: Sun, 10 Aug 2008 14:44:03 +0000 Subject: [PATCH] - Fix building of VM on i386 and amd64. Reported by: QA Tindy --- .../files/patch-code__qcommon__vm_x86.c | 20 +++++++++++++++++++ .../files/patch-code__qcommon__vm_x86_64.c | 11 ++++++++++ 2 files changed, 31 insertions(+) create mode 100644 games/worldofpadman/files/patch-code__qcommon__vm_x86.c create mode 100644 games/worldofpadman/files/patch-code__qcommon__vm_x86_64.c diff --git a/games/worldofpadman/files/patch-code__qcommon__vm_x86.c b/games/worldofpadman/files/patch-code__qcommon__vm_x86.c new file mode 100644 index 000000000000..071fbedb9723 --- /dev/null +++ b/games/worldofpadman/files/patch-code__qcommon__vm_x86.c @@ -0,0 +1,20 @@ +--- code/qcommon/vm_x86.c.orig 2007-10-30 12:26:20.000000000 -0300 ++++ code/qcommon/vm_x86.c 2008-08-10 11:36:02.000000000 -0300 +@@ -36,7 +36,7 @@ + + /* need this on NX enabled systems (i386 with PAE kernel or + * noexec32=on x86_64) */ +-#ifdef __linux__ ++#ifdef __unix__ + #define VM_X86_MMAP + #endif + +@@ -1079,7 +1079,7 @@ + // copy to an exact size buffer on the hunk + vm->codeLength = compiledOfs; + #ifdef VM_X86_MMAP +- vm->codeBase = mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANONYMOUS, -1, 0); ++ vm->codeBase = mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0); + if(vm->codeBase == (void*)-1) + Com_Error(ERR_DROP, "VM_CompileX86: can't mmap memory"); + #elif _WIN32 diff --git a/games/worldofpadman/files/patch-code__qcommon__vm_x86_64.c b/games/worldofpadman/files/patch-code__qcommon__vm_x86_64.c new file mode 100644 index 000000000000..c5e215cb7000 --- /dev/null +++ b/games/worldofpadman/files/patch-code__qcommon__vm_x86_64.c @@ -0,0 +1,11 @@ +--- code/qcommon/vm_x86_64.c.orig 2008-05-10 10:05:55.000000000 -0300 ++++ code/qcommon/vm_x86_64.c 2008-08-10 11:36:11.000000000 -0300 +@@ -534,7 +534,7 @@ + { + compiledOfs = assembler_get_code_size(); + vm->codeLength = compiledOfs; +- vm->codeBase = mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANONYMOUS, -1, 0); ++ vm->codeBase = mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0); + if(vm->codeBase == (void*)-1) + Com_Error(ERR_DROP, "VM_CompileX86: can't mmap memory"); +