r466 - in trunk/code: qcommon unix

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2006-01-06 14:11:05 -0500 (Fri, 06 Jan 2006)
New Revision: 466

Modified:
   trunk/code/qcommon/vm_x86_64.c
   trunk/code/unix/Makefile
Log:
make memory for generated opcodes executable so the program works with
enabled NX feature.


Modified: trunk/code/qcommon/vm_x86_64.c
===================================================================
--- trunk/code/qcommon/vm_x86_64.c	2006-01-06 17:36:03 UTC (rev 465)
+++ trunk/code/qcommon/vm_x86_64.c	2006-01-06 19:11:05 UTC (rev 466)
@@ -385,12 +385,11 @@
 
 	if((*compiledcode = (unsigned char*)buf))
 	{
-#ifdef VM_X86_64_STANDALONE // no idea why
-		if(mprotect(buf, allocsize, PROT_READ|PROT_EXEC) == -1)
+		// need to be able to exec code
+		if(mprotect(buf, allocsize, PROT_READ|PROT_WRITE|PROT_EXEC) == -1)
 		{
 			Com_Error(ERR_FATAL, "mprotect failed on %p+%x: %s\n", buf, allocsize, strerror(errno));
 		}
-#endif
 		return size;
 	}
 

Modified: trunk/code/unix/Makefile
===================================================================
--- trunk/code/unix/Makefile	2006-01-06 17:36:03 UTC (rev 465)
+++ trunk/code/unix/Makefile	2006-01-06 19:11:05 UTC (rev 466)
@@ -870,13 +870,6 @@
 endif
 ifeq ($(ARCH),x86_64)
   Q3OBJ += $(B)/client/vm_x86_64.o
-
-  #FIXME: why do these need to be here?
-  Q3OBJ += \
-    $(B)/client/snd_mixa.o \
-    $(B)/client/matha.o \
-    $(B)/client/ftola.o \
-    $(B)/client/snapvectora.o
 endif
 
 ifeq ($(ARCH),ppc)