summaryrefslogtreecommitdiff
path: root/hw/xfree86/loader/elfloader.c
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2004-10-30 20:33:43 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2004-10-30 20:33:43 +0000
commit7e588ba9abdcc2078b6c361c81806337b8ff0827 (patch)
tree93914e18b398af546213c976d736528b83be2ef2 /hw/xfree86/loader/elfloader.c
parent612bd1c27322a69a98b59193e7d31501688359bd (diff)
Add -d flag for compilers like the Sun C compilers that produce dependency
lists themselves. To use with the Sun compilers, add to host.def: # define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun bug id #4245688 - fix by Alan Coopersmith) Add Solaris to the platforms on which mprotect is run to set execute permissions when necessary. (Sun bug id #6175128 - fix by Alan Coopersmith) Internationalize digital output (Sun bug id #4119396 - fix by Steve Swales), add -bgpixmap option to set XPM file as background (originally from STSF project version of xclock by Alan Coopersmith) xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which are one too low in error messages (Xorg bugzilla #1739, Sun bug id 4637857 - fix by Sam Lau)
Diffstat (limited to 'hw/xfree86/loader/elfloader.c')
-rw-r--r--hw/xfree86/loader/elfloader.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c
index 4d2a050f7..dea27f5c3 100644
--- a/hw/xfree86/loader/elfloader.c
+++ b/hw/xfree86/loader/elfloader.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.2 2004/04/23 19:54:06 eich Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */
/*
@@ -922,7 +922,7 @@ ELFCreateGOT(ELFModulePtr elffile, int maxalign)
ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n");
return FALSE;
}
-# if defined(linux) || defined(__OpenBSD__)
+# if defined(linux) || defined(__OpenBSD__) || defined(sun)
{
unsigned long page_size = getpagesize();
unsigned long round;
@@ -1097,7 +1097,7 @@ ELFCreatePLT(ELFModulePtr elffile)
ErrorF("ELFCreatePLT() Unable to allocate memory!!!!\n");
return;
}
-# if defined(linux) || defined(__OpenBSD__)
+# if defined(linux) || defined(__OpenBSD__) || defined(sun)
{
unsigned long page_size = getpagesize();
unsigned long round;
@@ -2775,7 +2775,7 @@ ELFCollectSections(ELFModulePtr elffile, int pass, int *totalsize,
elffile->lsection[j].size = SecSize(i);
elffile->lsection[j].flags = flags;
switch (SecType(i)) {
-#if defined(linux) || defined(__OpenBSD__)
+#if defined(linux) || defined(__OpenBSD__) || defined(sun)
case SHT_PROGBITS:
{
unsigned long page_size = getpagesize();
@@ -2979,7 +2979,7 @@ ELFLoadModule(loaderPtr modrec, int elffd, LOOKUP **ppLookup)
ErrorF("Unable to allocate ELF sections\n");
return NULL;
}
-# if defined(linux) || defined(__OpenBSD__)
+# if defined(linux) || defined(__OpenBSD__) || defined(sun)
{
unsigned long page_size = getpagesize();
unsigned long round;