fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-26 06:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

34. Added a hack to fc-lang and fc-list to prevent installation if define

Browse source 
InstallFontconfigLibrary NO (Egbert Eich).
33. Updated Xft to 2.1.5 (Egbert Eich).
32. Make ELF loader work on systems with non-exec stack/heaps (bugzilla
    #296, John Dennis, Mike Harris).
31. Fix for xdm to work on a non-IPv6 system when built with IPv6 support
    (bugzilla #287, Peter Breitenlohner) (confirmed by: Alan Coopersmith).
30. Fix Xi XselectExtensionEvent for 64 bit machines (bugzilla #285,
    Andreas Luik) (confirmed by: Paul Anderson, Alan Coopersmith).
This commit is contained in:
Egbert Eich 2004-03-12 11:18:23 +00:00
parent 4565ca2a8c
commit 62c105bd9b
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
hw/xfree86/loader/elfloader.c
View file

@ -921,7 +921,7 @@ ELFCreateGOT(ELFModulePtr elffile, int maxalign)
ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n");
return FALSE;
}
# if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
# if defined(linux) || defined(__OpenBSD__)
{
unsigned long page_size = getpagesize();
unsigned long round;
@ -2760,10 +2760,16 @@ ELFCollectSections(ELFModulePtr elffile, int pass, int *totalsize,
elffile->lsection[j].size = SecSize(i);
elffile->lsection[j].flags = flags;
switch (SecType(i)) {
#ifdef __OpenBSD__
#if defined(linux) || defined(__OpenBSD__)
case SHT_PROGBITS:
mprotect(elffile->lsection[j].saddr, SecSize(i),
PROT_READ | PROT_WRITE | PROT_EXEC);
{
unsigned long page_size = getpagesize();
unsigned long round;
round = (unsigned long)elffile->lsection[j].saddr & (page_size -1);
mprotect( (char *)elffile->lsection[j].saddr - round,
SecSize(i) + round, PROT_READ | PROT_WRITE | PROT_EXEC);
}
break;
#endif
case SHT_SYMTAB:
@ -2958,7 +2964,7 @@ ELFLoadModule(loaderPtr modrec, int elffd, LOOKUP **ppLookup)
ErrorF("Unable to allocate ELF sections\n");
return NULL;
}
# if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
# if defined(linux) || defined(__OpenBSD__)
{
unsigned long page_size = getpagesize();
unsigned long round;