fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-02 07:17:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

49. Merge fixes required to build and run on Solaris x86 with Sun compilers

Browse source 
from XORG-CURRENT branch. (Alan Coopersmith)
This commit is contained in:
Alan Coopersmith 2004-03-18 02:18:27 +00:00
parent de32041651
commit 0cfa51a94d
2 changed files with 76 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.1.4.3 2004/03/05 13:40:51 eich Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */
/*
*
* Copyright 1995-1998 by Metro Link, Inc.
@ -2696,6 +2696,8 @@ ELFCollectSections(ELFModulePtr elffile, int pass, int *totalsize,
continue;
if (!strcmp(name, ".stabstr")) /* ignore debug info */
continue;
if (!strcmp(name, ".stab.indexstr")) /* ignore more debug info */
continue;
case SHT_SYMTAB:
if (pass)
continue;

73
hw/xfree86/os-support/solaris/solaris-ia32.S Normal file
View file

@ -0,0 +1,73 @@
/ Copyright 2004 Sun Microsystems, Inc. All rights reserved.
/
/ Permission is hereby granted, free of charge, to any person obtaining a
/ copy of this software and associated documentation files (the
/ "Software"), to deal in the Software without restriction, including
/ without limitation the rights to use, copy, modify, merge, publish,
/ distribute, and/or sell copies of the Software, and to permit persons
/ to whom the Software is furnished to do so, provided that the above
/ copyright notice(s) and this permission notice appear in all copies of
/ the Software and that both the above copyright notice(s) and this
/ permission notice appear in supporting documentation.
/
/ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
/ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
/ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
/ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
/ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
/ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
/ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
/ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
/ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/
/ Except as contained in this notice, the name of a copyright holder
/ shall not be used in advertising or otherwise to promote the sale, use
/ or other dealings in this Software without prior written authorization
/ of the copyright holder.
#ifdef INLINE_ASM
#define FUNCTION_START(f,n) .inline f,n
#define FUNCTION_END(f) .end
#else
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
#define FUNCTION_END(f) SET_SIZE(f)
#endif
FUNCTION_START(inb,4)
movl (%esp), %edx
xorl %eax, %eax
inb (%dx)
FUNCTION_END(inb)
FUNCTION_START(inw,4)
movl (%esp), %edx
xorl %eax, %eax
inw (%dx)
FUNCTION_END(inw)
FUNCTION_START(inl,4)
movl (%esp), %edx
xorl %eax, %eax
inl (%dx)
FUNCTION_END(inl)
FUNCTION_START(outb,8)
movl (%esp), %edx
movl 4(%esp), %eax
outb (%dx)
FUNCTION_END(outb)
FUNCTION_START(outw,8)
movl (%esp), %edx
movl 4(%esp), %eax
outw (%dx)
FUNCTION_END(outw)
FUNCTION_START(outl,8)
movl (%esp), %edx
movl 4(%esp), %eax
outl (%dx)
FUNCTION_END(outl)