[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/loader elfloader.c, 1.1.4.1.6.4, 1.1.4.1.6.4.2.1 loadmod.c, 1.1.4.1, 1.1.4.1.16.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/loader

Modified Files:
      Tag: XPRINT
	elfloader.c loadmod.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: elfloader.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v
retrieving revision 1.1.4.1.6.4
retrieving revision 1.1.4.1.6.4.2.1
diff -u -d -r1.1.4.1.6.4 -r1.1.4.1.6.4.2.1
--- a/elfloader.c	18 Mar 2004 02:18:27 -0000	1.1.4.1.6.4
+++ b/elfloader.c	10 Apr 2004 09:05:24 -0000	1.1.4.1.6.4.2.1
@@ -1096,6 +1096,18 @@
 	ErrorF("ELFCreatePLT() Unable to allocate memory!!!!\n");
 	return;
     }
+#   if defined(linux) || defined(__OpenBSD__)
+    {
+	unsigned long page_size = getpagesize();
+	unsigned long round;
+
+	round = (unsigned long)elffile->plt & (page_size - 1);
+	mprotect(elffile->plt - round,
+		 (elffile->pltsize + round + page_size - 1) & ~(page_size - 1),
+		 PROT_READ | PROT_WRITE | PROT_EXEC);
+    }
+#   endif
+									      
     elffile->sections[elffile->pltndx].sh_size = elffile->pltsize;
 # ifdef ELFDEBUG
     ELFDEBUG("ELFCreatePLT: PLT address %lx\n", elffile->plt);

Index: loadmod.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.16.1
diff -u -d -r1.1.4.1 -r1.1.4.1.16.1
--- a/loadmod.c	26 Nov 2003 22:49:01 -0000	1.1.4.1
+++ b/loadmod.c	10 Apr 2004 09:05:24 -0000	1.1.4.1.16.1
@@ -86,7 +86,7 @@
 static void RemoveChild(ModuleDescPtr);
 
 ModuleVersions LoaderVersionInfo = {
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     ABI_ANSIC_VERSION,
     ABI_VIDEODRV_VERSION,
     ABI_XINPUT_VERSION,