diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-26 02:39:58 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-26 02:39:58 +0000 |
| commit | 46472cbee679f9757c4003a0dcf158aeb3852f47 (patch) | |
| tree | 32ebdb888da5f84a44350fd2fb0cb52f1d412243 | |
| parent | 36e3e5430e1ca7103a4e0b796eb3817975b40d90 (diff) | |
xc/config/cf/sun.cf
xc/config/cf/sv4Lib.rules
xc/programs/Xserver/Imakefile
xc/programs/Xserver/hw/xfree86/os-support/sunos/find_deps.pl Make Solaris
builds work when using MakeDllModules (it's not the default yet, but at
least it works now if you turn it on) Also improve default compiler,
optimizer, & linker flags for Solaris builds using either Sun cc or gcc
xc/programs/Xserver/cfb/Imakefile.inc
xc/programs/Xserver/cfb/stipsparc.s
xc/programs/Xserver/cfb/stipsprc32.s Remove text relocation error when
building shared versions
| -rw-r--r-- | cfb/stipsparc.s | 11 | ||||
| -rw-r--r-- | cfb/stipsprc32.s | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/cfb/stipsparc.s b/cfb/stipsparc.s index a6a40491f..dcd440b19 100644 --- a/cfb/stipsparc.s +++ b/cfb/stipsparc.s @@ -1,5 +1,6 @@ /* * $Xorg: stipsparc.s,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ + * $XdotOrg: $ * Copyright 1990, 1998 The Open Group @@ -101,9 +102,17 @@ in this Software without prior written authorization from The Open Group. .globl _cfbStippleStack _cfbStippleStack: save %sp,-64,%sp +#ifdef SHAREDCODE +1: + call 2f + nop +2: + mov %o7,sbase /* sbase = 1b(1:) */ + add sbase, CaseBegin-1b, sbase +#else /* !SHAREDCODE */ sethi %hi(CaseBegin),sbase /* load up switch table */ or sbase,%lo(CaseBegin),sbase - +#endif /* SHAREDCODE */ mov 4,lshift /* compute offset within */ sub lshift, shift, lshift /* stipple of remaining bits */ #ifdef LITTLE_ENDIAN diff --git a/cfb/stipsprc32.s b/cfb/stipsprc32.s index 5703c0f1b..89b031f5a 100644 --- a/cfb/stipsprc32.s +++ b/cfb/stipsprc32.s @@ -1,5 +1,6 @@ /* * $Xorg: stipsprc32.s,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ + * $XdotOrg: $ * Copyright 1990, 1998 The Open Group @@ -98,9 +99,17 @@ in this Software without prior written authorization from The Open Group. .globl _cfb32StippleStack _cfb32StippleStack: save %sp,-64,%sp +#ifdef SHAREDCODE +1: + call 2f + nop +2: + mov %o7,sbase /* sbase = 1b(1:) */ + add sbase, CaseBegin-1b, sbase +#else /* !SHAREDCODE */ sethi %hi(CaseBegin),sbase /* load up switch table */ or sbase,%lo(CaseBegin),sbase - +#endif /* !SHAREDCODE */ mov 4,lshift /* compute offset within */ sub lshift, shift, lshift /* stipple of remaining bits */ #ifdef LITTLE_ENDIAN |