This patch should be applied to an un-modified XFree86 version 4.6.0 source tree. It is patch 1 of 4 patches that will will convert the source tree to XFree86 version 4.7.0. To apply this patch, run the following from the directory containing your 'xc' directory: patch -p0 -E < XFree86-4.6.0-4.7.0.diff1 patch -p0 -E < XFree86-4.6.0-4.7.0.diff2 patch -p0 -E < XFree86-4.6.0-4.7.0.diff3 patch -p0 -E < XFree86-4.6.0-4.7.0.diff4 sh XFree86-4.6.0-4.7.0-cleanup.sh gzip -d < XFree86-4.6.0-4.7.0-diff0.tgz | tar vxf - ------------------------------------------------------------------------------- Prereq: 4.6.0 Index: xc/programs/Xserver/hw/xfree86/CHANGELOG diff -u xc/programs/Xserver/hw/xfree86/CHANGELOG:3.3730 xc/programs/Xserver/hw/xfree86/CHANGELOG:3.3905 --- xc/programs/Xserver/hw/xfree86/CHANGELOG:3.3730 Tue May 9 20:25:37 2006 +++ xc/programs/Xserver/hw/xfree86/CHANGELOG Sun Aug 12 20:57:46 2007 @@ -1,3 +1,460 @@ +XFree86 4.7.0 (12 August 2007) + 167. 4.7.0 release. + +XFree86 4.6.99.29 (7 August 2007) + 166. Fix #include's in GLw documentation (Marc Balmer). + +XFree86 4.6.99.28 (21 July 2007) + 165. Fix new PCI scan for SPARCs based on Sun's Psycho chipset + (Marc La France). + 164. Default noise reductions during PCI scans on the *BSDs (Marc La France). + +XFree86 4.6.99.27 (7 July 2007) + 163. Update locale information for Serbia and Montenegro (Bugzilla #1684, + Milos Komarcevic). + 162. Beef up validity check on PCI resource sizes returned from the OS + (Marc La France, problem reported by Loic Mahe). + 161. Add missing install rule for xterm when it is to be installed neither + setuid nor setgid (Marc La France, problem reported by Loic Mahe). + 160. Fix various issues related to install.sdk targets when + BuildModuleInSubdir is asserted during a build (Marc La France, + problem reported by Loic Mahe). + 159. Fix ioport utility to allow for VGA I/O aliases (Marc La France). + +XFree86 4.6.99.26 (21 June 2007) + 158. Improve makedepend's accuracy when -U command line flags and/or #undef + directives are involved (Marc La France). + 157. Fix endianness bug in Render extension's SetPictureClipRectangles + request (Matthieu Herrb). + +XFree86 4.6.99.25 (7 June 2007) + 156. Allow scanpci utility to dump all 4K bytes of a PCI Express device's + configuration space (Marc La France). + 155. Generalise the scanning of SPARC PROMs for PCI host bridges by relying + more on PROM information and less on chipset specifics. In particular, + this adds support for PCI Express as found in some UltraSPARC IV systems + (Marc La France). + 154. Back-port a fix for CVE-2007-2754, another integer overflow vulnerability + in the freetype2 library's TrueType font handling (Victor Stinner). + 153. Allow DefaultUserPath overrides on Darwin. Requested by "SciFi" + (Marc La France). + 152. On Darwin, make xcodebuild and the older pbxbuild use different project + descriptions (Marc La France). + 151. Change `make install` on Darwin to work around XCode's inability to + follow symlinks (Marc La France). + +XFree86 4.6.99.24 (21 May 2007) + 150. Fix build with an external freetype2 library (both newer and older than + the version we provide under xc/extras/). However, still build + libXfont's FreeType backend module with the freetype2 version we provide + because it is the only version known to be modified to correctly build + the module. Problem reported in Bugzilla #1683 (Jie Luo, Marc La France). + +XFree86 4.6.99.23 (7 May 2007) + 149. Fix linking of Darwin executables by ensuring locally built static + libraries are found before dynamic libraries in system library search + paths. Problem reported by "SciFi". (Marc La France) + 148. Remove unnecessary #include in fonttosfnt/util.c that prevents successful + builds against newer freetype2 versions. Problem reported by "SciFi". + (Marc La France) + 147. Fix XDarwin build when BuildGlxInDmx is asserted. Problem reported by + "SciFi". (Marc La France) + 146. Fix libXft1 build against newer fontconfig versions. Specifically + exclude support for fontconfig 2.3.95 because it introduces an + incompatibility without a version bump. Problem reported by "SciFi". + (Marc La France) + 145. Darwin build workaround for XCode's inability to follow symlinks. + Problem reported by "SciFi". (Marc La France) + 144. Add an implicit rule for Objective-C sources so that XDarwin build don't + depend on Apple-only GNU make changes. Problem pointed out by "SciFi". + (Marc La France) + +XFree86 4.6.99.22 (21 April 2007) + 143. Fix double UnlockDisplay() in libGL (Jamey Sharp, freedesktop bug #8521). + 142. Allow 3rd mouse button emulation even if the mouse actually has a 3rd + button. This helps laptops, and the like, running systems that combine + a touchpad and an external mouse into one device (Martin Husemann). + 141. Resave text mode on re-entry into the trident driver (Matthias Drochner). + 140. Add DPMS support to the newport driver (Christopher Sekiya). + 139. Add .gitignore to the list of files the lndir utility ignores by default + (Marc La France). + 138. Resave text mode on re-entry into the mga driver to catch changes in text + mode font while the server was switched away (Matthias Drochner). + 137. Fix determination of mode on server entry in the mga driver + (Eike Dehling). + 136. Refix Darwin bundle install rules when DESTDIR is specified + (Marc La France). + 135. Use /usr/bin/login for `xterm -ls` on Darwin (Yves de Champlain, + Bugzilla #1680). + 134. Define proper default $PATH's for xdm on Darwin (Yves de Champlain, + Bugzilla #1680). + 133. Add PAM support to Darwin port (Yves de Champlain, Bugzilla #1680). + +XFree86 4.6.99.21 (7 April 2007) + 132. Address vulnerabilities CVE-2006-0747, CVE-2006-1861, CVE-1006-2661, + CVE-2007-1003, CVE-2007-1351, CVE-2007-1352 and CVE-2007-1667 + (Josh Bressers, Chris Evans, Sean Larsson, iDefense, Matthieu Herrb, + Marc La France). + 131. Fix installation of xkbcomp 'dir' files (Marc La France). + 130. Prevent the IRIX compiler's use of its intrinsic builtin functions as + many of them are buggy (an understatement) (Marc La France). + 129. Add a rewrite of Mark Vojkovich's restest utility that avoids deadlocks + by buffering data and delaying its display until after the server is + ungrabbed (Marc La France). + 128. Update Darwin port with selected changes from X.Org and a liberal + sprinkling of build fixes (Marc La France, with help from + Frank J. R. Hanstick). + 127. Re-instate correct decoding of Simba PCI routing on all SPARC OSes + (Marc La France). + 126. Fix up handling of PCI configuration space access errors on the *BSDs + (Marc La France). + 125. Fix some of the chips driver's endianness problems (Michael Lorenz). + 124. Add a -withsymdirs option to lndir that causes it to shadow directory + structures pointed to by symbolic links. Also fix bug that can occur + when -ignorelinks is not used and a symbolic link is encountered in the + "from" tree (Marc La France). + 123. Resurrect support for Ti3026 RAMDACs found on original I128 adapters. + 8bpp still has incorrect colourmap entries and hardware cursor support + is still disabled (Christos Zoulas). + 122. Fix text mode restoration issues in radeon driver (Matthieu Herrb and + Matthias Drochner, via NetBSD repository). + +XFree86 4.6.99.20 (21 March 2007) + 121. Consolidate compatilibity definitions for OpenBSD/sparc and bump video + ABI version due to yesterday's SBUS ABI changes (Marc La France). + 120. More changes derived from NetBSD/sparc: + - Enable openprom interface for NetBSD/sparc (Marc La France). + - Add a generic SaveScreen() implementation for SBUS adapters that don't + provide their own (Marc La France). + - Beef up generic cursor handling for SBUS adapters (Marc La France). + - Add a cleaned up version of Michael Lorenz's driver for SBUS Weitek + P9100 adapters. + 119. Another merge of NetBSD changes: + - Support absolute mouse position events (Ty Sarna). + - Fix bug that caused an entire batch of mouse events to be rejected + when one of an unknown type was encountered (Ty Sarna). + - Support horizontal scroll wheels (Iain Hibbert, #13821). + - Don't error out on unknown wskbd types (Nathan J. Williams). + - Add support for NetBSD/x86_64 (Frank van der Linden). + - Update NetBSD section of Imake.cf. Ditto for NetBSD.cf. Note that + the latter might temporarily cause build breakage + (Marc La France). + +XFree86 4.6.99.19 (7 March 2007) + 118. Update to the 2007-02-12 snapshot of pci.ids. + 117. Fix the ioport, pcitweak and scanpci utilities to use the correct page + size on those platforms where it is not 4K (Marc La France). + 116. Merge in (from X.Org) support for Matrox MGA G200e SE adapters (#17228, + Loic Mahe). + +XFree86 4.6.99.18 (21 February 2007) + 115. Add an XKB geometry for Enermax Aurora keyboards (Alexander Pohoyda, + Bugzilla #1677). + 114. Consider PCI resource sizes as accurate if they are estimated to be at + their minimum size (Marc La France). + 113. Fix scanpci utility's idea of minimum PCI ROM sizes (Marc La France). + 114. Add a geometry specification for the Dell Inspiron 8000 notebook keyboard + (Alexander Pohoyda, Bugzilla #1678). + 113. Merge in NetBSD's changes to the drm kernel module. + 112. Minor fixes to the handling of 64-bit PCI BARs and to the scanpci + utility's decoding of type 1 & 2 PCI headers (Marc La France). + 111. Various PCI-related changes (Marc La France): + - Don't ignore any BARs or ROM pointer a PCI-to-PCI bridge might have. + - Don't ignore any BAR a PCI-to-CardBus bridge might have. + - Destructively size PCI bases when the approriate decode enable is not + set. + - By default, destructively size PCI bases whose modifiable bits are all + zero. Optionally also do the same in the all-ones case (dangerous). + Both behavious are controlled by the XF86Config Server section + "EstimateSizesAggressively" option. + - When destructively sizing ROMs, do not set the decode enable bit. + - Do not destructively size a base more than once. + - Do not ask the OS for a base's size if the base was destructively + sized. + - When retrieving base sizes from the OS, filter out those that are not + a power of 2, or are less than 4. + - For SunOS and OpenBSD on SPARCs, add a means of extracting base sizes + from PROM information. As this information is incomplete, additional + changes were needed to handle devices with a mix of estimated and + non-estimated resources. + - Fix page alignment issues in the mapping of PCI configuration spaces + for SunOS and OpenBSD on SPARCs. + - Rework the scanpci utility to print type 2 PCI headers, resource size + information, and, optionally, a hexadecimal dump of PCI configuration + space. + +XFree86 4.6.99.17 (7 February 2007) + 110. Ensure the X server closes all sockets during termination after + processing the -configure, -probe or -probeonly command line options. + Noticed by Matthieu Herrb. + 109. For each PCI domain found while scanning a SPARC's PROM, include in the + log its bus number range, along with address & size of its configuration, + I/O and memory spaces (Marc La France). + +XFree86 4.6.99.16 (21 January 2007) + 108. Fix for CVE-2006-6101, CVE-2006-6102 and CVE-2006-6103 advisories + (Matthieu Herrb). + 107. Change the r128 and radeon drivers to respect the size PCI allocates for + their MMIO regions (Marc La France). + +XFree86 4.6.99.15 (7 January 2007) + 106. PAM-related changes: + - Add OpenPAM support on FreeBSD and NetBSD (Christos Zoulas). + - Fix xinit for PAM-aware X servers (Christos Zoulas). + - Add a PAM interface for Solaris (Marc La France). + - PAM-aware binaries won't run on systems without PAM, so relegate the + building of PAM-aware binaries to host.def. This avoids, for example, + having different binary distributions for Red Hat & Slackware + (Marc La France). + 105. On OpenBSD and NetBSD, change xman to derive machine-specific man paths + from uname(3) rather than a definition found in a system header file + (James Chacon). + 104. Add xkbcomp keycodes for Macintosh USB keyboards (Charles M. Hannum). + 103. Add xkbcomp definitions for X680x0 keyboards (Minoura Makoto). + 102. Fix keycode table used by Xsun for european Sun type-5 keyboards + (Ben Harris). + 101. Xsun build fixes for NetBSD. + 100. Fix misuse of INCLUDE_CG2_HEADER #define (Marc La France). + 99. Fix fbCompose() for ABGR framebuffers, such as Sun's ffb. Inspired by + a change found in NetBSD's repository (Marc La France). + 98. A collection of cfb24 cleanups (Marc La France). + 97. Fix unaligned accesses in cfb's horizontal polysegment drawing + (Shin Takemura). + 96. Finish Keith Packard's removal of 64-bit accesses to cfb framebuffers + (Marc La France). + 95. Fix incorrect x86_64 endianness in DPS client libraries (Marc La France). + 94. Generalise Imake.cf's handling of MIPS endianness (Marc La France). + 93. In cfb's assembler stipple code, rely on Xarch.h for endianness + determination (Marc La France). + 92. Fix `make depend` in Xserver/cfb* (Marc La France). + +XFree86 4.6.99.14 (21 December 2006) + 91. Rename cfb's assembler code to tie into more generic imake assembly + rules (Marc La France). + 90. cfb's stipple SPARC assembler code isn't 64-bit clean, so disable it for + sparc64 (Martin Husemann). + 89. More work on integer overflows and memory leaks in Type1 font code. + Needs further testing (Marc La France). + 88. In libX11's XrmDestroyDatabase(), release the mutex before freeing it + (Charles M. Hannum). + 87. Some -DDEBUG build cleanups (Marc La France). + 86. Add rand() to the loader server's libc emulation (Marc La France). + 85. Fix dependencies of "depend" targets in the HasMakefileSafeInclude case + (Marc La France). + +XFree86 4.6.99.13 (7 December 2006) + 84. Fix Apple DRI build failure on Darwin (Reported by Frank J. R. Hanstick). + 83. Fix __projectroot__ expansion in X & xmodmap man pages (Luke Mewburn). + 82. Normalise EXTRALIBRARYDEPS usage. Inspired by a change found in NetBSD's + repository (Marc La France). + +XFree86 4.6.99.12 (21 November 2006) + 81. Add .cvsignore files to the list of filenames lndir does not shadow by + default (unless -withrevinfo is given) (Marc La France). + +XFree86 4.6.99.11 (7 November 2006) + 80. Avoid malloc() calls during server log message processing + (Marc La France). + 79. Add an option to the TinyX servers to prevent them from probing serial + ports (Bugzilla #1674, Dmitry Pervushin). + 78. Fix granularity handling in framebuffer manager (Marc La France). + 77. ANSI C workaround in x86emu for compilers that default char type to + unsigned (Marc La France). + 76. Change xkbcomp to accept signed coordinates in shape definitions + (Bugzilla #1675, Andriy Gapon). + 75. On Linux, ignore ENOSYS errors on iopl() and ioperm() calls, as some + systems only provide non-functional stubs for these syscalls + (Marc La France). + +XFree86 4.6.99.10 (21 October 2006) + 74. Fix 'make distclean' problem related to hw/tinyx subdir handling + (David Dawes, reported by Andrew Aitchison). + +XFree86 4.6.99.9 (7 October 2006) + +XFree86 4.6.99.8 (21 September 2006) + 73. Fix integer overflow problems in the handling of Type1 fonts + (Marc La France). + +XFree86 4.6.99.7 (7 September 2006) + 72. Add the cleandir utility's functionality to lndir (David Dawes). + 71. Extend xwd to allow selection of a rectangular sub-region of a window to + dump (Bugzilla #1671, Alexander Pohoyda). + 70. Fix infinite loops and/or segfaults that can occur when libXpm reads + comments in image files. This has been optimised after applying a patch + by Matthieu Herrb. + 69. Make X server argv strings constant (David Dawes). + 68. Handle tinyx directories as subdirs of Xserver/hw/tinyx rather than + of Xserver (David Dawes). + 67. Extend the mmapr and mmapw utilities to allow specification of wscons + mapping mode on NetBSD and OpenBSD (Marc La France). + +XFree86 4.6.99.6 (21 August 2006) + 66. Fix mmapw segfault that can occur on some systems (Marc La France). + 65. Fix file descriptor leaks in the module loader's error paths (an + extension of Matthieu Herrb's X.Org source fix for the same problem). + 64. Support multiple PCI domains on OpenBSD/sparc64, pending kernel changes + (Marc La France). + 63. Fix a case where X server audit messages do not get printed (David Dawes). + 62. Initialise the allocator even earlier in the X server startup, and use + it for the logging functions (David Dawes). + 61. Parser option handling cleanups/fixes: + - Ensure that option data is allocated by the parser, rather than + externally allocated or static. + - Free replaced option data. + - Make xf86ParseOption's handling of multiple options of the same + name consistent with all other cases (last occurrence is used). + - Fix a bug in the handling of the Keyboard section "xleds" keyword. + (David Dawes). + +XFree86 4.6.99.5 (7 August 2006) + 60. Some X11.tmpl housecleaning; Don't generate references to libraries that + would not be built even when UseInstalled is set to NO; Add imake + Build{Debug,Profile}Libraries symbols to allow generating debuggable and + profiled libraries, respectively (Marc La France). + 59. Re-implement an old hack that was meant to deal with unaligned accesses + in cfb (Marc La France). + 58. More fixes for linking with a static libGL (Marc La France). + 57. Allow glxinfo and glxgears to be linked with a static libGL (add + XF86VIDMODE references) (Marc La France). + 56. Fix segfaults in PCF font handling (adapted from Matthieu Herrb). + 55. Fix typo that crippled hardware cursor support in the sunffb driver on + SunOS (Marc La France). + +XFree86 4.6.99.4 (21 July 2006) + 54. Remove the "special case"'ing of assembler objects WRT their inclusion + in libraries. They were being included only in one library type + (shared/static/debug/profiled/extra) even when more than one type is + being built (Marc La France). + 53. Another swipe at dealing with xterm's setgid woes: + - Fix xterm, when compiled with setgid support, to actually be able to + modify utmp data. This whether xterm is setgid utmp, or setuid root. + Neither was the case before. Also, fix utmp handling on exit. + - Rename InstGidFlags imake symbol to a more descriptive InstUtmpFlags + and add toleration for this to xterm's Imakefile. + - Install xterm setgid utmp on NetBSD 1.0 or higher. Untested. This is + based on their CVS repository that shows the introduction of a utmp + group in NetBSD 1.0. + - On Linux, decide whether to install xterm setgid utmp or setuid root + based on the existence of a utmp group on the build system. The + Xinstall script already remakes this decision for the target system. + This avoids having to produce different binaries for different Linux + distributions. + - In xterm's Imakefile, tolerate the absence of CHANGELOG #161, and + anticipate FreeBSD's potential move to a setgid xterm. + (Marc La France). + 52. Fix gccmakedep script to disable filename expansion in its quoted + arguments and extend it to allow for single quotes in its options, along + with blanks and single quotes in its filename arguments + (#10776, Peter Breitenlohner). + 51. Fix stack overflow in libXfont's FreeType code (Matthieu Herrb, Bugzilla + #1669). + 50. Extend the SunOS/Solaris aperture driver to sun4v and amd64 + (Martin Bochnig). + 49. Recognise the newer sun4v's as sun4u's (Marc La France). + 48. Update Macintosh french keymap (Adapted from Etienne Bersac, Bugzilla + #1574, X.Org Bugzilla #6382). + +XFree86 4.6.99.3 (7 July 2006) + 47. Fix unaligned accesses in the ELF loader on non-Linux SPARC that occur + because the first and subsequent members in an archive are not guaranteed + to be on a sizeof(long) boundary (Marc La France). + 46. Fix cases where ELFAddressToSymbol() returns an empty string + (David Dawes). + 45. Allow a module to export its own ModuleData structure, and use this to + fix atimisc's module version check. Problem reported by Mike Boyer. + (Marc La France). + 44. Fix typo that caused the loader to incorrectly complain about an + undefined reference in atimisc (Marc La France). + 43. ELF loader changes: Remove unnecessary resetDest*() calls; Fix support + for R_SPARC_LO10 and R_SPARC_OLO10 relocations; Add support for + additional SPARC relocations (Marc La France). + 42. Avoid memory leaks in command line processing (David Dawes). + 41. Improve support for the XFree86CustomVersion imake parmeter, + and customisation of some initial server messages (David Dawes). + 40. Make sure that there is a one-to-one correspondence between + successful getaddrinfo() calls and freeaddrdinfo() calls (#10660, + Peter Breitenlohner). + 39. Fix the problem where xdm compiled with IPv6 support failed to accept + any chooser connections (#10660, Peter Breitenlohner). + 38. Allow finer control of loader debugging (David Dawes). + 37. Fix for loader R_ALPHA_GPRELHIGH fatal error (Bugzilla #1665, + David Dawes, reported by Will L G). + 36. Fix mga_hal build problem (#10659, Peter Breitenlohner). + 35. Don't disable gcc stack protector for modules (David Dawes). + 34. Basic support for building on DragonFly (David Dawes). + 33. Don't limit imake's gcc stack protector test to OpenBSD (David Dawes). + 32. Make imake's methods of finding the cc (gcc) command to use + for its internal tests consistent, and thus fix bad PostIncDir + settings when using a compiler from other than the built-in set of paths + (David Dawes). + 31. Add an option to imake to save the temporary .c file that it generates + (David Dawes). + 30. Fix crash introduced by recent xf86Init.c changes (David Dawes). + +XFree86 4.6.99.2 (21 June 2006) + 29. Add support for UPA and SBUS devices on OpenBSD (Marc La France). + 28. Make the server on OpenBSD look harder for a wscons console + (Marc La France). + 27. Fix -configure's re-ordering of device sections (Marc La France). + 26. Xterm patch #215 (Thomas Dickey). + 25. Add an interface to SPARC openprom for OpenBSD and NetBSD, but, for now, + only enable it for OpenBSD (Marc La France). + 24. Allow for 32-bit PCI I/O ranges on Linux/MIPS (Marc La France). + 23. Fix bug that occurs when the SPARC PCI scan code is compiled for 64-bit + (Marc La France). + 22. Change freebsdPciInit() and netbsdPciInit() to prefer a hardware-derived + PCI configuration space access mechanism (should one exist) over an + OS-provided one (Marc La France). + 21. Close SBUS device file descriptors when all mmap(2)'s against them have + been unmapped (Marc La France). + 20. Fix window move performance issue on OpenBSD (Marc La France). + 19. Replace atimisc's transfers into, and out of, VGA memory with byte-wise + copies. This avoids (and stays well away from) 64-bit accesses because + some VGA aperture implementations are not designed to reliably implement + them (Marc La France). + 18. Fix -configure's setup of the keyboard under OpenBSD's wscons + (Marc La France). + 17. Always validate PCI resource assignment, even on Linux/Alpha and + OpenBSD/sparc64. If the OS does the right thing, this validation will + end up being a no-op anyway (Marc La France). + 16. Fix bug I inadvertently introduced over two years ago that could cause + PCI VGA routing to be incorrectly restored on server exit or switchout. + This also ensures only one VGA per domain is enabled while the server is + switched in despite buggy firmware or OSes that leave more than one VGA + enabled on server entry (Marc La France). + 15. Fix uname(2) usage throughout the source tree. This is an extension of + Alan Coopersmith's response to X.Org Bugzilla #2123 (Marc La France). + 14. Xterm patch #214 (Thomas Dickey). + 13. Make sure the thread stub library is built when needed (David Dawes). + +XFree86 4.6.99.1 (7 June 2006) + 12. Add support to the elf loader for Alpha relocation type 28 (adapted from + Bugzilla #1665, Jay Estabrook, reported by Will L G). + 11. Change makedepend to not warn about #pragma's that don't start in column + one (Marc La France). + 10. On OpenBSD, don't pass $(MFLAGS) on recursive make command lines, as + doing so causes its contents to be repeatedly duplicated + (Marc La France). + 9. Fix up "#!" lines in various python scripts (Marc La France). + 8. Fix build and segfaults in libGL on SPARCs (Marc La France). + 7. Merge in OpenBSD's lndir back in. (An audit for "misused" functions of + the entire tree to be done later.) (Marc La France). + 6. Fix misuse of S_IF* stat(2) macros throughout the source tree + (Modeled after X.Org bugzilla #5003). + 5. Allow servers generated by non-XFree86 builds to support GLX + (Marc La France). + 4. Fix segfaults in Xvfb's command line parsing (Marc La France). + 3. Remove BuildScanpci imake symbol and build scanpci on all platforms that + also build pcitweak (Marc La France). + 2. On the *BSD's, if the OS disallows r/w access to PCI configuration space, + attempt to proceed with read-only access. Also, do not FatalError should + read-only access not be allowed either. This allows, for example, + scanpci to function despite the likes of OpenBSD's securelevel + (Marc La France). + 1. Fix ATIProbe() buglet that can prevent detection of non-PCI adapters on + OS'es that provide only estimates of PCI resource sizes (Marc La France). + XFree86 4.6.0 (10 May 2006) 281. Xterm patch #213 (Thomas Dickey). 280. Build fix for static server on sparc (David Dawes). @@ -20133,9 +20590,4 @@ XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3730 2006/05/10 00:25:37 dawes Exp $ - - - - - +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3905 2007/08/13 00:57:46 dawes Exp $ Index: xc/BUILD.txt diff -u xc/BUILD.txt:1.3 xc/BUILD.txt:1.4 --- xc/BUILD.txt:1.3 Tue Apr 11 21:50:31 2006 +++ xc/BUILD.txt Fri Aug 3 22:16:06 2007 @@ -17,69 +17,69 @@ We recommend using gcc to build XFree86, but XFree86 generally builds with the native compiler for each OS platform. -1. How to get the XFree86 4.6.0 source +1. How to get the XFree86 4.7.0 source -The recommended way of getting the XFree86 4.6.0 source is to obtain it +The recommended way of getting the XFree86 4.7.0 source is to obtain it directly from the XFree86 CVS repository. There are several ways of doing that, and they are described at our CVS web page . -The CVS tag for this release is "xf-4_6_0". The tag for the maintenance -branch for this release is "xf-4_6-branch". +The CVS tag for this release is "xf-4_7_0". The tag for the maintenance +branch for this release is "xf-4_7-branch". -Another method of getting the XFree86 4.6.0 source is to either download the -4.6.0 source tarballs from the XFree86 ftp site. The procedure for this is +Another method of getting the XFree86 4.7.0 source is to either download the +4.7.0 source tarballs from the XFree86 ftp site. The procedure for this is as follows: - o The XFree86 4.6.0 source is contained in the files: + o The XFree86 4.7.0 source is contained in the files: - XFree86-4.6.0-src-1.tgz + XFree86-4.7.0-src-1.tgz - XFree86-4.6.0-src-2.tgz + XFree86-4.7.0-src-2.tgz - XFree86-4.6.0-src-3.tgz + XFree86-4.7.0-src-3.tgz - XFree86-4.6.0-src-4.tgz + XFree86-4.7.0-src-4.tgz - XFree86-4.6.0-src-5.tgz + XFree86-4.7.0-src-5.tgz - XFree86-4.6.0-src-6.tgz + XFree86-4.7.0-src-6.tgz - XFree86-4.6.0-src-7.tgz + XFree86-4.7.0-src-7.tgz - These can be found at ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/. - XFree86-4.6.0-src-4.tgz and XFree86-4.6.0-src-5.tgz contains the fonts. - XFree86-4.6.0-src-6.tgz contains the documentation source. - XFree86-4.6.0-src-7.tgz contains the hardcopy documentation. - XFree86-4.6.0-src-1.tgz, XFree86-4.6.0-src-2.tgz and - XFree86-4.6.0-src-3.tgz contains everything else. + These can be found at ftp://ftp.xfree86.org/pub/XFree86/4.7.0/source/. + XFree86-4.7.0-src-4.tgz and XFree86-4.7.0-src-5.tgz contains the fonts. + XFree86-4.7.0-src-6.tgz contains the documentation source. + XFree86-4.7.0-src-7.tgz contains the hardcopy documentation. + XFree86-4.7.0-src-1.tgz, XFree86-4.7.0-src-2.tgz and + XFree86-4.7.0-src-3.tgz contains everything else. If you do not need either the documentation or the fonts, then you need - only XFree86-4.6.0-src-1.tgz, XFree86-4.6.0-src-2.tgz and - XFree86-4.6.0-src-3.tgz. + only XFree86-4.7.0-src-1.tgz, XFree86-4.7.0-src-2.tgz and + XFree86-4.7.0-src-3.tgz. o Extract each of these files by running the following from a directory on a filesystem containing enough space (the full source requires around 270MB, with a similar amount being required for the compiled binaries): - gzip -d < XFree86-4.6.0-src-1.tgz | tar vxf - + gzip -d < XFree86-4.7.0-src-1.tgz | tar vxf - - gzip -d < XFree86-4.6.0-src-2.tgz | tar vxf - + gzip -d < XFree86-4.7.0-src-2.tgz | tar vxf - - gzip -d < XFree86-4.6.0-src-3.tgz | tar vxf - + gzip -d < XFree86-4.7.0-src-3.tgz | tar vxf - - gzip -d < XFree86-4.6.0-src-4.tgz | tar vxf - + gzip -d < XFree86-4.7.0-src-4.tgz | tar vxf - - gzip -d < XFree86-4.6.0-src-5.tgz | tar vxf - + gzip -d < XFree86-4.7.0-src-5.tgz | tar vxf - - gzip -d < XFree86-4.6.0-src-6.tgz | tar vxf - + gzip -d < XFree86-4.7.0-src-6.tgz | tar vxf - - gzip -d < XFree86-4.6.0-src-7.tgz | tar vxf - + gzip -d < XFree86-4.7.0-src-7.tgz | tar vxf - -Alternatively, if you already have a pristine copy of the XFree86 4.5.0 +Alternatively, if you already have a pristine copy of the XFree86 4.6.0 source, you can download patches from -ftp://ftp.xfree86.org/pub/XFree86/4.6.0/patches/ that will allow you to con- -vert it to 4.6.0. Information about which patch files to download and how to +ftp://ftp.xfree86.org/pub/XFree86/4.7.0/patches/ that will allow you to con- +vert it to 4.7.0. Information about which patch files to download and how to apply them can be found in the "How to get XFree86" section of the README for this release. @@ -102,8 +102,8 @@ sarily. Before making too many modifications, check the configuration param- eters specified in the xc/config/cf/README file. -If you are using just the XFree86-4.6.0-src-1.tgz, XFree86-4.6.0-src-2.tgz -and XFree86-4.6.0-src-3.tgz parts of the source dist, you will need to define +If you are using just the XFree86-4.7.0-src-1.tgz, XFree86-4.7.0-src-2.tgz +and XFree86-4.7.0-src-3.tgz parts of the source dist, you will need to define BuildFonts to NO. 3. Using a shadow directory of symbolic links for the build @@ -284,4 +284,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v 3.20 dawes Exp $ -$XFree86: xc/BUILD.txt,v 1.3 2006/04/12 01:50:31 dawes Exp $ +$XFree86: xc/BUILD.txt,v 1.4 2007/08/04 02:16:06 tsi Exp $ Index: xc/Imakefile diff -u xc/Imakefile:3.34 xc/Imakefile:3.37 --- xc/Imakefile:3.34 Wed Mar 1 22:00:34 2006 +++ xc/Imakefile Sun Mar 4 11:33:30 2007 @@ -1,10 +1,14 @@ -XCOMM $XFree86: xc/Imakefile,v 3.34 2006/03/02 03:00:34 dawes Exp $ +XCOMM $XFree86: xc/Imakefile,v 3.37 2007/03/04 16:33:30 tsi Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" #ifdef XFree86VersionString +#ifndef XFree86CustomVersion VERSTRING = " "version XFree86VersionString "("XFree86DateString")" +#else +VERSTRING = " "version XFree86VersionString "("XFree86DateString") ("XFree86CustomVersion")" +#endif #endif #ifndef OSName @@ -51,7 +55,7 @@ #ifdef XFree86VersionString VerifyOS:: @echo "" - @echo Building XFree86 version XFree86VersionString "("XFree86DateString")." + @echo Building XFree86$(VERSTRING). #endif #ifdef OSRelVersion VerifyOS:: @@ -97,6 +101,7 @@ includes:: MakeDir($(BUILDINCDIR)) + MakeDir($(BUILDLIBDIR)) MakeDir($(BUILDBINDIR)) XCOMM @@ -110,7 +115,7 @@ MAKE_OPTS = -f xmakefile World:: - $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(TOPPARALLELMFLAGS) all + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) $(TOPPARALLELMFLAGS) all Everything:: @echo "" @@ -119,16 +124,16 @@ @date @echo "" cd $(IMAKESRC) && if [ -f Makefile ]; then \ - $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ + $(MAKE) $(PASSMFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ else \ - $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ + $(MAKE) $(PASSMFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ fi -$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak - $(MAKE) $(MFLAGS) xmakefile - $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles - $(MAKE) $(MFLAGS) $(MAKE_OPTS) includes - $(MAKE) $(MFLAGS) $(MAKE_OPTS) depend - $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS) + $(MAKE) $(PASSMFLAGS) xmakefile + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) Makefiles + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) includes + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) depend + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) $(WORLDOPTS) @echo "" @date @echo "" @@ -163,14 +168,14 @@ @echo : @echo : cd $(IMAKESRC) - $(MAKE) $(MFLAGS) -f Makefile.ini imake.exe + $(MAKE) $(PASSMFLAGS) -f Makefile.ini imake.exe cd ..\.. RMoveToBakFile(xmakefile) - $(MAKE) $(MFLAGS) xmakefile - $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles - $(MAKE) $(MFLAGS) $(MAKE_OPTS) includes - $(MAKE) $(MFLAGS) $(MAKE_OPTS) depend - $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS) + $(MAKE) $(PASSMFLAGS) xmakefile + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) Makefiles + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) includes + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) depend + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) $(WORLDOPTS) @echo : @echo : @echo Rebuild of XFree86$(VERSTRING) complete. Index: xc/Install.txt diff -u xc/Install.txt:1.3 xc/Install.txt:1.4 --- xc/Install.txt:1.3 Tue Apr 11 21:50:31 2006 +++ xc/Install.txt Fri Aug 3 22:16:06 2007 @@ -1,4 +1,4 @@ - Installation Details for XFree86® 4.6.0 + Installation Details for XFree86® 4.7.0 The XFree86 Project, Inc @@ -22,11 +22,11 @@ XFree86 CVS repository's "utils" module, and from our ftp site .) -2. Downloading the XFree86 4.6.0 binaries +2. Downloading the XFree86 4.7.0 binaries -We provide XFree86 4.6.0 binaries for a range of operating systems at our ftp -site and our web site -. Often during +We provide XFree86 4.7.0 binaries for a range of operating systems at our ftp +site and our web site +. Often during releases our site is heavily loaded. Instead of downloading directly from us we recommend that instead you use one of our mirror sites. @@ -71,9 +71,9 @@ that your target will not be be available for this release. This is likeliest possibility if you are looking more than about two weeks after the release date. Check here - for information about + for information about updates to our binary distributions, and here - for errata related to + for errata related to this release. Assuming that you have run the Xinstall.sh script and found the binary dis- @@ -138,9 +138,9 @@ If you miss some and want to install them later, go to the Manual Installa- tion (section 4., page 1) section. -3. Installing XFree86 4.6.0 using the Xinstall.sh script +3. Installing XFree86 4.7.0 using the Xinstall.sh script -We strongly recommend that our XFree86 4.6.0 binaries be installed using the +We strongly recommend that our XFree86 4.7.0 binaries be installed using the Xinstall.sh script we provide. There are a lot of steps in the manual installation process, and those steps can vary according to the platform and hardware setup. There is a description of the manual installation process @@ -284,9 +284,9 @@ After the X server configuration is done, it may be advisable to reboot, especially if you run xdm (or equivalent) or the font server (xfs). -4. Installing XFree86 4.6.0 manually +4. Installing XFree86 4.7.0 manually -This section contains information about manually installing the XFree86 4.6.0 +This section contains information about manually installing the XFree86 4.7.0 binary distributions. You should only use this method if you know what you're doing. The information here covers some common cases, but not every possible case. It also may not be complete or up to date. Use at your own @@ -396,4 +396,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.22 dawes Exp $ -$XFree86: xc/Install.txt,v 1.3 2006/04/12 01:50:31 dawes Exp $ +$XFree86: xc/Install.txt,v 1.4 2007/08/04 02:16:06 tsi Exp $ Index: xc/LICENSE.txt diff -u xc/LICENSE.txt:1.6 xc/LICENSE.txt:1.9 --- xc/LICENSE.txt:1.6 Tue Apr 18 13:16:36 2006 +++ xc/LICENSE.txt Fri Aug 3 22:16:06 2007 @@ -49,14 +49,14 @@ 3.1 Open Source -We believe that all of the code in this release (4.6.0) of XFree86 meet the +We believe that all of the code in this release (4.7.0) of XFree86 meet the requirements of the Open Source Definition , as maintained by the Open Source Initiative (OSI) . 3.2 Free Software -We believe that most of the code in this release (4.6.0) of XFree86 meets the +We believe that most of the code in this release (4.7.0) of XFree86 meets the requirements of the Free Software definition as defined by the Free Software Foundation (FSF) . @@ -188,7 +188,7 @@ Copyright (C) 1999-2003 by Peter Kunzmann, Citron GmbH, Germany. -Copyright (C) 1994 through 2006 by Marc Aurele La France (TSI @ UQV), +Copyright (C) 1994 through 2007 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org Copyright (C) 1996 by Steven Lang @@ -769,9 +769,6 @@ Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved. -This code is derived from software contributed to The NetBSD Foundation by -Ben Collver - Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: @@ -782,11 +779,7 @@ notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: This product includes soft- - ware developed by the NetBSD Foundation, Inc. and its contributors. - - 4. Neither the name of The NetBSD Foundation nor the names of its con- + 3. Neither the name of The NetBSD Foundation nor the names of its con- tributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -1638,7 +1631,7 @@ authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.43 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.45 tsi Exp $ -$XFree86: xc/LICENSE.txt,v 1.6 2006/04/18 17:16:36 dawes Exp $ +$XFree86: xc/LICENSE.txt,v 1.9 2007/08/04 02:16:06 tsi Exp $ Index: xc/Makefile diff -u xc/Makefile:3.30 xc/Makefile:3.33 --- xc/Makefile:3.30 Fri Jun 10 15:43:59 2005 +++ xc/Makefile Wed Jul 26 09:27:42 2006 @@ -1,4 +1,4 @@ -# $XFree86: xc/Makefile,v 3.30 2005/06/10 19:43:59 dawes Exp $ +# $XFree86: xc/Makefile,v 3.33 2006/07/26 13:27:42 tsi Exp $ # Luna users will need to either run make as "make MAKE=make" # or add "MAKE = make" to this file. @@ -21,9 +21,12 @@ MAKE_OPTS = -f xmakefile MAKE_CMD = $(MAKE) $(MAKE_OPTS) FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)" -VERSINC = -Iprograms/Xserver/hw/xfree86 +VERSINC = -Iprograms/Xserver/hw/xfree86 -I$(CONFIGSRC)/cf VERSSRC = $(CONFIGSRC)/util/printver.c VERSPROG = $(CONFIGSRC)/util/printver.exe +VERSSITEDEF = $(CONFIGSRC)/cf/site.def +VERSHOSTDEF = $(CONFIGSRC)/cf/host.def +VERSSITEINC = $(CONFIGSRC)/cf/site.h all: @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial @@ -37,8 +40,14 @@ @echo Do not name your log file make.log or it will be deleted. World: + @$(RM) $(VERSSITEINC) + @if [ -f $(VERSHOSTDEF) ]; then \ + sed -e '/^XCOMM/d' < $(VERSHOSTDEF) > $(VERSSITEINC); \ + fi + @sed -e '/^XCOMM/d' < $(VERSSITEDEF) >> $(VERSSITEINC) @$(RM) $(VERSPROG) @$(CC) $(VERSINC) -o $(VERSPROG) $(VERSSRC) + @$(RM) $(VERSSITEINC) @echo "" @echo Building XFree86`$(VERSPROG)`. @echo "" @@ -85,8 +94,14 @@ @echo "" @date @echo "" + @$(RM) $(VERSSITEINC) + @if [ -f $(VERSHOSTDEF) ]; then \ + sed -e '/^XCOMM/d' < $(VERSHOSTDEF) > $(VERSSITEINC); \ + fi + @sed -e '/^XCOMM/d' < $(VERSSITEDEF) >> $(VERSSITEINC) @$(RM) $(VERSPROG) @$(CC) $(VERSINC) -o $(VERSPROG) $(VERSSRC) + @$(RM) $(VERSSITEINC) @echo Full build of XFree86`$(VERSPROG)` complete. @$(RM) $(VERSPROG) @echo "" Index: xc/README.txt diff -u xc/README.txt:1.5 xc/README.txt:1.6 --- xc/README.txt:1.5 Tue Apr 11 21:50:31 2006 +++ xc/README.txt Fri Aug 3 22:16:06 2007 @@ -1,4 +1,4 @@ - README for XFree86® 4.6.0 + README for XFree86® 4.7.0 The XFree86 Project, Inc @@ -11,20 +11,20 @@ Linux, FreeBSD, NetBSD, OpenBSD and Solaris) on Intel and other platforms. This version is compatible with X11R6.6. -1. What is XFree86 4.6.0? +1. What is XFree86 4.7.0? -XFree86 4.6.0 is the ninth full release in the XFree86 4.x series. +XFree86 4.7.0 is the tenth full release in the XFree86 4.x series. XFree86 4.x is the current XFree86 release series. The first release in this series was in early 2000. The core of XFree86 4.x is a modular X server. -The 4.6.0 version is a new release that includes additional hardware support, +The 4.7.0 version is a new release that includes additional hardware support, functional enhancements and bug fixes. Specific release enhancements can be viewed in the Release Notes. -Most modern PC video hardware is supported in XFree86 4.6.0, and most PC +Most modern PC video hardware is supported in XFree86 4.7.0, and most PC video hardware that isn't supported explicitly can be used with the "vesa" driver. The Release Notes has a table showing the drivers provided with -XFree86 4.6.0, and links to related documentation. +XFree86 4.7.0, and links to related documentation. XFree86® is produced by The XFree86 Project, Inc through the work of a group of volunteer independent developers. The XFree86 Project is a non-commercial @@ -61,7 +61,7 @@ 3. Pointers to additional information The documentation for this release can be found online at the XFree86 web -site . Documentation for the latest +site . Documentation for the latest release version can always be found here , and documentation for the latest pre-release snapshot can be found here . @@ -116,23 +116,23 @@ Current information about the XFree86 development process can be found at our web site . -6. How to get XFree86 4.6.0 +6. How to get XFree86 4.7.0 -XFree86 4.6.0 can be found at the XFree86 ftp server -. Information about obtaining +XFree86 4.7.0 can be found at the XFree86 ftp server +. Information about obtaining and installing binary distributions of this release can be found in the Installation Document. Information about obtaining the release in source form is given below. -The source for version 4.6.0 is split into seven tarballs: +The source for version 4.7.0 is split into seven tarballs: - XFree86-4.6.0-src-1.tgz - XFree86-4.6.0-src-2.tgz - XFree86-4.6.0-src-3.tgz - XFree86-4.6.0-src-4.tgz - XFree86-4.6.0-src-5.tgz - XFree86-4.6.0-src-6.tgz - XFree86-4.6.0-src-7.tgz + XFree86-4.7.0-src-1.tgz + XFree86-4.7.0-src-2.tgz + XFree86-4.7.0-src-3.tgz + XFree86-4.7.0-src-4.tgz + XFree86-4.7.0-src-5.tgz + XFree86-4.7.0-src-6.tgz + XFree86-4.7.0-src-7.tgz The first three contain everything except the fonts and general X11 documen- tation. Those three are sufficient for building XFree86 if you already have @@ -140,31 +140,31 @@ the source for the general X11 documentation. The seventh contains the gen- eral X11 documentation in hardcopy format. -A source patch relative to version 4.5.0 is also available. Because of its +A source patch relative to version 4.6.0 is also available. Because of its size, it is split into four parts. The patch files are: - XFree86-4.5.0-4.6.0.diff1.gz - XFree86-4.5.0-4.6.0.diff2.gz - XFree86-4.5.0-4.6.0.diff3.gz - XFree86-4.5.0-4.6.0.diff4.gz + XFree86-4.6.0-4.7.0.diff1.gz + XFree86-4.6.0-4.7.0.diff2.gz + XFree86-4.6.0-4.7.0.diff3.gz + XFree86-4.6.0-4.7.0.diff4.gz There is also a tarball and a cleanup script that handle files that have com- ponents that can't be included in a diff. These are: - XFree86-4.5.0-4.6.0-diff0.tgz - XFree86-4.5.0-4.6.0-cleanup.sh + XFree86-4.6.0-4.7.0-diff0.tgz + XFree86-4.6.0-4.7.0-cleanup.sh -These patches should be applied to a clean 4.5.0 source tree, working from +These patches should be applied to a clean 4.6.0 source tree, working from the directory containing the xc/ directory. The patches should be applied by running: - gzip -d < XFree86-4.5.0-4.6.0.diff1.gz | patch -p0 -E - gzip -d < XFree86-4.5.0-4.6.0.diff2.gz | patch -p0 -E - gzip -d < XFree86-4.5.0-4.6.0.diff3.gz | patch -p0 -E - gzip -d < XFree86-4.5.0-4.6.0.diff4.gz | patch -p0 -E + gzip -d < XFree86-4.6.0-4.7.0.diff1.gz | patch -p0 -E + gzip -d < XFree86-4.6.0-4.7.0.diff2.gz | patch -p0 -E + gzip -d < XFree86-4.6.0-4.7.0.diff3.gz | patch -p0 -E + gzip -d < XFree86-4.6.0-4.7.0.diff4.gz | patch -p0 -E - sh XFree86-4.5.0-4.6.0-cleanup.sh - gzip -d < XFree86-4.5.0-4.6.0-diff0.tgz | tar vxf - + sh XFree86-4.6.0-4.7.0-cleanup.sh + gzip -d < XFree86-4.6.0-4.7.0-diff0.tgz | tar vxf - To format the XFree86 documentation use the latest version of our doctools package available from the XFree86 CVS repository's "doctools" module, and @@ -177,8 +177,8 @@ on our web site. It's also possible to browse the XFree86 CVS repository at our CVSWeb server . The CVS tag for this version is -"xf-4_6_0". The CVS tag for the stable branch for this release is -"xf-4_6-branch". To check out the latest development version, don't specify +"xf-4_7_0". The CVS tag for the stable branch for this release is +"xf-4_7-branch". To check out the latest development version, don't specify any tag. 7. Reporting Bugs @@ -203,4 +203,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.149 dawes Exp $ -$XFree86: xc/README.txt,v 1.5 2006/04/12 01:50:31 dawes Exp $ +$XFree86: xc/README.txt,v 1.6 2007/08/04 02:16:06 tsi Exp $ Index: xc/RELNOTES.txt diff -u xc/RELNOTES.txt:1.7 xc/RELNOTES.txt:1.10 --- xc/RELNOTES.txt:1.7 Fri Apr 28 23:38:00 2006 +++ xc/RELNOTES.txt Sun Aug 12 20:57:46 2007 @@ -1,18 +1,18 @@ - Release Notes for XFree86® 4.6.0 + Release Notes for XFree86® 4.7.0 The XFree86 Project, Inc - April 2006 + August 2007 Abstract This document contains information about the various features and - their current status in the XFree86 4.6.0 release. + their current status in the XFree86 4.7.0 release. 1. Introduction to the 4.x Release Series XFree86 4.0 was the first official release of the XFree86 4 series. The cur- -rent release (4.6.0) is the latest in that series. The XFree86 4.x series +rent release (4.7.0) is the latest in that series. The XFree86 4.x series represents a significant redesign of the XFree86 X server, with a strong focus on modularity and configurability. @@ -20,14 +20,14 @@ Automatic configuration was introduced with XFree86 4.4.0 which makes it pos- sible to start XFree86 without first creating a configuration file. This has -been further improved in XFree86 4.5.0 and 4.6.0. If you experienced any -problems with automatic configuration in a previous release, it is worth try- -ing it again with this release. - -While the initial automatic configuration support was originally targeted ust -for Linux and the FreeBSD variants, as of 4.5.0 it also includes Solaris, -NetBSD and OpenBSD support. Full support for automatic configuration is -planned for other platforms in future releases. +been further improved in subsequent releases. If you experienced any prob- +lems with automatic configuration in a previous release, it is worth trying +it again with this release. + +While the initial automatic configuration support was originally targeted +just for Linux and the FreeBSD variants, as of 4.5.0 it also includes +Solaris, NetBSD and OpenBSD support. Full support for automatic configura- +tion is planned for other platforms in future releases. If you are running Linux, FreeBSD, NetBSD, OpenBSD, or Solaris, try Auto Con- figuration by running: @@ -43,8 +43,8 @@ XFree86 -appendauto -If you using a platform that is not currently supported, then you must try -one of the older methods for getting started like xf86cfg", which is our +If you are using a platform that is not currently supported, then you must +try one of the older methods for getting started like "xf86cfg", which is our graphical configuration tool. It also has a text mode interface that an be used to create an initial configuration file and customise existing configu- rations. @@ -72,13 +72,13 @@ through the Installation Document as it can point out which particular binary you should download. -The next section describes what is new in the latest version (4.6.0) compared -with the previous full release (4.5.0). There are many new features in this +The next section describes what is new in the latest version (4.7.0) compared +with the previous full release (4.6.0). There are many new features in this release and we unfortunately do not have enough space to cover them all here. -3. Summary of new features in 4.6.0. +3. Summary of new features in 4.7.0. -This is a sampling of the new features in XFree86 4.6.0. A more complete +This is a sampling of the new features in XFree86 4.7.0. A more complete list of changes can be found in the CHANGELOG that is part of the XFree86 source tree. It can also be viewed online at our CVSweb server , CAN-2005-2495 - ). + o CVE-2006-0747. -3.2 Video Driver Enhancements - - o Remove cfb support from the i740, nsc, s3virge, siliconmotion and via - drivers. - -3.2.1 aspeed - - o A new driver for ASPEED Technologies' AST2000 graphics chips. - -3.2.2 ati - - o Reinstate support for all ATI adapters on all architectures supported by - the XFree86 common layer. - - o Restore accuracy of atimisc's clock probe despite certain I/O errors. - - o Change the atimisc driver on big-endian systems to allow depth 24 even - if the big-endian aperture is not available, by swapping RGB masks. - - o Fix an ATI driver probe crash. - - o Workaround for screen-to-screen copy corruption in second-generation - integrated controllers. - - o Improve accuracy of atmisc's calculations that are based on a 29.5 MHz - reference clock. - - o Chrontel 8398 related changes to the Mach64 support. - - o Fix one cause of video memory corruption when using XAA with second gen- - eration integrated Mach64 controllers. - -3.2.3 glint - - o Fix the size of the DAC registers storage for pm2v and pm3 chipsets. + o CVE-2006-1861. -3.2.4 i740 + o CVE-2006-2661. - o Save and restore more of the mode on server entry. + o CVE-2006-6101. -3.2.5 i810 + o CVE-2006-6102. - o Make sure the DDC-probed parameters are applied before modes are - selected. + o CVE-2006-6103. - o Fix some bad alignment problems when allocating memory from the end of - AGP space. + o CVE-2007-1003. - o Adjust the display width according to the VESA BIOS scanline require- - ments. + o CVE-2007-1351. - o Add support for the Intel E7221 server chipset. + o CVE-2007-1352. - o Improve display switching support for mobile chipsets using the Fn+F? - combination keys. + o CVE-2007-1667. - o Add DirectColor support for the i830 and later. + o CVE-2007-2754. - o Add gamma correction support for the i830 and later. +In addition, a number of potential integer overflow problems in the Type 1 +font rendering code have been corrected. - o Add rotation support for the i830 and later. - - o Improve refresh rate selection for custom modelines. - - o Add support for the 945G and 945GM. - - o Support custom video modes in the video BIOS, when available. - - o Fix some offset, pitch, and overlay scaler size problems with the video - overlay. This solves various spontaneous lockups. - - o Fix text restoration when display switching has been activated. - - o Add support to check the built-in VESA mode list. - - o Fix XVideo when operating in one line mode and video is pushed off the - top of the screen, and fix some XVideo skew problems at certain resolu- - tions. +3.2 Video Driver Enhancements - o Sync the accelerator before calling AdjustFrame to avoid lockups. +3.2.1 ati, atimisc, r128 and radeon - o Fix a lockup when spend and resume when playing video (shutdown the - overlay on LeaveVT). + o Fix bug that caused the version check between the ati and atimisc mod- + ules to fail. - o Support 1920x1088 for HDTV movies using a new option (LinearAlloc) to - add more memory for the video overlay. + o The atimisc module's saving and restoring of the mode on server entry + has been made more reliable on 64-bit systems. - o Add ACPI hotkey switching support. + o Fix bug that prevented detection of non-PCI adapters on systems that do + not provide accurate PCI resource sizes. -3.2.6 mga + o Fix the radeon driver's saving and restoring of the mode on server + entry. - o Reduce the Mystique's SYSCLK from 197 MHz to 166 MHz, allowing the - higher clock to still be used when the "OverclockMem" option is acti- - vated. This fixes the instability seen on some Mystique cards, and - removes the need for the workaround in previous releases. +3.2.2 chips - o Revert the HALlib MGASetDisplayStart interface back to HALSetDis- - playStart. + o Fix some of this driver's endianness problems. - o Make 8+24 mode honour the default visual. +3.2.3 i128 -3.2.7 nv + o Resurrect support for Ti3026 RAMDACs found on the original I128 + adapters. Note that there are still issues with depth 8 visuals and + hardware cursors. - o Some of the panel DPMS support in 4.5.0 only works for TMDS, and caused - some panel blooming on some LVDS panels, so skip the DPMS panel code - when the panel is LVDS. +3.2.4 mga - o Add DPMS support for GeForce4 and newer laptops. + o Add support for Matrox MGA G200e SE adapters. - o Fix some console restore code for the NV11. + o Fix determination of the mode on server entry. Also, save and restore + it on VC switches. - o Workaround for 512MB video cards (can only map 256MB of it). +3.2.5 newport - o Fix a graphics acceleration hang that occurred on some NVIDIA GeForce - 6xxx cards. + o Add support for the DPMS extension. - o Fix a potential problem with pixmap cache corruption on GeForce 6xxx and - 7xxx parts. +3.2.6 nv o Add support for new hardware. -3.2.8 siliconmotion +3.2.7 pnozz - o Merge in support for SiliconMotion's SM501 controller. + o This accelerated driver supports the Weitek POWER 9100 SBUS adapters + found in some SPARC laptops. -3.2.9 suncg6 +3.2.8 sunbw2, suncg14, suncg3, sunleo, suntcx - o Add screen-to-screen copy, solid fill, and CPU-to-screen colour expan- - sion acceleration. + o These drivers, intended for various SPARC SBUS and UPA adapters, can now + blank and unblank the screen correctly. - o Map more of a Sun CG6's video memory for use by the pixmap cache. +3.2.9 sunffb -3.2.10 sunffb + o Prevent turning off the FPU on OpenBSD. - o Prevent turning off the FPU on NetBSD. - - o Fix build problems on NetBSD (global register usage declaration, and - increase stack usage). + o Fix bug that prevented use of this driver on SunOS and Solaris. o Workaround for VRAM corruption when unblanking FFB1 adapters. -3.2.11 tdfx - - o Add DDC2 support. - -3.2.12 trident - - o Do not wait for vertical retrace on PC98 systems. - - o Fix an offset problem in Xv for the Cyber9397 and later chipsets. - - o Add XGI (Trident) Volari XP5 support to the trident driver. - -3.2.13 via +3.2.10 trident - o Add a "ConnectedDevice" option to the via driver to force selection of - output devices. - -3.2.14 vmware - - o Implement a workaround in the generic int10 module to allow unaligned - I/O access specific to VMWare's second generation emulated adapter. - -3.2.15 xgi - - o A new driver for the Volari V3XT, V5, V8, Z7 chipsets. + o Resave the mode on server entry when switching back to the server's vir- + tual console. 3.3 Input Driver Enhancements -3.3.1 keyboard - - o Ignore KEY_UNUSED scancodes. - -3.3.2 mouse - - o Fix auto-detection of Sun mice on Linux/SPARC. - -3.3.3 magictouch +3.3.1 mouse - o Port of the magictouch driver to XFree86 4.x. + o Do not disable 3-button mouse emulation even when the mouse is found to + actually have a third button. This helps laptops, and the like, running + systems that combine a touchpad and an external mouse into one device. 3.4 XKB updates - o Replace the macintosh/fr map with the "fr_new" map, release 4. + o Add an XKB geometry for Dell Inspiron 8000 notebook keyboard. - o Fix a bug in XKB group adjustment. + o Add an XKB geometry for Enermax Aurora keyboards. - o Fix off-by-one errors in XKBMalloc.c. + o Add XKB keycodes for MacIntosh USB keyboards. - o Shrink tables instead of only growing them. + o Add XKB definitions for X860x0 keyboards. - o Fix various vmodmap vs modmap cut and paste bugs. + o Update Macintosh french keymap. - o Improve synthesized core X events for reporting XKB changes to XKB- - unaware clients. - - o Fix a setxkbmap segfault. - - o Add Eszett (ssharp) to the us_intl map. - - o Add dvorak_intl map. - - o Add a Khmer layout. - - o Add multimedia keysyms for the Inspiron 6000 laptop to the "inspiron" - set. + o Allow signed coordinates in XKB shape definitions. 3.5 X Server and Extension Updates - o Updates to the handling of the X server RGB database: - - o Ignore white space, dash, and underscore characters, as well as - case when matching colour names, and remove the unnecessary dupli- - cates in rgb.txt. - - o Allow a copy of the RGB database to be included into the X servers - as a fallback for when the rgb.txt file cannot be found. - - o Remove the (unused) support for DBM-compiled RGB database files. - - o Make the AMD64/x86_64 platform tests consistent throughout. - - o Rework the way that extension support is built into the servers to allow - for servers with different sets of extensions in the same build. This - includes minimising the number of pervasive extensions, and adding DIX - helpers for extensions such as Xinerama and XCSECURITY. - - o Modify the X server handling of SIGINT to provide a faster exit path - than SIGTERM, while ensuring that all hardware state gets restored. - This change is used by xinit as a cleaner alternative to using SIGKILL - for a slowly exiting server. - 3.5.1 Loader - o Add support for relocation type 10 for Alpha to the ELF loader. - - o Fix issues with Linux/SPARC 2.6 kernels. - - o Add loader infrastructure to implement inter-module version checks. - - o Use mprotect on NetBSD. - - o Fix support for NetBSD/arm. - - o Add support for R_SPARC_OLO10 relocations. - - o Make error messages for unsupported relocations more useful. - - o Improve the loader server's emulation of shmctl() calls. - - o Fix some problems with the a.out header macros used by the loader, which - was causing incorrect header interpretation for some a.out object types. - - o Major loader enhancements, including: - - o Per-module export symbol lists. + o Fixed support for R_ALPHA_GPRELHIGH relocations. - o Improved symbol hash. + o Added support for R_ALPHA_BRSGP relocations. - o A mechanism for specifying the scope of symbols. + o Fixed handling of archives on non-Linux SPARC. - o Keep track of relocations, and undo them when they become unre- - solved on module unload, and recalculate them when they change on - module load. + o Fixed support for R_SPARC_LO10 and R_SPARC_OLO10 relocations. - o Check relocations on each module load/unload, ensuring that func- - tion references that are unresolved at any time are always mapped - to the catch-all function, preventing calls into nowhere. + o Added support for most ELF SPARC relocation types. - o Efficient handling of invariant relocations. - - o Cleanup/update the memleak stack trace code, and print a stack - trace when an unresolved function is called or when XFree86 aborts. - - o Update the catch-all function to identify the unresolved function - that was called. - - o Read the XFree86 executable's symbol table in order to get the most - useful stack traces, and use dladdr() where available for identify- - ing shared library references. - - o Cleanup and unify debug messages for the loader components. - - o Use module-instance-specific referenced and required symbol lists. - - o Update drivers to make use of some of the new loader functionality, - including the instance-specific ref/req lists, and some unloading - of modules when they are no longer needed. - - o Don't build the coff loader on platforms that it doesn't support. - - o Use stronger typing of the module-visible instance-specific module - descriptor. - - o No longer disable xf86UnloadSubModule() since the loader now han- - dles unloads and reloads cleanly. - - o Do not defer unloading drivers when using autoconfig, since that is - not necessary with the loader updates. + o Added an emulation of rand(3) calls. 3.5.2 XFree86 core server and modules - o Modify the handling of preferred EDID modes to allow user-specified - modes that are larger than the preferred mode. - - o Refine VGA routing emulation through Sun's Simba P2P bridges. - - o Allow a static server's -configure to generate an XF86Config for the - loader server. - - o Fix a bug relating to the forwarding of 64-bit memory addresses by PCI- - to-PCI bridges on 32-bit systems. - - o Fix a bug in the decoding of I/O forwarding by Cardbus bridges. - o Update -configure to detect when wscons support should be used for the - keyboard on NetBSD. + keyboard on OpenBSD. - o Fix an endianness bug in the xf4bpp module. + o Added preliminary support for PCI domains on OpenBSD/sparc64. This cur- + rently requires a kernel change. - o Fix some of the endianness bugs in the vbe module. + o On the *BSD's, added support for absolute mouse position events and hor- + izontal scroll wheels. - o Remove obsolete VBE functions that have not been compiled-in for some - time. + o Fixed a bug that caused an entire batch of mouse events to be rejected + when one of an unknown type was encountered. - o Fix VBE's reporting of video memory size. + o Don't error out on unknown wskbd types on the *BSD's. - o Re-implement Alpha kludge in x86emu's ops.c to be more portable. + o Fixed memory leaks in option processing. - o Intercept "raw" requests for PCI configuration space from video BIOSes - on all architectures. + o Fixed area granularity handling in the framebuffer manager. - o Handle unaligned I/O requests more gracefully and be more tolerant of - spurious I/O errors in the int10 module. + o Reworked the sizing of PCI resources. More specifically, reduced the X + server's reliance on the OS to provide such information. - o Make sparse I/O masks more portable throughout the server. + o Added support for SBUS and UPA adapters on NetBSD and OpenBSD. - o Fix a long-standing off-by-one bug in the setting of RGB offsets when - the driver supplies RGB masks. + o Added support for Solaris/amd64. - o Make I/O error handling more reliable on SPARC. + o Added support for UltraSPARC IV systems, including support for PCI + Express. - o Change the OS-specific module subdirectory name for all SunOS variants - from "solaris" to "sunos". + o Added support for DrangonFly, a variant of FreeBSD. - o Port of SBUS drivers to SunOS variants. This also allows for multihead - using a mix of SBUS and PCI devices. + o Added support for x86_64 architectures on the *BSD's. - o Fix text mode restore on x86/Solaris 8 and later. + o Fixed page size determination in various server-related utilities. - o Change autoconfiguration to include PCI and SBUS BusIDs in generated - device sections. This fixes some problems when fbdev is active. - - o Prevent the sharing of a PCI entity by more than one driver. - - o Insulate various common layer functions against out-of-bounds entity - indices. - - o Fix XAA's support for TRIPLE_BITS_24BPP on big-endian systems. - - o Fix unaligned access in XAA's handling of 24bpp. - - o The xf24_32bpp module is no longer used by any of our drivers, so don't - include it in static builds. - - o The xf8_32wid module is only used by the sunffb driver, so don't include - it in non-SPARC static builds. - - o Fix generic int10 memory accesses on little-endian systems. - - o Fix a SEGV that can occur under certain builds of glibc 2.3.4 and up, - when linux/int10 attempts to determine kernel support for the vm86() - system call. - - o Add an xf86DeallocateGARTMemory() function. - - o Make autoconfig stop at the first successful probe on each retry, min- - imising unnecessary probes. + o Made the mmapr and mmapw utilities understand wscons mapping modes on + the *BSD's. 3.5.3 TinyX - o Allow build-time selection of which font renderers get built in to the - TinyX servers. - - o Fix a problem where VT switching back to TinyX servers was failing due - to blocking on keyboard read. - - o Fix a TinyX build issue under !XserverStaticFontLib. - - o Move Xserver/*/tiny directories under Xserver/hw/tinyx. - - o TinyX build fixes. - -3.5.4 Xnest + o Added an option to the TinyX servers to prevent them from probing serial + ports on Linux. - o Add a "-noinput" option that allows Xnest to be run in a view-only mode. +3.5.4 Xsun -3.5.5 Xsun + o Changes to port the various Xsun servers to NetBSD/sparc have been + merged in. - o Fix incorrect bitsPerPixel for depth 12 in pixmap formats advertised by - the Xsun24 server. +3.5.5 XDarwin -3.5.6 cfb + o This X server has been heavily upgraded by integrating a wide selection + of changes from its now defunct X.Org implementation. - o Fix a bug that occurs when using cfb to tile 32-bit rectangles on SPARC. +3.5.6 Xvfb - o cfb24 is no longer needed. Keep the loadable module, but no longer - statically link it into servers. + o Fixed segfaults in Xvfb's command line parsing. -3.5.7 shadow +3.5.7 cfb - o Rewrite shadowUpdateRotatePacked() to reduce cache misses. + o Fix a number of bugs in cfb24, even though it is no longer used by any + driver provided in the distribution. -3.5.8 Xinerama + o Fix stipple handling on sparc64. - o Cause the server to FatalError() when Xinerama attempts to create a - screen whose root depth has no visuals, causing Xlib to segfault. +3.5.8 fb - o Allow Xinerama to initialise even when there is only one screen to com- - bine. + o A problem that prevented the use of the GLX extension in some cases has + been corrected. - o Make loadable modules and MI independent of Xinerama: + o Fix fbCompose() for ABGR framebuffers. - o Add a DIX helper to determine whether Xinerama is active and use it - instead of #ifdef's code in all loadable modules. +3.5.9 Render - o Re-implement, as a screen wrapper, Xinerama's PaintWindow*() hacks. - - o Move down to DIX Xinerama's only MI hook. - -3.5.9 XFree86-DGA - - o Do not call a screen's PointerMoved entry if a DGA mode is active on - that screen. - - o Fix client-side framebuffer mapping on NetBSD. - - o Make sure that DGAShutdown() is always called before HW state is - restored on exit and reset, and make sure that it is not called after - the HW state has been restored. - -3.5.10 Render - - o Fix unaligned access in RenderCompositeGlyphs request. - -3.5.11 RandR - - o Use xf86SetViewport as well as SetCursorPosition during RandR rotation, - as xf86SetViewport will call AdjustFrame to reposition the window if - necessary and avoid the cursor ending up off screen. - - o Add a new function xf86GetRotation() to allow third party modules to - obtain the current rotation. - - o Fix up error case when rotation fails and the framebuffer needs to be - re-enabled. + o Endianness fix for RenderSetPictureClipRectangles request. 3.6 Library, Client and Utility Updates -3.6.1 Xlib - - o Fix typos in XErrorDB that were preventing descriptive messages for some - extension errors. - -3.6.2 Xt - - o Fix an uninitialised pointer dereference in Xt/Initialize.c on WIN32 - platforms that happens if $HOME is set in the environment. - - o Add support to Xt's string to float converter to read resources in frac- - tional notation. - - o Add some XChar2b string manipulation functions to Xt. - - o Bump the minor revision of the Xt shared library to reflect the fact - that some new interfaces have been added. - -3.6.3 Xaw - - o Extend the tool tip resource for Xaw's simpleWidgetClass to allow a - function to be called - - o Fix problems with Xaw's label widget when using XChar2b strings. - - o Add a new connectionType property to Xaw's tree widget. - - o Make Xaw Form widgets inherit dimensions from their parent at widget - initialisation time. - - o Add mouse wheel support for Scrollbars in Xaw's Viewport widget. - - o Fix a performance issue with Xaw's Tree widget caused by useless relay- - outs. - - o Fix i18n for Xaw's tooltip widget. - - o Add two new functions that can be used to scroll the content of an Xaw - viewport from outside the viewportWidgetClass. - - o Fix the cursor in Xaw textWidget when the input field has focus. - - o Bump the minor revision of the Xaw shared library to reflect the fact - that some new interfaces have been added. - - o Add user_data field to Xaw's simpleWidgetClass. - - o Fix Xaw viewport scrollbar flickering problem. +3.6.1 restest -3.6.4 pswrap + o This XRes extension client, originally written by Mark Vojkovich, has + been integrated, after rewriting it to prevent deadlocks that could + occur when displaying its results in an X session. - o Fix a problem where pswrap generates a bogus .c file when the -h option - is not used. +3.6.2 xclock - o Document pswrap's -f option. + o Make an analog xclock, when using Render, update the minute hand at most + every minute instead of every update interval. This makes it consistent + with non-Render mode. -3.6.5 mmapr, mmapw +3.6.3 xdm - o Extend mmapr and mmapw on Linux to allow specification of which PCI - address space (I/O or memory) to mmap. + o Fixed a number of memory leaks. - o Add options to mmapr and mmapw to allow unaligned accesses for testing - purposes + o Fixed bug that prevented an IPv6-aware xdm from accepting chooser con- + nections. -3.6.6 cpconfig +3.6.4 xwd - o Use the same default XF86Config search path as the XFree86 server. + o This utility has been extended to allow selection of a rectangular + region to dump. -3.6.7 xterm +3.6.5 xterm -These changes correspond to xterm patches #200 through #212. + o Xterm patches upto and including #215 have been integrated. - o Improved behavior - - o add a new selection feature: regular expressions, and new - resources which specify what happens on multiple mouse clicks: - on2Clicks, on3Clicks, on4Clicks and on5Clicks. - - o improve initialization of toolbar so that individual pulldown menus - are initialized on demand, as they are in the scenario where they - are invoked as popup menus. - - o improve error-reporting when chown/chmod of the pseudo-terminal - fails, e.g., if a copy of xterm which was designed to work with - old-style pseudo-terminals is not installed setuid or setgid. - - o add support for interpreting the underline attribute as an italic - font in Xft mode. - - o modify configure script --disable-imake to use the script's defini- - tions anyway if it cannot detect imake. - - o improve resource files to show how the menubar and popup menus can - be colored. - - o modify initialization of allowSendEvents and allowWindowOps to pre- - vent modification with the editres protocol. - - o improved some of the built-in line-drawing glyphs. - - o set the _NET_WM_PID property. - - o update table for mk_width() from UnicodeData 4.1.0. - - o implement the remaining pieces to make xterm allocate cells for - wide-characters when the "UTF-8" menu entry is selected. Also, - load the UTF-8 font when that menu entry is selected, or the escape - sequence for UTF-8 mode is received : - - o improve behavior when switching to UTF-8 mode after startup so - xterm will check if the current fonts are already wide - (ISO-10646-1). If they are not, xterm will use the utf8Fonts sub- - resource to load appropriate fonts. - - o modify initialization for wide-bold fontname, to search for one if - none is given. - - o modify interaction between +u8 and locale resource to allow the - command-line option to override the resource. - - o modify initialization to decide whether to default to built-in - wcwidth() versus system's version based on the starting locale and - whether the system's version is poor quality. - - o make paste of UTF-8 faster for Western character sets by checking - range of incoming data. - - o improve initialization due to utf8 resource by loading the - utf8Fonts resource in the case where locale resource is false. - Also in this case, do not disable switching UTF-8 mode on/off. - - o Modified behavior - - o modify parsing of OSC (and SOS, etc), strings so their contents are - not interpreted as UTF-8. This allows non-ASCII title strings to - be set, provided that the window manager complies. - - o modify parsing of control sequence CSI T to allow scroll-down to be - sent while mouse tracking is enabled. - - o modify command-processing to accept an optional parameter that - tells xterm which shell program to use. - - o change xterm manpage to show the actual color resource names XtDe- - faultForeground and XtDefaultBackground rather than black and - white. - - o modify xterm-new terminfo entry to use capabilities for shifted - scroll forward/reverse as shifted cursor up/down. - - o remove menu entry for "Enable Curses Emulation" (to make room for - "Select To Clipboard"). - - o modify resource files to make the font-resources a little more spe- - cific, e.g., changing "*VT100*" to "*VT100.", to make the distinc- - tion between VT100.font and VT100.utf8Fonts.font sharper, in case a - packager modifies one of those. - - o allow cursor to have the same color as foreground (text), since it - is rendered as reverse. - - o modify Imakefile to use setgid mode for installing with Linux, - OpenBSD and FreeBSD. - - o New resource settings - - o add utf8Title resource and menu entry, allowing the user to control - whether title strings are interpreted as ISO-8859-1 or UTF-8 encod- - ing. - - o add scrollBarBorder resource. - - o add resource selectToClipboard, action set-select and a menu entry - to allow users to switch between PRIMARY and CLIPBOARD for - select/paste. - - o add resource mkWidth and command-line option -mk_width to control - whether xterm uses the built-in version of wcwidth(). - - o add resource settings for minimum/maximum input buffer size, and - call to sched_yield to improve performance with newer Linux kernels - - o add simpler resource keyboardType which, when set, overrides the - individual keyboard-type resources and eliminates the possibility - of conflict between them. - - o New configure script options - - o the --with-utmp-setgid allows the packager to configure xterm to - use setgid permissions for utmp. - - o add configure option --enable-readline-mouse, which turns on the - experimental OPT_READLINE code. - - o add --enable-narrowproto configure option to accommodate X.org - "modular" build. - - o add configure --with-app-defaults option to allow app-defaults - directory for install-rules to be customized. - - o add configure option --with-tty-group to help work around deficien- - cies in packager's build environment. - - o add configure --with-setuid and --with-reference options to allow - packagers more flexibility in customizing install permissions. - - o add configure --with-symlink option to make it simpler to install - successive versions of xterm renamed using the --program-prefix, - etc., options with a symbolic link pointing to the most recent. - - o add a configure check for the actual path of luit, to work around - broken imake configurations. - - o add a configure check for pkg-config. - - o modify install rule for uxterm to account for the --program-prefix, - etc., options by invoking the transformed name of xterm rather than - simply "xterm". - - o modify configure --with-app-defaults option to allow --without-app- - defaults. - - o add configure option --disable-leaks. - - o add experimental option to allow applications to get or set the - selection data as a BASE64 string. - - o Other new features - - o add select-cursor-extend() action. - - o add environment variables $XTERM_SHELL and $XTERM_VERSION. - - o add menu entry (alt-esc) and corresponding action (alt-sends-esc) - to toggle the eightBitInput resource setting. - - o add command-line options (-tb, +tb) and resource toolBar to allow - menu/toolbar to disabled or enabled at startup. - - o add extended shift- and control-modifier cursor keys to - "xterm+pcfkeys" terminfo entry to correspond to ncurses 20050430 - patch. - - o enable lastlogx support for NetBSD (was added, but not enabled in - patch #186). - - o Bug-fixes (see http://invisible-island.net/xterm/xterm.log.html for a - more complete list): - - o correct typo in configure script's --enable-dec-locator option - - o correct a typo in CF_FUNC_TGETENT introduced in patch #198 fix - - o fix an off-by-one error parsing -S/nn option. - - o add a check in Bell to ensure that the VT100 widget is realized, - since it may be called by xtermLoadFont given an incorrect font - resource. - - o correct treatment of iconBorderWidth for resizing an active-icon, - and its description in manpage. - - o add a limit check for scrolling margins in a one-line screen, over- - looked in fixes for patch #198. - - o correct computation of width for wide characters with the invisible - attribute. - - o improve fix from patch #198 for Cleanup() by ensuring it is not - called from the SIGCHLD handler. - - o fixes to make -geom option work properly with the toolbar configu- - ration. - - o fix logic in find_utmp, which did not reset result in getutid(), - causing an infinite loop in some conditions. - - o fix a rare case where text would be written with the wrong colors - because output of scrolled text would reset the colors and the new - text would be written with the same colors. - - o implement logic in termcap query to process multiple parameters as - documented in ctlseqs.ms - - o fix buffer size used for termcap query, which was not long enough - for the terminfo "colors" name. - - o initialize the saved-cursor data so a restore-cursor operation - without a preceding save-cursor operation will not modify the fore- - ground color. - - o modify Imakefile to work around old problems in imake configuration - to allow test-builds using xmkmf on Linux. (This was not noticed - since several releases had broken definitions relating to Xft which - were harder to work around). - - o remove default translations for dabbrev-expand() due to conflicts - with existing keyboard arrangements. - - o set icon border width explicitly to work around fvwm problem with - active icon resizing. - - o eliminate a retry for a better-matching bold font, to work around - recent font server changes. - - o modify prefix/suffix transformation in makefile to make uxterm - install properly on Cygwin. - - o correct termcap "me" (mode-end) string so it does not modify the - alternate character set. - - o modify computation of rows/columns on resize to avoid extending - beyond the given limits, e.g., if resizing in response to a "maxi- - mize" in Gnome or KDE which do not use the window manager hints for - this case. - - o make a special case of resizing work like vt100: a hard reset also - resets the 132/80 mode. The code to support this was present since - X11R5, but not used because the corresponding initial state of the - -132 option was not saved. - -3.6.8 GLX/DRI - - o Mesa build fixes for NetBSD/sparc64. - - o Solaris/SPARC 64-bit libGL fixes. - -3.6.9 dbedizzy - - o Resurrect this DBE extension test utility. - -3.6.10 xclock - - o Use the Xaw tooltip to display the date in xclock. - -3.6.11 twm - - o Add a new function to allow the window text title to be changed interac- - tively. - - o Allow environment variables to be used in menu names. - - o Add a new "f.totalzoom" function that zooms windows to cover the whole - area of a screen with no window decoration visible. - - o Don't highlight "f.nop" menu items in menus. - -3.6.12 xbiff - - o Add a tooltip to xbiff that shows the number of messages in a mail - folder. - -3.6.13 xdm - - o Fix a potential infinite loop when the "willing" command fails to pro- - duce any output. - -3.6.14 xfd - - o Fix a bug that prevents properly paging through xft fonts beyond 0xFFFF. - -3.6.15 xfs - - o Modify the font server transport messages to go through xfs's logging - mechanism. - - o Fix a bug introduced when syslog support was added that prevents exit on - fatal errors. - -3.6.16 xinit - - o Send SIGINT to slowing exiting X servers instead of SIGKILL. This works - together with the new SIGINT handling in the X servers, and results in a - clean exit. Sending SIGKILL only results in the hardware state not - being restored, often requiring a reboot to recover from. - -3.6.17 xmessage - - o Fix a bug in the handling of escapes in button labels. - -3.6.18 xvidtune - - o Fix the -timeout option. + o Change xterm, on various platforms, to not require that the OS define a + utmp group. 3.7 I18n and Fonts - o Update mkfontscale's handling of font weights. + o Eliminated a number of issues related to the use of external fontconfig + and freetype2 libraries. - o Replace lib/font/fontfile/decompress.c with a version derived from BSD's - src/usr.bin/compress/zopen.c. - - o Modify the fontconfig library to use getpwnam/getpwuid to find the home - directory when $HOME is not set. - - o Fix a bug in fontconfig's pattern matching that can cause FcFontMatch() - to fail when it shouldn't. - - o Fix a double-free problem in fontconfig. - - o Rework printf format specifiers used in XLFD code to make them more por- - table and avoid infinite loops in some glibc versions. - - o Update the Serbian locale naming to reflect the country's name change - from "Yugoslavia" to "Serbia and Montenegro". + o Updated the Serbian locale naming to reflect the country's name change + from "Yugoslavia" to "Serbia and MonteNegro". 3.8 OS Support Updates - o Fix some cases in the Darwin build where a variable is declared static - and later as extern. - - o Avoid /tmp files in NetBSD.cf's man page creation. - - o Install man page source as well as formatted man pages on NetBSD. + o Added support for PAM on Solaris and Darwin. - o Fix a problem where builds would continue past errors on NetBSD. + o Added support for OpenPAM on FreeBSD and NetBSD. 4. Drivers 4.1 Video Drivers -XFree86 4.6.0 includes the following video drivers: +XFree86 4.7.0 includes the following video drivers: +--------------+--------------------------+--------------------------------+ |Driver Name | Description | Further Information | @@ -996,6 +368,7 @@ |newport (-) | SGI Newport | README.newport, newport(4) | |nsc | National Semiconductor | nsc(4) | |nv | NVIDIA | nv(4) | + |pnozz (+) | Weitek P9100 | pnozz(4) | |rendition | Rendition | README.rendition, rendition(4) | |s3 | S3 (not ViRGE or Savage) | | |s3virge | S3 ViRGE | README.s3virge, s3virge(4) | @@ -1023,7 +396,7 @@ Drivers marked with (*) are present in a preliminary form in this release, but are not complete and/or stable yet. -Drivers marked with (+) are for Linux/SPARC only. +Drivers marked with (+) are for SPARC only. Drivers marked with (-) are for Linux/mips only. @@ -1032,7 +405,7 @@ 4.2 Input Drivers -XFree86 4.6.0 includes the following input drivers: +XFree86 4.7.0 includes the following input drivers: +------------+----------------------------------+---------------------+ |Driver Name | Description | Further Information | @@ -1077,7 +450,7 @@ usually, dynamically, and in that manner load the video drivers, input driv- ers, and other modules that are needed. -XFree86 4.6.0 has X server support for most UNIX® and UNIX-like operating +XFree86 4.7.0 has X server support for most UNIX® and UNIX-like operating systems on Intel/x86 platforms, plus support for Linux and some BSD OSs on Alpha, PowerPC, IA-64, AMD64, SPARC, and Mips platforms, and for Darwin on PowerPC. Support for additional architectures and operating systems is in @@ -1173,7 +546,7 @@ 6.7 DGA version 2 -DGA 2.0 is included in 4.6.0. Documentation for the client libraries can be +DGA 2.0 is included in 4.7.0. Documentation for the client libraries can be found in the XDGA(3) man page. A good degree of backwards compatibility with version 1.0 is provided. @@ -1194,9 +567,9 @@ 6.8.1 Changed behavior caused by DDC. -Several drivers uses DDC information to set the screen size and pitch. This -can be overridden by explicitly resetting it to the and non-DDC default value -75 with the -dpi 75 command line option for the X server, or by specifying +Several drivers use DDC information to set the screen size and pitch. This +can be overridden by explicitly resetting it to the non-DDC default value 75 +with the -dpi 75 command line option for the X server, or by specifying appropriate screen dimensions with the "DisplaySize" keyword in the "Monitor" section of the config file. @@ -1228,7 +601,7 @@ overlays and other image operations not possible with the core X rendering system. -XFree86 4.6.0 provides a partial implementation of Render sufficient for +XFree86 4.7.0 provides a partial implementation of Render sufficient for drawing anti-aliased text and image composition. Still to be implemented are geometric primitives and affine transformation of images. @@ -1263,7 +636,7 @@ 6.11.2 FreeType support in Xft -XFree86 4.6.0 includes sources for FreeType version 2.1.8, and, by default, +XFree86 4.7.0 includes sources for FreeType version 2.1.8, and, by default, it is built and installed automatically. 6.11.3 Application Support For Anti-Aliased Text @@ -1452,7 +825,7 @@ 7. Credits -This section lists the credits for the XFree86 4.6.0 release. For a more +This section lists the credits for the XFree86 4.7.0 release. For a more detailed breakdown, refer to the CHANGELOG file in the XFree86 source tree, the cvs-commit archives , or the 'cvs log' information for individual @@ -1461,34 +834,20 @@ New Features, Enhancements and Updates: Security Updates: - Marc La France. - - ASPEED Technologies driver: - Y. C. Chen, ASPEED Technologies. - - Xabre Graphics driver: - Jong Lin, XGI. - - X server extension rework: - Marc La France. - - Loader Enhancements: - David H. Dawes, X-Oz Technologies. - - Intel i945G/i945GM support and other driver enhancements: - Alan Hourihane, Tungsten Graphics. + Josh Bressens, Chris Evans, Matthieu Herrb, Marc La + France, Sean Larsson, Victor Stinner, iDefense. NVIDIA driver updates and new hardware support: Mark Vojkovich - Improved SunOS/SPARC and SBUS support: + Improved SPARC support: Marc La France. Xterm enhancements and updates: Thomas Dickey. - Xaw enhancements: - Alexander Pohoyda. + DragonFly support: + David H. Dawes. Integration: @@ -1499,22 +858,18 @@ David H. Dawes. Patches and other submissions (in alphabetical order): - ASPEED Technologies, Andrew Aitchison, James Ascroft-Leigh, - Étienne Bersac, Peter Breitenlohner, Terry Chang, Y. C. Chen, - Jeff Chua, James Cloos, Alan Coopersmith, Miguel González - Cuadrado, David Dawes, Thomas Dickey, Stefan Dirsch, Bernd - Ernesti, Jordan Frank, Will L G, Frank Giessler, Thorsten Glaser, - Damian Janusz Gruszka, Lukas Hejtmanek, Evil Mr Henry, Jens Her- - den, Alan Hourihane, Nicolas Joly, Bang Jun-Young, Alexander - Kabaev, Satoshi Kimura, Milos Komarcevic, Marc La France, Dejan - Lesjak, Khong Jye Liew, Jong Lin, Michael Lorenz, Michael - Macallan, Michal Maruska, Luke Mewburn, Timothy Musson, Newsh, - Takaaki Nomura, Ivan Pascal, Bob Peterson, Pierre, Aaron Plat- - tner, Alexander Pohoyda, Jeremy C. Reed, Conrad Schuler, Bruno - Schwander, Olaf Seibert, Aaron Solochek, Helmar Spangenberg, Ken - Stailey, Tobias Stoeckmann, Tungsten Graphics, James Richard - Tyrer, Staffan Ulfberg, Denis Vlasenko, Mark Vojkovich, Tom - Williams, Dave Williss, X-Oz Technologies, XGI, Christos Zoulas. + Andrew Aitchison, Marc Balmer, Etienne Bersac, Martin Bochnig, + Peter Breitenlohner, Josh Bressers, James Chacon, Yves de Cham- + plain, Alan Coopersmith, David Dawes, Eike Dehling, Thomas + Dickey, Matthias Drochner, Jay Estabrook, Chris Evans, Will L G, + Andriy Gapon, Charles M. Hannum, Frank J. R. Hanstick, Ben Har- + ris, Matthieu Herrb, Iain Hibbert, Martin Husemann, iDefense, + Milos Komarcevic, Marc La France, Sean Larrson, Michael Lorenz, + Jie Luo, Loic Mahe, Minoura Makoto, Martin Mares, Luke Mewburn, + NetBSD, Dmitry Pervushin, Alexander Pohoyda, Ty Sarna, SciFi, + Christopher Sekiya, Jamey Sharp, Victor Stinner, Frank van der + Linden, Shin Takemura, Mark Vojkovich, Nathan J. Williams, X.Org, + Christos Zoulos. Webmaster: Georgina O. Economou @@ -1541,7 +896,7 @@ This product includes software developed by X-Oz Technologies (http://www.x- oz.com/). - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.142 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.143 tsi Exp $ -$XFree86: xc/RELNOTES.txt,v 1.7 2006/04/29 03:38:00 dawes Exp $ +$XFree86: xc/RELNOTES.txt,v 1.10 2007/08/13 00:57:46 dawes Exp $ Index: xc/config/cf/DragonFly.cf diff -u /dev/null xc/config/cf/DragonFly.cf:1.1 --- /dev/null Sun Aug 12 21:57:50 2007 +++ xc/config/cf/DragonFly.cf Mon Jun 26 20:52:48 2006 @@ -0,0 +1,397 @@ +XCOMM platform: $XFree86: xc/config/cf/DragonFly.cf,v 1.1 2006/06/27 00:52:48 dawes Exp $ + +/* + * Copyright (c) 1994-2006 by The XFree86 Project, 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, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + +#ifndef OSName +#define OSName DefaultOSName +#endif +#ifndef OSVendor +#define OSVendor /**/ +#endif +#ifndef OSMajorVersion +#define OSMajorVersion DefaultOSMajorVersion +#endif +#ifndef OSMinorVersion +#define OSMinorVersion DefaultOSMinorVersion +#endif +#ifndef OSTeenyVersion +#define OSTeenyVersion DefaultOSTeenyVersion +#endif + +XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + + +#define UseElfFormat YES + +#define HasCplusplus YES +#define GccUsesGas YES +#define UseGas YES +#define GnuCpp YES +#define HasNdbm YES +#define HasPutenv YES +#define HasSnprintf YES +#define HasAsprintf YES +#define HasStrlcat YES +#define HasBasename YES +#define HasBSD44Sockets YES +#define HasDlopen YES +#define HasSetProcTitle YES +#ifndef HasLibCrypt +# define HasLibCrypt YES +#endif +#ifndef HasShm +# define HasShm YES +#endif +#define HasWChar32 YES +#define HasUsableFileMmap YES +#define HasNCurses YES +#define HasVarRun YES +#define HasVarDb YES + +#define HasIssetugid YES +#define HasPoll YES + +#define HasGetIfAddrs YES + +#define IPv6SocketsAlsoIPv4 NO + +#define InstallXloadSetGID NO + +#define HasWeakSymbols YES + +#ifndef HasLibPthread +# define HasLibPthread NO +#endif +#define HasPosixThreads YES +#define ThreadedX YES +#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE +/* + * FreeBSD has tread-safe api but no getpwnam_r yet. + */ +#define HasThreadSafeAPI YES +#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI +#if HasLibPthread +# define ThreadsLibraries -lpthread +#else +# define NeedThreadStubLibrary YES +# define NeedUIThrStubs NO +# define ThreadsLibraries -lc_r +# define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc +# if NeedUIThrStubs +# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) +# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) +# endif +#endif + +#define AvoidNullMakeCommand YES +#define StripInstalledPrograms YES +#define CompressAllFonts YES +#define Malloc0ReturnsNull YES +#define NeedConstPrototypes YES +#define NeedFunctionPrototypes YES +#define NeedNestedPrototypes YES +#define NeedVarargsPrototypes YES +#define NeedWidePrototypes NO + +#define HasPlugin YES +#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ + +#define MkdirHierCmd mkdir -p + +#ifndef LexCmd +#define LexCmd flex -l +#endif +#ifndef HasFlex +#define HasFlex YES +#endif + +#ifndef HasMktemp +#define HasMktemp YES +#endif + +/* Don't have perl by default. */ +#ifndef HasPerl5 +#define HasPerl5 NO +#endif + +/* + * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP), + * when building X to avoid that for each client ld give the message + * + * ld: warning: libXThrStub.so.6, needed by libX11.so, not found + */ +#if NeedThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) +# define CcCmd $(CLIENTENVSETUP) cc +# define CplusplusCmd $(CLIENTENVSETUP) c++ +#else +# define CcCmd cc +# define CplusplusCmd c++ +#endif + +#define CppCmd /usr/bin/cpp +#define PreProcessCmd CppCmd +#define StandardCppOptions -traditional +#define StandardCppDefines /**/ +#ifndef DefaultCCOptions +#if defined(UseInstalled) +#define DefaultCCOptions /**/ +#else +#if (defined(HasGcc3) && HasGcc3) || (defined(HasGcc4) && HasGcc4) +#define NoSystemWarn -Wno-system-headers +#else +#define NoSystemWarn +#endif +#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ + GccWarningOptions +#endif +#endif +#ifndef ExtraLibraries +#define ExtraLibraries /**/ +#endif +#ifndef UseGnuMalloc +#define UseGnuMalloc NO +#endif +#define HasSetUserContext YES + +#define HasGetpeereid YES + +#ifndef HasMTRRSupport +#define HasMTRRSupport YES +#endif + +#ifndef BuildXF86DRI +#define BuildXF86DRI NO +#endif + +#ifndef HasAgpGart +#define HasAgpGart YES +#endif + +/* + * SSE and 3DNow will be autodetected, so binutils is the only + * requirement for enabling this. By 4.2 they were all supported. + */ +#if defined(AMD64Architecture) || defined(i386Architecture) +# define HasX86Support YES +# define HasMMXSupport YES +# define Has3DNowSupport YES +# define HasSSESupport YES +#else +# define HasX86Support NO +# define HasMMXSupport NO +# define Has3DNowSupport NO +# define HasSSESupport NO +#endif + +#ifndef UseRpath +# define UseRpath YES +#endif + +#ifndef RpathLoadFlags +# if UseRpath +# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) +# else +# define RpathLoadFlags /**/ +# endif +#endif + +#ifndef ExtraLoadFlags +# if !defined(UseInstalled) +# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) +# else +# define ExtraLoadFlags RpathLoadFlags +# endif +#endif + +#ifndef ExtraSharedLibraryLoadFlags +# define ExtraSharedLibraryLoadFlags /**/ +#endif + +#ifndef LibraryRpathLoadFlags +# if UseRpath +# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH) +# else +# define LibraryRpathLoadFlags /**/ +# endif +#endif + +#ifndef SharedLibraryLoadFlags +# define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags +#endif + +#ifndef GnuMallocLibrary +#define GnuMallocLibrary -lgnumalloc +#endif + +#ifndef HasZlib +#define HasZlib YES +#endif + +#ifndef HasPam +#define HasPam YES +#endif + +#undef InstallCmd +#define InstallCmd /usr/bin/install + +#define AsmElfDefines -D__ELF__ + +#if GccUsesGas +# define GccGasOption -DGCCUSESGAS +# define AsmDefines -DUSE_GAS AsmElfDefines +#else +# define GccGasOption /**/ +# define AsmDefines AsmElfDefines +#endif + +#ifdef i386Architecture +#define ServerExtraDefines GccGasOption XFree86ServerDefines +#endif + +/* Define __FreeBSD__ for now... */ +#define StandardDefines -DCSRG_BASED -D__FreeBSD__ +#define FreeBSDArchitecture + +#define ServerOSDefines XFree86ServerOSDefines +#define XawI18nDefines -DUSE_XWCHAR_STRING +#define HasMakefileSafeInclude YES +#define IncludeMakefile(file) @@# dependencies are in .depend +#define DependFileName .depend +#ifndef DoLoadableServer +#define DoLoadableServer YES +#endif +#ifndef ForceNormalLib +#define ForceNormalLib YES +#endif +#define HasMkstemp YES + +#ifndef DefaultGcc2i386Opt +#define DefaultGcc2i386Opt -O2 GccAliasingArgs +#endif + +#ifdef i386Architecture +# define OptimizedCDebugFlags DefaultGcc2i386Opt +#else +# define OptimizedCDebugFlags -O +#endif + +#ifndef PreIncDir +# define PreIncDir /usr/include +#endif + +#define HasGroff YES +#define NroffCmd env GROFF_NO_SGR=y groff -Tascii +#define SetTtyGroup YES + +#ifndef ExtraFilesToClean +# define ExtraFilesToClean *.core +#endif + +#define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR) +#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR) +#ifndef SystemManDirectory +#define SystemManDirectory /usr/share/man +#endif + +#ifndef PkgConfigDirectory +#define PkgConfigDirectory $(LIBDATADIR)/pkgconfig +#endif + +#define InstKmemFlags -g kmem -m 2755 + +/* + * Compress manual pages + */ +#ifndef CompressManPages +# define CompressManPages YES +#endif + +#define HasBsdMake YES + +#ifndef StaticLibrary +#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic +#endif + +#define DlLibrary -rdynamic + +#ifdef AlphaArchitecture +#define IoLibrary -lio +#else +#define IoLibrary /**/ +#endif + +#define ServerExtraSysLibs IoLibrary + +#ifndef PamLibraries +#define PamLibraries -lpam DlLibrary +#endif + +#ifndef SharedLibXdmGreet +# define SharedLibXdmGreet NO +#endif + +#ifndef PreloadFontSetup +#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(XFONTPRELOADPATTERN))`" +#endif +#ifndef PreloadFreetypeSetup +#define PreloadFreetypeSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN))`" +#endif +#ifndef PreloadXFTSetup +#define PreloadXFTSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN) $(XFTPRELOADPATTERN) $(XRENDERPRELOADPATTERN) $(FCPRELOADPATTERN))`" +#endif + +#ifndef HasCookieMaker +#define HasCookieMaker YES +#define MkCookieCmd \ + 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"' +#endif + +#include + +#include Index: xc/config/cf/FreeBSD.cf diff -u xc/config/cf/FreeBSD.cf:3.159 xc/config/cf/FreeBSD.cf:3.161 --- xc/config/cf/FreeBSD.cf:3.159 Tue Oct 25 12:58:48 2005 +++ xc/config/cf/FreeBSD.cf Wed Jan 3 22:33:41 2007 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.159 2005/10/25 16:58:48 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.161 2007/01/04 03:33:41 tsi Exp $ /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. @@ -183,7 +183,8 @@ /* This fixes linking C programs against libGLU on FreeBSD 3.x */ #if (OSMajorVersion == 3) -#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++ -lgcc +#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) -lstdc++ -lgcc #endif #define AvoidNullMakeCommand YES @@ -439,6 +440,9 @@ #ifndef HasPam #define HasPam YES #endif +#ifndef PamDefines +#define PamDefines -D_OPENPAM +#endif #endif #undef InstallCmd Index: xc/config/cf/Imake.cf diff -u xc/config/cf/Imake.cf:3.92 xc/config/cf/Imake.cf:3.96 --- xc/config/cf/Imake.cf:3.92 Mon Jan 9 09:56:12 2006 +++ xc/config/cf/Imake.cf Sun Mar 11 13:38:00 2007 @@ -16,7 +16,7 @@ * * 4. Create a .cf file with the name given by MacroFile. */ -XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.92 2006/01/09 14:56:12 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.96 2007/03/11 17:38:00 tsi Exp $ #if defined(__APPLE__) # undef __APPLE__ @@ -70,7 +70,7 @@ # define UltrixArchitecture #endif /* ultrix */ -#if defined(vax) && !defined(UltrixArchitecture) && !defined(__OpenBSD__) +#if defined(vax) && !defined(UltrixArchitecture) && !defined(__OpenBSD__) && !defined(__NetBSD__) # define MacroIncludeFile # define MacroFile bsd.cf # undef vax @@ -120,9 +120,8 @@ # undef i386 # endif # if defined(__sparc__) || defined(sparc) -# if !defined(__arch64__) -# define SparcArchitecture -# else +# define SparcArchitecture +# if defined(__arch64__) # define Sparc64Architecture # endif # undef sparc @@ -204,45 +203,166 @@ # undef __NetBSD__ # define NetBSDArchitecture # define KNetBSDArchitecture -# ifdef __i386__ + /* MACHINE_CPU specific definitions ("__${MACHINE_CPU}__" is defined by cpp) */ +# if defined(__alpha__) || defined(alpha) +# define AlphaArchitecture +# define AlphaBsdArchitecture +# undef alpha +# endif +# if defined(__arm__) || defined(arm) +# define armArchitecture +# undef arm +# endif +# if defined(__hppa__) || defined(hppa) +# define HPArchitecture +# undef hppa +# endif +# if defined(__i386__) || defined(i386) # define i386BsdArchitecture # define i386Architecture # undef i386 # endif -# if defined(__sparc64__) || defined(__sparc_v9__) || defined(__arch64__) -# define Sparc64Architecture +# if defined(__m68000__) || defined(m68000) +# define m68000Architecture +# define Mc68000Architecture +# undef m68000 # endif -# if defined(__sparc__) || defined(sparc) +# if defined(__m68k__) || defined(m68k) +# define m68kArchitecture +# define Mc68020Architecture +# undef m68k +# endif +# if defined(__mips__) || defined(mips) +# define MipsArchitecture +# if defined(__MIPSEL__) +# define MipselArchitecture +# endif +# undef mips +# endif +# if defined(__ns32k__) || defined(ns32k) +# define ns32kArchitecture +# undef ns32k +# endif +# if defined(__powerpc__) || defined(powerpc) +# define PpcArchitecture +# undef powerpc +# endif +# if defined(__sh__) || defined(sh) +# if defined(__BIG_ENDIAN__) +# define SuperHebArchitecture +# else +# define SuperHArchitecture +# endif +# if defined(__SH5__) +# define sh5Architecture +# else +# define sh3Architecture +# endif +# undef sh +# endif +# if defined(__sparc__) # define SparcArchitecture # undef sparc # if defined(__sparc_v9__) || defined(__arch64__) # define Sparc64Architecture # endif # endif -# ifdef mips -# define MipsArchitecture -# define ArcArchitecture -# undef mips +# if defined(__sparc64__) || defined(__sparc_v9__) || defined(sparc64) +# define Sparc64Architecture +# undef sparc64 # endif -# ifdef __alpha__ -# define AlphaArchitecture -# define AlphaBsdArchitecture -# undef __alpha__ +# if defined(__vax__) || defined(vax) +# define VaxArchitecture +# undef vax # endif -# ifdef mc68000 -# define Mc68020Architecture +# if defined(__x86_64__) || defined(x86_64) +# define x86_64Architecture +# undef x86_64 # endif -# ifdef __arm32__ + /* MACHINE specific definitions ("__${MACHINE}__" is defined by imake) */ +# if defined(__acorn32__) # define Arm32Architecture -# undef __arm32__ +# define acorn32Architecture # endif -# ifdef __vax__ -# define VaxArchitecture -# undef __vax__ +# if defined(__amd64__) +# define AMD64Architecture # endif -# ifdef __powerpc__ -# define PpcArchitecture -# undef __powerpc__ +# if defined(__algor__) +# define algorArchitecture +# endif +# if defined(__amiga__) +# define amigaArchitecture +# endif +# if defined(__atari__) +# define atariArchitecture +# endif +# if defined(__cats__) +# define Arm32Architecture +# define CatsArchitecture +# endif +# if defined(__cobalt__) +# define cobaltArchitecture +# endif +# if defined(__dreamcast__) +# define dreamcastArchitecture +# endif +# if defined(__ews4800mips__) +# define ews4800mipsArchitecture +# endif +# if defined(__hp300__) +# define hp300Architecture +# endif +# if defined(__hpcarm__) +# define hpcarmArchitecture +# endif +# if defined(__hpcmips__) +# define hpcmipsArchitecture +# endif +# if defined(__mac68k__) +# define mac68kArchitecture +# endif +# if defined(__macppc__) +# define macppcArchitecture +# endif +# if defined(__luna68k__) +# define luna68kArchitecture +# endif +# if defined(__mipsco__) +# define mipscoArchitecture +# endif +# if defined(__mvme68k__) +# define mvme68kArchitecture +# endif +# if defined(__next68k__) +# define next68kArchitecture +# endif +# if defined(__news68k__) +# define news68kArchitecture +# endif +# if defined(__pc532__) +# define pc532Architecture +# endif +# if defined(__pmax__) +# define pmaxArchitecture +# endif +# if defined(__playstation2__) +# define playstation2Architecture +# endif +# if defined(__prep__) +# define prepArchitecture +# endif +# if defined(__sgimips__) +# define SGIMipsArchitecture +# endif +# if defined(__shark__) +# define Arm32Architecture +# define sharkArchitecture +# endif +# if defined(__sun3__) +# define Sun3Architecture +# endif +# if defined(__x68k__) +# define x68kArchitecture # endif #endif /* NetBSD */ @@ -287,6 +407,36 @@ #define KFreeBSDArchitecture #endif +#ifdef __DragonFly__ +# define MacroIncludeFile +# define MacroFile DragonFly.cf +# undef __DragonFly__ +# define DragonFlyArchitecture +# ifdef __i386__ +# define i386BsdArchitecture +# define i386Architecture +# undef i386 +# endif +# ifdef __alpha__ +# define AlphaBsdArchitecture +# define AlphaArchitecture +# undef __alpha__ +# endif +# ifdef __sparc64__ +# define Sparc64Architecture +# undef __sparc64__ +# endif +# ifdef __ia64__ +# define ia64Architecture +# undef __ia64__ +# endif +# ifdef __amd64__ +# define AMD64Architecture +# undef __amd64__ +# undef __x86_64__ +# endif +#endif /* __DragonFly__ */ + #ifdef AMOEBA /* Should be before the 'sun' entry because we may be cross-compiling */ # define MacroIncludeFile @@ -854,11 +1004,6 @@ # define MipsArchitecture # undef mips # undef __mips__ -# if defined(MIPSEL) || defined(_MIPSEL) -# define MipselArchitecture -# endif -# undef MIPSEL -# undef _MIPSEL # endif # ifdef __hppa__ # ifndef HPArchitecture @@ -1070,12 +1215,41 @@ # endif /* __i386__ */ #endif /* QNX/Neutrino */ -#ifdef SparcArchitecture -# if defined(__sparc_v9) || defined(__arch64__) +#ifdef MipsArchitecture +# if defined(__MIPSEL__) || defined(__MIPSEL) || \ + defined(_MIPSEL) || defined(MIPSEL) +# undef __MIPSEL__ +# undef __MIPSEL +# undef _MIPSEL +# undef MIPSEL +# undef MipselArchitecture +# define MipselArchitecture +# endif +# if defined(__MIPSEB__) || defined(__MIPSEB) || \ + defined(_MIPSEB) || defined(MIPSEB) +# undef __MIPSEB__ +# undef __MIPSEB +# undef _MIPSEB +# undef MIPSEB +# undef MipsebArchitecture +# define MipsebArchitecture +# endif +# if defined(MipselArchitecture) && defined(MipsebArchitecture) +# error "Conflicting MIPS endianness." +# endif +#endif + +#if defined(SparcArchitecture) && !defined(Sparc64Architecture) +# if defined(__sparc_v9__) || defined(__sparc_v9) || \ + defined(__arch64__) || defined(__sparc64__) # define Sparc64Architecture # endif #endif +#if defined(Sparc64Architecture) && !defined(SparcArchitecture) +# define SparcArchitecture +#endif + #ifndef MacroIncludeFile XCOMM WARNING: Imake.cf not configured; guessing at definitions!!! XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake. Index: xc/config/cf/Imake.rules diff -u xc/config/cf/Imake.rules:3.149 xc/config/cf/Imake.rules:3.154 --- xc/config/cf/Imake.rules:3.149 Mon Apr 3 11:59:08 2006 +++ xc/config/cf/Imake.rules Mon Apr 9 11:19:10 2007 @@ -1,6 +1,6 @@ XCOMM --------------------------------------------------------------------- XCOMM Imake rules for building libraries, programs, scripts, and data files -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.149 2006/04/03 15:59:08 dawes Exp $ +XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.154 2007/04/09 15:19:10 tsi Exp $ /* * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. @@ -1139,7 +1139,7 @@ #ifndef ServerTargetWithFlags #define ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\ AllTarget(ProgramTargetName(server)) @@\ -ProgramTargetName(server): subdirs objects libs @@\ +ProgramTargetName(server): subdirs /* objects libs */ @@\ MoveToBakFile($@) @@\ LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\ @@\ @@ -1720,7 +1720,7 @@ #ifndef MakeNamedTargetSubdir #define MakeNamedTargetSubdir(dir,flags,subname)\ if [ -z "$$_fail" ]; then _fail="exit 1"; fi; \ @@\ - (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ + (cd dir && $(MAKE) $(PASSMFLAGS) $(PARALLELMFLAGS) \ @@\ flags subname) || $$_fail #endif @@ -2001,7 +2001,7 @@ @@\ depend:: DependFileName @@\ @@\ -DependFileName:: @@\ +DependFileName:: $(SRCS) @@\ RemoveFile($@) @@\ RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)) > $@ #else /* HasMakefileSafeInclude */ @@ -2023,7 +2023,7 @@ @@\ depend:: DependFileName @@\ @@\ -DependFileName:: @@\ +DependFileName:: srcs1 srcs2 srcs3 @@\ RemoveFile($@) @@\ RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1) > $@ @@\ RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2) >> $@ @@\ @@ -2371,6 +2371,10 @@ #define DebuggedLibObjCompile(options) LibObjCompile(debugger,DebuggableCDebugFlags options) #endif +#ifndef DebuggedLibObjAsm +#define DebuggedLibObjAsm(options) LibObjAsm(debugger,DebuggableCDebugFlags options,$(ASMOPTS)) +#endif + #ifndef DebuggedLibObjCplusplusCompile #define DebuggedLibObjCplusplusCompile(options) LibObjCplusplusCompile(debugger,DebuggableCplusplusDebugFlags options) #endif @@ -2382,6 +2386,10 @@ #define ProfiledLibObjCompile(options) LibObjCompile(profiled,ProfiledCDebugFlags options) #endif +#ifndef ProfiledLibObjAsm +#define ProfiledLibObjAsm(options) LibObjAsm(profiled,ProfiledCDebugFlags options,$(ASMOPTS)) +#endif + #ifndef ProfiledLibObjCplusplusCompile #define ProfiledLibObjCplusplusCompile(options) LibObjCplusplusCompile(profiled,ProfiledCplusplusDebugFlags options) #endif @@ -2393,10 +2401,8 @@ #define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options) #endif -#if 0 #ifndef UnsharedLibObjAsm -#define UnsharedLibObjAsm(options) LibObjAsm(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options,NullParameter) -#endif +#define UnsharedLibObjAsm(options) LibObjAsm(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options,$(ASMOPTS)) #endif #ifndef UnsharedLibObjCplusplusCompile @@ -3063,7 +3069,7 @@ for i in dirs ;\ @@\ do \ @@\ echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\ - (cd $$i && LANG=lang $(MAKE) $(MFLAGS) flags subname);\ @@\ + (cd $$i && LANG=lang $(MAKE) $(PASSMFLAGS) flags subname);\ @@\ done #endif @@ -3146,7 +3152,7 @@ #define ForceSubdirs(dirs) @@\ dirs: .EXEC @@\ @cd $@ ; echo "making all in $(CURRENT_DIR)/$@..."; \ @@\ - $(MAKE) $(MFLAGS) PassCDebugFlags all @@\ + $(MAKE) $(PASSMFLAGS) PassCDebugFlags all @@\ @@\ .EXEC: #endif @@ -3325,10 +3331,10 @@ $(MV) $$i/Makefile $$i/Makefile.bak; \ @@\ fi; \ @@\ fi; \ @@\ - $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ @@\ + $(MAKE) $(PASSMFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ @@\ if [ -d $$i ] ; then \ @@\ cd $$i; \ @@\ - $(MAKE) $(MFLAGS) Makefiles; \ @@\ + $(MAKE) $(PASSMFLAGS) Makefiles; \ @@\ cd $$newtop; \ @@\ else \ @@\ exit 1; \ @@\ @@ -3364,6 +3370,7 @@ #ifndef CppSedMagic #define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' \ -e '/^#line *[0-9][0-9]* *.*$$/d' \ + -e '/^#[ ]*pragma[ ]/d' \ -e '/^[ ]*XCOMM$$/s/XCOMM/#/' \ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' \ -e '/^[ ]*XHASH/s/XHASH/#/' \ Index: xc/config/cf/Imake.tmpl diff -u xc/config/cf/Imake.tmpl:3.175 xc/config/cf/Imake.tmpl:3.180 --- xc/config/cf/Imake.tmpl:3.175 Sun Apr 2 19:12:46 2006 +++ xc/config/cf/Imake.tmpl Sat Apr 21 20:37:18 2007 @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE -XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.175 2006/04/02 23:12:46 dickey Exp $ +XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.180 2007/04/22 00:37:18 tsi Exp $ XCOMM ---------------------------------------------------------------------- /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. @@ -410,6 +410,11 @@ #define ConstructMAKEFLAGS NO /* build MAKEFLAGS from MFLAGS */ #endif +/* Some recursive `make`'s end up duplicating MFLAGS (and MAKEFLAGS) */ +#ifndef PassMFLAGS +#define PassMFLAGS YES +#endif + #ifndef HasLargeTmp #define HasLargeTmp NO /* be paranoid */ #endif @@ -481,6 +486,13 @@ #ifndef HasDlopen #define HasDlopen NO /* assume not */ #endif +#ifndef DlLibrary +#if HasDlopen +#define DlLibrary -ldl +#else +#define DlLibrary /**/ +#endif +#endif #ifndef HasWeakSymbols #define HasWeakSymbols NO /* assume not */ #endif @@ -508,8 +520,26 @@ #ifndef HasPam #define HasPam NO #endif -#ifndef HasPamMisc -#define HasPamMisc NO +#ifndef PamDefines +#define PamDefines /**/ +#endif +#ifndef PamLibraries +#define PamLibraries -lpam DlLibrary +#endif +#ifndef ServerPamLibraries +#define ServerPamLibraries PamLibraries +#endif +/* + * By default, don't generate PAM-aware binaries, as they would not run on + * (older/different) systems without PAM. + */ +#ifndef UsePam +#define UsePam NO +#endif +#if UsePam && HasPam + PAMDEFINES = -DUSE_PAM PamDefines + PAMLIBRARIES = PamLibraries + SERVERPAMLIBRARIES = ServerPamLibraries #endif #ifndef HasGetpeereid #define HasGetpeereid NO @@ -551,7 +581,7 @@ #define ByteOrder X_BIG_ENDIAN #elif defined(s390xArchitecture) #define ByteOrder X_BIG_ENDIAN -#elif defined(Arm32Architecture) +#elif defined(Arm32Architecture) || defined(CatsArchitecture) #define ByteOrder X_LITTLE_ENDIAN #elif defined(PpcArchitecture) #define ByteOrder X_BIG_ENDIAN @@ -1063,9 +1093,6 @@ #ifndef InstUidFlags #define InstUidFlags -m 4711 #endif -#ifndef InstGidFlags -#define InstGidFlags -m 2755 -g utmp -#endif #ifndef InstLibFlags #define InstLibFlags -m 0644 #endif @@ -1081,6 +1108,9 @@ #ifndef InstKmemFlags /* put -g kmem -m 2711 in site.def... */ #define InstKmemFlags InstUidFlags #endif +#ifndef InstUtmpFlags /* put -m 2755 -g utmp in site.def... */ +#define InstUtmpFlags InstUidFlags +#endif #ifndef ParallelMakeFlags #define ParallelMakeFlags /**/ #endif @@ -1414,9 +1444,6 @@ #ifndef DBMLibrary #define DBMLibrary -ldbm #endif -#ifndef DlLibrary -#define DlLibrary -ldl -#endif #ifndef ExtraLibraries #if SystemV4 #if HasSockets @@ -1970,6 +1997,9 @@ #if ConstructMAKEFLAGS MAKEFLAGS = $(MFLAGS) #endif +#if PassMFLAGS + PASSMFLAGS = $(MFLAGS) +#endif PARALLELMFLAGS = ParallelMakeFlags #if HasSharedLibraries SHAREDCODEDEF = SharedCodeDef @@ -2053,6 +2083,7 @@ INSTMANFLAGS = InstManFlags /* install flags for man pages */ INSTDATFLAGS = InstDatFlags /* install flags for data files */ INSTKMEMFLAGS = InstKmemFlags /* install flags for /dev/kmem progs */ + INSTUTMPFLAGS = InstUtmpFlags /* install flags for utmp access */ #ifdef ProjectRoot PROJECTROOT = ProjectRoot @@ -2224,6 +2255,11 @@ .cc.s: CompileCplusplusToAsm($(_NOOP_)) +.SUFFIXES: .m + +.m.o: + $(CC) -c $(CFLAGS) -o $@ $< + /* * These need to be here so that rules in Imakefile occur first; the blank * emptyrule is to make sure that an empty Imakefile does not default to make Index: xc/config/cf/Library.tmpl diff -u xc/config/cf/Library.tmpl:3.27 xc/config/cf/Library.tmpl:3.28 --- xc/config/cf/Library.tmpl:3.27 Fri Feb 17 13:01:14 2006 +++ xc/config/cf/Library.tmpl Mon Jul 17 23:05:29 2006 @@ -14,7 +14,7 @@ * Define LargePICTable YES if large (32-bit) PIC tables are needed. */ -XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.27 2006/02/17 18:01:14 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.28 2006/07/18 03:05:29 tsi Exp $ #ifndef DoNormalLib #define DoNormalLib NO @@ -174,11 +174,7 @@ # define _DebuggedObjCompile(options) DebuggedLibObjCompile(options) # define _DebuggedObjCplusplusCompile(options) DebuggedLibObjCplusplusCompile(options) # define _DebuggedCleanDir() LibCleanDir(debugger) -# ifdef DebuggedLibObjAsm -# define _DebuggedObjAsm(options) DebuggedLibObjAsm(options) -# else -# define _DebuggedObjAsm(options) $(_NULLCMD_) -# endif +# define _DebuggedObjAsm(options) DebuggedLibObjAsm(options) #else # define _DebuggedLibMkdir() $(_NULLCMD_) # define _DebuggedObjCompile(options) $(_NULLCMD_) @@ -192,11 +188,7 @@ # define _ProfiledObjCompile(options) ProfiledLibObjCompile(options) # define _ProfiledObjCplusplusCompile(options) ProfiledLibObjCplusplusCompile(options) # define _ProfiledCleanDir() LibCleanDir(profiled) -# ifdef ProfiledLibObjAsm -# define _ProfiledObjAsm(options) ProfiledLibObjAsm(options) -# else -# define _ProfiledObjAsm(options) $(_NULLCMD_) -# endif +# define _ProfiledObjAsm(options) ProfiledLibObjAsm(options) #else # define _ProfiledLibMkdir() $(_NULLCMD_) # define _ProfiledObjCompile(options) $(_NULLCMD_) @@ -217,25 +209,17 @@ # define _NormalObjCompile(options) UnsharedLibObjCompile(options) # define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options) # define _NormalCleanDir() LibCleanDir(unshared) -# ifdef UnsharedLibObjAsm -# define _NormalObjAsm(options) UnsharedLibObjAsm(options) -# else -# define _NormalObjAsm(options) $(_NULLCMD_) -# endif +# define _NormalObjAsm(options) UnsharedLibObjAsm(options) # else # define _NormalLibMkdir() $(_NULLCMD_) -# if !DoSharedLib && defined(IncludeSharedObjectInNormalLib) +# if !DoSharedLib && defined(IncludeSharedObjectInNormalLib) # define _NormalObjCompile(options) NormalRelocLibObjCompile(options) # else # define _NormalObjCompile(options) NormalLibObjCompile(options) # endif # define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) # define _NormalCleanDir() $(_NULLCMD_) -# ifdef NormalLibObjAsm -# define _NormalObjAsm(options) NormalLibObjAsm(options) -# else -# define _NormalObjAsm(options) $(_NULLCMD_) -# endif +# define _NormalObjAsm(options) NormalLibObjAsm(options) # endif #endif @@ -247,21 +231,13 @@ # if SeparateSharedCompile # define _SharedObjCompile(options) NormalSharedLibObjCompile(options) # define _SharedObjCplusplusCompile(options) NormalSharedLibObjCplusplusCompile(options) -# ifdef NormalSharedLibObjAsm # define _SharedObjAsm(options) NormalSharedLibObjAsm(options) # else -# define _SharedObjAsm(options) $(_NULLCMD_) -# endif -#else -# define _SharedObjCompile(options) NormalLibObjCompile(options) -# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) -# ifdef NormalLibObjAsm +# define _SharedObjCompile(options) NormalLibObjCompile(options) +# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) # define _SharedObjAsm(options) NormalLibObjAsm(options) -# else -# define _SharedObjAsm(options) $(_NULLCMD_) # endif #endif -#endif #ifndef LibInstallBuild #define LibInstallBuild NO @@ -272,11 +248,7 @@ # define _ExtraObjCompile(options) ExtraObjCompile(options) # define _ExtraObjCplusplusCompile(options) ExtraObjCplusplusCompile(options) # define _ExtraCleanDir() ExtraCleanDir() -# ifdef ExtraObjAsm -# define _ExtraObjAsm(options) ExtraObjAsm(options) -# else -# define _ExtraObjAsm(options) $(_NULLCMD_) -# endif +# define _ExtraObjAsm(options) ExtraObjAsm(options) #else # define _ExtraLibMkdir() $(_NULLCMD_) # define _ExtraObjCompile(options) $(_NULLCMD_) Index: xc/config/cf/NetBSD.cf diff -u xc/config/cf/NetBSD.cf:3.131 xc/config/cf/NetBSD.cf:3.135 --- xc/config/cf/NetBSD.cf:3.131 Mon Apr 24 22:50:27 2006 +++ xc/config/cf/NetBSD.cf Sun Mar 11 13:38:00 2007 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.131 2006/04/25 02:50:27 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.135 2007/03/11 17:38:00 tsi Exp $ /* * Copyright (c) 1994-2006 by The XFree86 Project, Inc. @@ -67,6 +67,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) /* + * Enable support for "xdmauth" authentification. + */ +#ifndef HasXdmAuth +#define HasXdmAuth YES +#endif + +/* * C library features */ #if ((OSMajorVersion > 1) || \ @@ -76,7 +83,7 @@ #endif #define HasNdbm YES #define HasPutenv YES -#if OSMajorVersion == 1 && OSMinorVersion > 4 || OSMajorVersion > 1 +#if (OSMajorVersion == 1 && OSMinorVersion > 4 || OSMajorVersion > 1) # define HasStrlcat YES #endif #define HasSnprintf YES @@ -91,11 +98,11 @@ # define HasLibCrypt YES #endif #ifndef HasShm -# if OSMajorVersion == 0 && OSMinorVersion == 9 && OSTeenyVersion == 2 /* * Shm memory was removed in 0.9B because it was encumbered. * A free version was added in 0.9C */ +# if (OSMajorVersion == 0 && OSMinorVersion == 9 && OSTeenyVersion == 2) # define HasShm NO # else # define HasShm YES @@ -110,27 +117,39 @@ # define HasDlsymBug YES #endif /* Mkstemp is there since 1.2 (at least) */ -#if (!(OSMajorVersion == 0 || \ - (OSMajorVersion == 1 && OSMinorVersion < 2))) +#if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion >= 2)) #define HasMkstemp YES #endif /* But the standalone mktemp doesn't exist before NetBSD 1.5*/ -#if (OSMajorVersion ==0 || (OSMajorVersion == 1 && OSMinorVersion <= 4)) +#if ((OSMajorVersion == 0) || \ + (OSMajorVersion == 1 && OSMinorVersion <= 4)) # define HasMktemp NO #else # define HasMktemp YES #endif #ifndef HasIssetugid -# if (OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion >= 5)) +# if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion >= 5)) # define HasIssetugid YES # endif #endif -#if (OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion > 1) +#if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion >= 5)) #define HasGetIfAddrs YES #endif +#if (OSMajorVersion >= 3) +#ifndef HasPam +#define HasPam YES +#endif +#ifndef PamDefines +#define PamDefines -D_OPENPAM +#endif +#endif + #define HasUsableFileMmap YES #define HasVarRun YES @@ -140,7 +159,15 @@ #define InstallXloadSetGID NO -#if OSMajorVersion < 1 || (OSMajorVersion == 1 && OSMinorVersion < 5) +#if (OSMajorVersion >= 1) +#define InstallXtermSetGID YES +#ifndef InstUtmpFlags +#define InstUtmpFlags -m 2755 -g utmp +#endif +#endif + +#if ((OSMajorVersion < 1) || \ + (OSMajorVersion == 1 && OSMinorVersion < 5)) #define BuildIPv6 NO #endif @@ -163,18 +190,31 @@ # define ThreadedX YES # define HasThreadSafeAPI YES # define ThreadsLibraries -lpthread +# define SystemMTDefines -D_REENTRANT +# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \ (OSMajorVersion == 2 && OSMinorVersion < 99) || \ (OSMajorVersion < 2)) # define LibraryMTDefines -DUSE_NBSD_THREADLIB # endif -# define SystemMTDefines -D_REENTRANT -# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI #else # define ThreadedX NO #endif /* + * Use rnd(4) under NetBSD from 1.4 to 1.6A and arc4random(3) under 1.6B + * and above. + */ +#if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion == 6 && OSTeenyVersion >= 2)) +# define HasArc4Random YES +#elif ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion > 3)) +# define HasDevRandom YES +# define RandomDeviceFile /dev/urandom +#endif + +/* * Compiler Features */ #define GccUsesGas YES @@ -195,14 +235,7 @@ #if defined(UseInstalled) #define DefaultCCOptions /**/ #else -#ifdef Arm32Architecture -#define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char \ - -fomit-frame-pointer -#elif defined(PpcArchitecture) -# define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char -#else -#define DefaultCCOptions -ansi -Dasm=__asm GccWarningOptions -#endif +# define DefaultCCOptions -ansi -Dasm=__asm #endif #endif @@ -225,6 +258,14 @@ # endif #endif +#ifndef OSBinaryType +#if UseElfFormat +#define OSBinaryType [ELF] +#else +#define OSBinaryType /**/ +#endif +#endif + /* * Dynamic loading supported starting in 1.0 on a.out platforms, * and on all ELF platforms. @@ -234,105 +275,121 @@ * * Disabled for NetBSD/vax until I figure out the scheme. --CS */ -#if ((OSMajorVersion > 0) && defined(i386Architecture)) || \ - defined(PpcArchitecture) +#if UseElfFormat +# if (OSMajorVersion > 0 && defined(i386Architecture)) || \ + defined(PpcArchitecture) || defined(Sparc64Architecture) # ifndef DoLoadableServer # define DoLoadableServer YES # endif -#else -# ifndef DoLoadableServer -# define DoLoadableServer NO +# endif +# if \ + !defined(ns32kArchitecture) && \ + !defined(m68000Architecture) && \ + !(OSMajorVersion < 2 && defined(sh3Architecture)) && \ + !defined(sh5Architecture) && \ + !(GccMajorVersion == 3 && defined(VaxArchitecture)) && \ + 1 +# ifndef HasSharedLibraries +# define HasSharedLibraries YES # endif #endif -#if UseElfFormat #define DlLibrary -rdynamic /* no -ldl yet */ -#else +#else /* UseElfFormat */ #define DlLibrary /**/ +# if (OSMajorVersion > 0) && \ + (!defined(AlphaArchitecture) && !defined(MipsArchitecture)) + /* XXX: which port lacked a.out shlib support? */ +# ifndef HasSharedLibraries +# define HasSharedLibraries YES +# endif + /* XXX: which port had a.out dynamic loding support? Only i386? */ +# ifndef DoLoadableServer +# define DoLoadableServer YES +# endif +# endif +#endif /* UseElfFormat */ + +#ifndef HasSharedLibraries +# define HasSharedLibraries NO +#endif +#ifndef DoLoadableServer +# define DoLoadableServer NO #endif /* All ELF NetBSD systems support Weak symbols */ #define HasWeakSymbols UseElfFormat + +/* + * MACHINE_CPU specific toolchain options + */ +/* arm specific options */ +#ifdef armArchitecture +# undef DefaultCCOptions +# define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char \ + -fomit-frame-pointer +#endif /* armArchitecture */ + +/* i386 specific options */ #ifdef i386Architecture # ifndef DefaultGcc2i386Opt -# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) +# if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion > 2)) /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ # define DefaultGcc2i386Opt -O2 GccAliasingArgs # endif # endif # define OptimizedCDebugFlags DefaultGcc2i386Opt -# if OSMajorVersion < 1 -# define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF -# else -# define ServerOSDefines XFree86ServerOSDefines +#endif /* i386Architecture */ + +/* m68k specific options */ +#ifdef m68kArchitecture +# if (OSMajorVersion == 1 && OSMinorVersion <= 3) +# define OptimizedCDebugFlags -O # endif -# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2 -# define ServerExtraSysLibs -li386 +#endif /* m68kArchitecture */ + +/* mips specific options */ +#ifdef MipsArchitecture +# define PositionIndependentCFlags /* -fPIC */ +#endif /* MipsArchitecture */ + +/* powerpc specific option */ +#ifdef PpcArchitecture +# undef DefaultCCOptions +# define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char +#endif /* PpcArchitecture */ + +/* sh3 specific options */ +#ifdef sh3Architecture +# define OptimizedCDebugFlags -O +#endif /* sh3Archtecture */ + +/* sh5 specific options */ +#ifdef sh5Architecture +# define OptimizedCDebugFlags -O +#endif /* sh5Archtecture */ + +/* x86_64 */ +#if defined(x86_64Architecture) +# define OptimizedCDebugFlags -O2 GccAliasingArgs /* XXX not needed anymore? */ +# define NetBSDMachineDefines -D__AMD64__ # endif -#else -# if defined(SparcArchitecture) -# define ServerOSDefines -DDDXOSINIT -# define OptimizedCDebugFlags DefaultGcc2SparcOpt -# elif defined(AlphaArchitecture) -# define ServerOSDefines XFree86ServerOSDefines -# define OptimizedCDebugFlags DefaultGcc2AxpOpt -# elif defined(Arm32Architecture) -# define ServerOSDefines XFree86ServerOSDefines + +/* set default */ +#ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags -O2 GccAliasingArgs -# elif defined(PpcArchitecture) -# define ServerOSDefines XFree86ServerOSDefines -DDDXOSINIT -# define OptimizedCDebugFlags DefaultGcc2PpcOpt -# else -# define ServerOSDefines /**/ -# define OptimizedCDebugFlags -O2 -# endif -# if defined(AlphaArchitecture) -# define ServerExtraSysLibs -lalpha -# else -# define ServerExtraSysLibs /**/ -# endif -#endif -#ifdef i386Architecture -# define ServerExtraDefines GccGasOption XFree86ServerDefines -# ifndef XFree86ConsoleDefines -# if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \ - || OSMinorVersion >= 4) \ - || OSMajorVersion >= 2) -# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT -DWSCONS_SUPPORT -# else -# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT -# endif -# endif -#elif defined(SparcArchitecture) -# if defined(Sparc64Architecture) -# define ServerExtraDefines XFree86ServerDefines -D_XSERVER64 -# else -# define ServerExtraDefines XFree86ServerDefines -# endif -# elif defined(AlphaArchitecture) - /* XXX for the following */ -# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 -# ifndef XFree86ConsoleDefines -# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCCONS_SUPPORT -DPCVT_SUPPORT -# endif -#elif defined(AlphaArchitecture) -# define ServerExtraDefines GccGasOption -D_XSERVER64 -#elif defined(Arm32Architecture) -# define ServerExtraDefines GccGasOption XFree86ServerDefines -# ifndef XFree86ConsoleDefines -# define XFree86ConsoleDefines -DPCCONS_SUPPORT # endif -#elif defined(PpcArchitecture) -# define ServerExtraDefines GccGasOption XFree86ServerDefines -# ifndef XFree86ConsoleDefines -# define XFree86ConsoleDefines -DWSCONS_SUPPORT -# endif -#else -# define ServerExtraDefines GccGasOption +/* End of MACHINE_CPU specific options */ + + +#ifndef NetBSDMachineDefines +#define NetBSDMachineDefines /**/ #endif -#define StandardDefines -DCSRG_BASED +#define StandardDefines -DCSRG_BASED NetBSDMachineDefines + /* Citrus mb locale were added in 1.5P */ #if ((OSMajorVersion > 1) || \ (OSMajorVersion == 1 && OSMinorVersion > 5) || \ @@ -407,6 +464,7 @@ # undef InstallCmd # define InstallCmd /usr/bin/install #endif +#define StripInstalledPrograms YES #ifndef ExtraFilesToClean # define ExtraFilesToClean *.core @@ -448,13 +506,16 @@ # endif /* MTRRBuiltin */ #endif /* i386Architecture */ +#if defined(AMD64Architecture) +# define HasMTRRBuiltin YES +#endif + /* * agpgart support (NetBSD 1.5Y and up) */ #if ((OSMajorVersion > 1) || \ (OSMajorVersion == 1 && OSMinorVersion >= 6) || \ - (OSMajorVersion == 1 && OSMinorVersion == 5 && \ - OSTeenyVersion >= 25)) + (OSMajorVersion == 1 && OSMinorVersion == 5 && OSTeenyVersion >= 25)) # ifndef HasAgpGart # define HasAgpGart YES # endif @@ -465,7 +526,8 @@ * necessary kernel and toolchain support. */ #if defined(i386Architecture) && \ - ((OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion > 5)) + ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion > 5)) # define HasX86Support YES # define HasMMXSupport YES # define Has3DNowSupport YES @@ -478,7 +540,7 @@ #endif #ifndef HasCookieMaker -# if OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion >= 2 +# if (OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion >= 2) /* NetBSD 1.5 and later have /dev/urandom */ # define HasCookieMaker YES # define MkCookieCmd \ @@ -497,7 +559,7 @@ #define ForceSubdirs(dirs) @@\ dirs: .EXEC @@\ @cd $@ ; echo "making all in $(CURRENT_DIR)/$@..."; \ @@\ - $(MAKE) $(MFLAGS) PassCDebugFlags all @@\ + $(MAKE) $(PASSMFLAGS) PassCDebugFlags all @@\ @@\ .EXEC: @@ -607,119 +669,360 @@ #endif /* - * Shared libraries supported starting in 1.0 on a.out platforms, - * and on all ELF platforms. - * - * XXX May not be correct on NetBSD/pmax (ELF, but might not have - * working shared libs). + * Unresolved references are fatal on NetBSD 1.5 for libGL, which is + * built with -Bsymbolic. */ -#if ((OSMajorVersion > 0) && \ - !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \ - UseElfFormat -# ifndef HasSharedLibraries -# define HasSharedLibraries YES -# endif -#endif - -#ifndef OSBinaryType -#if UseElfFormat -#define OSBinaryType [ELF] -#else -#define OSBinaryType /**/ -#endif -#endif - -#ifndef HasSharedLibraries -#define HasSharedLibraries NO +#if UseElfFormat && \ + (OSMajorVersion == 1 && OSMinorVersion == 5) +# define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc #endif /* - * Unresolved references are fatal on NetBSD 1.5 for libGL, which is - * built with -Bsymbolic. + * src/x11 reachover makefiles always build these shared libraries. */ -#if UseElfFormat && OSMajorVersion == 1 && OSMinorVersion == 5 -#define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc +#if (OSMajorVersion >= 2) +# ifndef SharedLibXau +# define SharedLibXau HasSharedLibraries +# endif +# ifndef SharedLibXdmcp +# define SharedLibXdmcp HasSharedLibraries +# endif #endif #if HasSharedLibraries #include #endif /* HasSharedLibraries */ -/* Always build the XInput library, regardless of server support on this plattform */ +/* + * Always build the XInput library, regardless of server support + * on this plattform + */ #if !defined(BuildXInputLib) && !defined(BuildServersOnly) # define BuildXInputLib YES #endif -#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) -# include -#endif - /* - * Definitions for the SUN server on NetBSD/sparc + * MACHINE specific Xserver dependent definitions */ -#ifdef SparcArchitecture -#ifndef Xsun24Server -#define Xsun24Server YES -#endif -#ifndef XsunServer -#define XsunServer YES -#endif -#ifndef XsunMonoServer -#define XsunMonoServer NO /* XXX: does not link */ -#endif -#ifndef BuildScreenSaverLibrary -#define BuildScreenSaverLibrary YES + +/* acorn32 */ +#if defined(acorn32Architecture) +# define BuildServer YES +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DPCCONS_SUPPORT +# endif +#endif /* acorn32Architecture */ + +/* alpha */ +#if defined(AlphaArchitecture) +# define BuildServer YES +# define XalphaNetBSDServer YES +# define XdecNetBSDServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCCONS_SUPPORT -DPCVT_SUPPORT +# endif +# define ServerExtraSysLibs -lalpha #endif -#define BuildXF86VidModeExt NO -#define BuildXF86DGA NO -#define BuildXInputExt NO -#include +/* amd64 */ +#if defined(AMD64Architecture) +# define BuildServer YES +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT +# endif +# define ServerExtraSysLibs -lx86_64 #endif -/* - * Definition for compiling on MIPS machines - */ -#ifdef MipsArchitecture -#define PositionIndependentCFlags -#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ | -sed 's/\.[0-9]*$$//'` -#define SharedXtReqs $(XONLYLIB) $(SMLIB) $(ICELIB) -#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XLIB) +/* amiga */ +#if defined(amigaArchitecture) +# define BuildServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D__amiga__ +# define XserverNeedsSetUID YES #endif -/* - * Definition for compiling on Alpha machines - */ -#ifdef AlphaArchitecture +/* atari */ +#if defined(atariArchitecture) +# define BuildServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D__atari__ -D__mc68000__ -Dmc68020 +#endif -/* Build the shared XDM greeter on Alpha if it supports shared libs */ -#define SharedLibXdmGreet HasSharedLibraries +/* cats */ +#if defined(catsArchitecture) +# define BuildServer YES +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT -DWSCONS_SUPPORT +# endif #endif -/* - * Definition for compile on macppc machines - */ -#ifdef PpcArchitecture +/* dreamcast */ +#if defined(dreamcastArchitecture) +# define BuildServer YES +# define XdreamcastServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +# define XserverNeedsSetUID YES +# define XVirtualFramebufferServer NO -# define OptimizedCDebugFlags -O2 +# define XF86Server NO +# define BuildXFree86ConfigTools NO +# define BuildXInputExt NO +# define BuildXF86DGA NO +# define BuildDPMS NO +# define BuildDPMSExt NO +#endif + +/* ews4800mips */ +#if defined(ews4800mipsArchitecture) +# define BuildServer YES +# define Xews4800mipsServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# define XserverNeedsSetUID YES +# define XVirtualFramebufferServer NO + +# define XF86Server NO +# define BuildXFree86ConfigTools NO +# define BuildXInputExt NO +# define BuildXF86DGA NO +# define BuildDPMS NO +# define BuildDPMSExt NO +#endif + +/* hpcarm, hpcmips */ +#if defined(hpcarmArchitecture) || \ + defined(hpcmipsArchitecture) +# define BuildServer YES +# define XhpcServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines # define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +# define XserverNeedsSetUID YES +# define XVirtualFramebufferServer NO -# ifndef DoLoadableServer -# define DoLoadableServer YES +# define XF86Server NO +# define BuildXFree86ConfigTools NO +# define BuildXInputExt NO +# define BuildXF86DGA NO +# define BuildDPMS NO +# define BuildDPMSExt NO +#endif + +/* i386 (as MACHINE) */ +#ifdef i386Architecture +# define BuildServer YES +# if (OSMajorVersion < 1) +# define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF +# else +# define ServerOSDefines XFree86ServerOSDefines +# endif +# if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion >= 1)) +# define ServerExtraSysLibs -li386 # endif +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# ifndef XFree86ConsoleDefines +# if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion == 3 && OSTeenyVersion >= 6) || \ + (OSMajorVersion == 1 && OSMinorVersion >= 4)) +# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT \ + -DWSCONS_SUPPORT +# else +# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT +# endif +# endif +#endif /* i386Architecture */ + +/* mac68k */ +#if defined(mac68kArchitecture) +# define BuildServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D__mac68k__ +#endif -# define UseElfFormat YES +/* macppc */ +#if defined(macppcArchitecture) +# define BuildServer YES +# define XmacppcServer YES +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DWSCONS_SUPPORT +# endif +#endif /* macppcArchitecture */ +/* pmax */ +#if defined(pmaxArchitecture) +# define BuildServer YES +# define XdecNetBSDServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines + +# define XF86Server NO +# define BuildXFree86ConfigTools NO +# define BuildXInputExt NO +# define BuildXF86DGA NO +# define BuildDPMS NO +# define BuildDPMSExt NO +#endif + +/* sgimips */ +#if defined(SGIMipsArchitecture) +# define BuildServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# define XFree86ConsoleDefines -DWSCONS_SUPPORT +# undef XF86CardDrivers +# define XF86CardDrivers newport +#endif /* SGIMipsArchitectur */ + +/* shark */ +#if defined(sharkArchitecture) +# define BuildServer NO /* no IGS driver in XF86_4 */ +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# ifndef XFree86ConsoleDefines +# if ((OSMajorVersion < 1) || \ + (OSMajorVersion == 1 && OSMinorVersion < 5)) +# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT +# else +# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT \ + -DWSCONS_SUPPORT +# endif +# endif #endif -/* - * Definition for compiling on VAX machines - */ +/* sparc */ +#if defined(SparcArchitecture) && !defined(Sparc64Architecture) +# define BuildServer YES +# ifndef Xsun24Server +# define Xsun24Server YES +# endif +# ifndef XsunServer +# define XsunServer YES +# endif +# ifndef XsunMonoServer +# define XsunMonoServer YES +# endif +# ifndef BuildScreenSaverLibrary +# define BuildScreenSaverLibrary YES +# endif +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# define BuildXF86DGA NO +# define BuildXInputExt NO +#endif /* SparcArchitecture */ + +/* sparc64 */ +#if defined(Sparc64Architecture) +# define BuildServer YES +# ifndef Xsun24Server +# define Xsun24Server YES +# endif +# ifndef XsunServer +# define XsunServer YES +# endif +# ifndef XsunMonoServer +# define XsunMonoServer YES +# endif +# ifndef BuildScreenSaverLibrary +# define BuildScreenSaverLibrary YES +# endif +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 +# if 0 /* XXX: we should just remove this line? */ +# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +# endif +# ifndef XF86Server +# define XF86Server YES +# endif +# if XF86Server +# define XF86OSCardDrivers /* wsfb sunffb */ +# define AsOutputArchSize 64 +# define AsVISOption -Av9a +# define XFree86ConsoleDefines -DWSCONS_SUPPORT +# endif +# define BuildXF86DGA YES +# define BuildXInputExt YES +#endif /* Sparc64Archtecture */ + +/* sun3 */ +#if defined(Sun3Architecture) +# define BuildServer YES +# ifndef Xsun24Server +# define Xsun24Server NO +# endif +# ifndef XsunServer +# define XsunServer YES +# endif +# ifndef XsunMonoServer +# define XsunMonoServer YES +# endif +# ifndef BuildScreenSaverLibrary +# define BuildScreenSaverLibrary YES +# endif +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D__sun3__ +#endif /* Sun3Architecture */ + +/* vax */ #ifdef VaxArchitecture -#define BuildServer NO +# define BuildServer NO /* XXX notyet */ +# define XVirtualFramebufferServer NO +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines + +# define XF86Server NO +# define BuildXFree86ConfigTools NO +# define BuildXInputExt NO +# define BuildXF86DGA NO +# define BuildDPMS NO +# define BuildDPMSExt NO +#endif /* VaxArchitecture */ + +/* x68k */ +#if defined(x68kArchitecture) +# define BuildServer YES +# define X68kServer YES +# define ServerOSDefines XFree86ServerOSDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D__x68k__ +# define XserverNeedsSetUID YES +# define XVirtualFramebufferServer NO + +# define XF86Server NO +# define BuildXFree86ConfigTools NO +# define BuildXInputExt NO +# define BuildXF86DGA NO +# define BuildDPMS NO +# define BuildDPMSExt NO +#endif + +/* set default */ +#ifndef BuildServer +# define BuildServer NO +# define BuildXF86DGA NO +#endif +#ifndef ServerExtraDefines +# define ServerExtraDefines GccGasOption XFree86ServerDefines +#endif +#ifndef ServerOSDefines +# define ServerOSDefines XFree86ServerOSDefines #endif +/* End of MACHINE specific options */ +#include + /* * General settings for all platforms */ @@ -735,9 +1038,34 @@ #define UseSeparateConfDir NO /* We don't want appdefs in "/etc/X11". */ #endif -#if defined(NetBSDArchitecture) && \ - ((OSMajorVersion > 1) || \ - (OSMajorVersion == 1 && OSMinorVersion > 3)) -#define HasDevRandom YES -#define RandomDeviceFile /dev/urandom +/* NetBSD 1.5 has libusb, next versions have libusbhid */ +#if OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion > 1 +# ifdef HasLibUsb +# undef HasLibUsb +# endif +# define HasLibUsb YES +# ifndef HasLibUsbHid +# if OSMajorVersion == 1 && OSMinorVersion > 5 || OSMajorVersion > 1 +# define HasLibUsbHid YES +# define UsbHidLib -lusbhid +# else +# define HasLibUsbHid NO +# define UsbHidLib -lusb +# endif +#endif +#else +# define HasLibUsb NO +#endif + +/* USB tablets */ +#ifndef OSXInputDrivers +# if HasLibUsb +# define OSXInputDrivers usbtablet +# endif +#endif + +/* NetBSD >= 1.5 has setusercontext() */ +#if OSMajorVersion == 1 && OSMinorVersion >= 5 || OSMajorVersion > 1 +#define HasSetUserContext YES #endif + Index: xc/config/cf/OpenBSD.cf diff -u xc/config/cf/OpenBSD.cf:3.118 xc/config/cf/OpenBSD.cf:3.122 --- xc/config/cf/OpenBSD.cf:3.118 Tue Apr 18 11:57:25 2006 +++ xc/config/cf/OpenBSD.cf Tue Dec 26 23:20:25 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.118 2006/04/18 15:57:25 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.122 2006/12/27 04:20:25 tsi Exp $ XCOMM /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. @@ -104,6 +104,7 @@ #define HasMkstemp YES #define HasSetProcTitle YES #define HasZlib YES +#define PassMFLAGS NO #ifndef HasKrbIV # if OSMajorVersion == 2 || OSMajorVersion == 3 && OSMinorVersion < 3 # define HasKrbIV YES @@ -261,11 +262,8 @@ # define OverrideShlibRevs HasGccStackProtector #endif - -#define StandardDefines -DCSRG_BASED #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #define AdmDir /var/log #define HasFlex YES @@ -284,6 +282,9 @@ #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) #define InstUidFlags -m 4755 +#ifndef InstUtmpFlags +#define InstUtmpFlags -m 2755 -g utmp +#endif #ifdef InstallCmd # undef InstallCmd @@ -308,7 +309,6 @@ 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"' #endif - /* * Man pages need to be formatted when installed, so override the default * imake rules. @@ -398,7 +398,6 @@ @@\ InstallManPageAliasesBase(file,destdir,aliases) - /* * InstallFontAliases - generate rules to install font aliases * databases without comments for X11R5 servers @@ -427,7 +426,6 @@ * options and setting here into the correct section */ - /* * Definitions for the alpha architecture */ @@ -562,7 +560,6 @@ # define HasAgpGart YES # endif # endif - # ifndef DefaultGcc2i386Opt # if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2 @@ -588,7 +585,6 @@ # endif # endif - /* A hack to work around an optimization problem with gcc 2.95.2 */ # if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) # define GccOptBug295 @@ -608,7 +604,6 @@ #endif /* i386Architecture */ - /* * Definitions for the m68k architecture (currently amiga, hp300, * mac68k, mvme68k, sun3) @@ -629,7 +624,6 @@ #endif /* Mc68020Architecture */ - /* * Definitions for the amiga architecture */ @@ -645,7 +639,6 @@ #endif /* AmigaArchitecture */ - /* * Definitions for the hp300 architecture */ @@ -664,7 +657,6 @@ #endif /* Hp300Architecture */ - /* * Definitions for the mac68k architecture */ @@ -680,7 +672,6 @@ #endif /* mac68kArchitecture */ - /* * Definitions for the mvme68k architecture */ @@ -696,7 +687,6 @@ #endif /* Mvme68kArchitecture */ - /* * Definitions for the sun3 architecture */ @@ -708,8 +698,7 @@ # define BootstrapCFlags -Dsun3 # define UnalignedReferencesAllowed YES /* changes _XtCopyArgs() */ /* Note: -ansi turns off -Dmc68000 */ -# define ServerExtraDefines GccGasOption -Dmc68000 -Dmc68020 \ - -DXFree86Server -DINCLUDE_CG2_HEADER +# define ServerExtraDefines GccGasOption -Dmc68000 -Dmc68020 -DXFree86Server # ifndef Xsun24Server # define Xsun24Server NO @@ -725,7 +714,6 @@ #endif /* Sun3Architecture */ - /* * Definitions for the mips architecture (currently arc, pmax) */ @@ -741,7 +729,6 @@ #endif /* MipsArchitecture */ - /* * Definitions for the arc architecture */ @@ -756,7 +743,6 @@ #endif /* ArcArchitecture */ - /* * Definitions for the pmax architecture */ @@ -834,20 +820,19 @@ /* * Definitions for the sparc architecture */ -#ifdef SparcArchitecture +#if defined(SparcArchitecture) && !defined(Sparc64Architecture) # define BuildXF86MiscExt NO # define BuildMITMiscExt NO # if OSMajorVersion > 3 || OSMajorVersion == 3 && OSMinorVersion >= 2 # define HasWeakSymbols YES -#endif +# endif # if OSMajorVersion == 2 || OSMajorVersion == 3 && OSMinorVersion < 2 # define ServerOSDefines -DDDXOSINIT -# define ServerExtraDefines -DAVOID_GLYPHBLT -DPIXPRIV -DXFree86Server \ - DebugDefines -DINCLUDE_CG2_HEADER \ - -DX_BYTE_ORDER=$(X_BYTE_ORDER) +# define ServerExtraDefines -DAVOID_GLYPHBLT -DPIXPRIV -DXFree86Server \ + DebugDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) # ifndef Xsun24Server # define Xsun24Server YES # endif @@ -869,6 +854,7 @@ # endif # endif +# define StandardDefines -DCSRG_BASED -Dsparc -D__sparc__ # define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT # define BuildXF86VidModeExt NO @@ -880,6 +866,13 @@ # define OptimizedCDebugFlags DefaultGcc2SparcOpt # endif +# if UseElfFormat && !defined(AsVISOption) +# define AsVISOption -Av9a +# ifndef AsOutputArchSize +# define AsOutputArchSize 32 +# endif +# endif + #endif /* SparcArchitecture */ /* @@ -888,6 +881,16 @@ #ifdef Sparc64Architecture +# ifndef Xsun24Server +# define Xsun24Server NO +# endif +# ifndef XsunServer +# define XsunServer NO +# endif +# ifndef XsunMonoServer +# define XsunMonoServer NO +# endif + # if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3 # define HasWeakSymbols YES # endif @@ -896,6 +899,7 @@ # define XF86Server YES # endif +# define StandardDefines -DCSRG_BASED -Dsparc -D__sparc__ # define ServerExtraDefines GccGasOption -D_XSERVER64 XFree86ServerDefines # define ServerOSDefines XFree86ServerOSDefines -DDDXOSINIT # define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT @@ -913,6 +917,13 @@ # define OptimizedCDebugFlags DefaultGcc2SparcOpt # endif +# if UseElfFormat && !defined(AsVISOption) +# define AsVISOption -Av9a +# ifndef AsOutputArchSize +# define AsOutputArchSize 64 +# endif +# endif + #endif /* Sparc64Architecture */ /* @@ -946,6 +957,9 @@ * Generic settings for all architectures * which can be overridden by architecture specific sections above */ +#ifndef StandardDefines +#define StandardDefines -DCSRG_BASED +#endif #if !defined(OptimizedCDebugFlags) # define OptimizedCDebugFlags -O2 @@ -981,7 +995,6 @@ # define ThreadedX NO #endif - /* Set this to YES when getpwuid_r is added to libc_r */ #define HasThreadSafeAPI NO Index: xc/config/cf/OpenBSDLib.rules diff -u xc/config/cf/OpenBSDLib.rules:1.18 xc/config/cf/OpenBSDLib.rules:1.19 --- xc/config/cf/OpenBSDLib.rules:1.18 Mon Jan 9 09:56:12 2006 +++ xc/config/cf/OpenBSDLib.rules Mon Nov 27 16:02:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.18 2006/01/09 14:56:12 dawes Exp $ +XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.19 2006/11/27 21:02:23 tsi Exp $ /* * OpenBSD shared library rules @@ -143,7 +143,7 @@ #define SharedLibraryTarget(libname,rev,solist,down,up) @@\ AllTarget(Concat($(LIBPREFIX),libname.so.rev)) @@\ @@\ -Concat($(LIBPREFIX),libname.so.rev): solist @@\ +Concat($(LIBPREFIX),libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ set -x; \ @@\ (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$@\ @@\ Index: xc/config/cf/OpenBSDLib.tmpl diff -u xc/config/cf/OpenBSDLib.tmpl:1.13 xc/config/cf/OpenBSDLib.tmpl:1.14 --- xc/config/cf/OpenBSDLib.tmpl:1.13 Tue Feb 7 17:06:20 2006 +++ xc/config/cf/OpenBSDLib.tmpl Sun Jul 23 16:51:48 2006 @@ -1,9 +1,9 @@ -XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.13 2006/02/07 22:06:20 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.14 2006/07/23 20:51:48 tsi Exp $ XCOMM /* Shared libraries dependencies */ #if HasGcc && GccMajorVersion >= 3 -# define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lsupc++ +# define SharedGLUReqs $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) $(XLIB) -lsupc++ #endif /* Shared Library Revisions. Crank major on API Changes */ Index: xc/config/cf/README diff -u xc/config/cf/README:1.27 xc/config/cf/README:1.29 --- xc/config/cf/README:1.27 Sun Apr 2 19:12:46 2006 +++ xc/config/cf/README Fri Jul 14 11:26:39 2006 @@ -1,4 +1,4 @@ -$XFree86: xc/config/cf/README,v 1.27 2006/04/02 23:12:46 dickey Exp $ +$XFree86: xc/config/cf/README,v 1.29 2006/07/14 15:26:39 tsi Exp $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! @@ -20,7 +20,9 @@ CURDIR current directory relative to top of sources CcCmd command to run C compiler CompressCmd command to run compress program - ConstructMFLAGS System V option to set MFLAGS make variable + ConstructMFLAGS Set MFLAGS to $(MAKEFLAGS) + ConstructMAKEFLAGS Set MAKEFLAGS to $(MFLAGS) + PassMFLAGS Include $(MFLAGS) in `make` command lines CpCmd command to copy one file to another CplusplusCmd command to run C++ compiler CplusplusFilt command to run C++ name demangler @@ -98,7 +100,8 @@ InstManFlags install flags for manual pages InstPgmFlags install flags for normal programs InstUidFlags install flags for xterm to chown /dev/ptys - InstGidFlags install flags for xterm to open utmp + InstUtmpFlags install flags for utmp access + InstKmemFlags install flags for /dev/kmem access InstallCmd command to install files KrbIVIncludes where to include KerberosIV header files from KrbIVLibraries where to load KerberosIV libraries from Index: xc/config/cf/Win32.rules diff -u xc/config/cf/Win32.rules:1.7 xc/config/cf/Win32.rules:1.8 --- xc/config/cf/Win32.rules:1.7 Mon Jan 9 09:56:12 2006 +++ xc/config/cf/Win32.rules Tue May 16 12:01:50 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/Win32.rules,v 1.7 2006/01/09 14:56:12 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Win32.rules,v 1.8 2006/05/16 16:01:50 tsi Exp $ #define HasSharedLibraries YES #define NeedLibInsideFlag YES @@ -30,7 +30,7 @@ #define RemoveFile(file) if exist file $(RM) file -#define RemoveFiles(files) @$(MAKE) $(MFLAGS) -f << @@\ +#define RemoveFiles(files) @$(MAKE) $(PASSMFLAGS) -f << @@\ .SUFFIXES: @@\ @@\ all: files @@\ @@ -55,7 +55,7 @@ #define BuildIncludesTop(srclist,dstsubdir,dstupdir) @@\ includes:: srclist @@\ MakeDir($(BUILDINCDIR:/=\)) @@\ - @$(MAKE) $(MFLAGS) -f << @@\ + @$(MAKE) $(PASSMFLAGS) -f << @@\ .SUFFIXES: @@\ @@\ all: srclist @@\ @@ -72,7 +72,7 @@ @@\ includes:: srclist @@\ MakeDir($(XVARuse0:/=\)) @@\ - @$(MAKE) -A $(MFLAGS) -f << @@\ + @$(MAKE) -A $(PASSMFLAGS) -f << @@\ .SUFFIXES: @@\ @@\ all: srclist @@\ @@ -297,7 +297,7 @@ Avoid.Error dirs: FRC @@\ @cd $@ @@\ @echo making all in $(CURRENT_DIR)/$@... @@\ - $(MAKE) $(MFLAGS) PassCDebugFlags all @@\ + $(MAKE) $(PASSMFLAGS) PassCDebugFlags all @@\ cd .. @@\ @@\ FRC: @@ -307,7 +307,7 @@ XVARdef1 = $$ @@\ @@\ target:: @@\ - @$(MAKE) -A $(MFLAGS) -f << @@\ + @$(MAKE) -A $(PASSMFLAGS) -f << @@\ .SUFFIXES: @@\ @@\ all: $(XVARuse0:/=\) @@\ @@ -316,7 +316,7 @@ cd $(XVARuse1)@ @@\ RMoveToBakFile(Makefile) @@\ ImakeSubCmdHelper -DTOPDIR=../$(TOP) -DCURDIR=$(CURRENT_DIR)/$(XVARuse1)@ @@\ - $(MAKE) $(MFLAGS) Makefiles @@\ + $(MAKE) $(PASSMFLAGS) Makefiles @@\ cd .. @@\ << @@ -332,7 +332,7 @@ XVARdef1 = $$ @@\ @@\ name:: @@\ - @$(MAKE) -A $(MFLAGS) -f << @@\ + @$(MAKE) -A $(PASSMFLAGS) -f << @@\ .SUFFIXES: @@\ @@\ all: $(XVARuse0:/=\) @@\ @@ -340,7 +340,7 @@ Avoid.Error $(XVARuse0:/=\): @@\ cd $(XVARuse1)@ @@\ @echo verb in $(CURRENT_DIR)/$(XVARuse1)@... @@\ - $(MAKE) $(MFLAGS) flags subname @@\ + $(MAKE) $(PASSMFLAGS) flags subname @@\ cd .. @@\ << Index: xc/config/cf/X11.tmpl diff -u xc/config/cf/X11.tmpl:1.295 xc/config/cf/X11.tmpl:1.298 --- xc/config/cf/X11.tmpl:1.295 Tue Apr 18 11:57:25 2006 +++ xc/config/cf/X11.tmpl Sat Apr 28 14:35:30 2007 @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.295 2006/04/18 15:57:25 tsi Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.298 2007/04/28 18:35:30 tsi Exp $ /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. * All rights reserved. @@ -110,8 +110,8 @@ #define XVendorManNameString XFree86 #endif -VENDORMANNAME = XVendorManNameString -VENDORMANVERSION = XVendorManVersionString + VENDORMANNAME = XVendorManNameString + VENDORMANVERSION = XVendorManVersionString #ifndef VendorManDefs #define VendorManDefs -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" @@ -161,6 +161,12 @@ #ifndef BuildLibrariesForXServers #define BuildLibrariesForXServers BuildServer #endif +#ifndef BuildDebugLibraries +#define BuildDebugLibraries NO +#endif +#ifndef BuildProfileLibraries +#define BuildProfileLibraries NO +#endif #ifndef BuildFontServer #define BuildFontServer YES #endif @@ -182,9 +188,6 @@ #ifndef BuildFreeType #define BuildFreeType NO #endif -#ifndef BuildXTrueType -#define BuildXTrueType NO -#endif #ifndef BuildBuiltinFonts #define BuildBuiltinFonts NO #endif @@ -394,8 +397,8 @@ #define BuildXInputExt YES #endif #ifndef BuildXInputLib -#define BuildXInputLib ((BuildXInputExt && BuildLibraries) \ - || BuildLibrariesForDmx) +#define BuildXInputLib ((BuildXInputExt && BuildLibraries) || \ + BuildLibrariesForDmx) #endif #ifndef NeedXTrans @@ -831,9 +834,6 @@ #ifndef NeedUIThrStubs #define NeedUIThrStubs NO #endif -#ifndef BuildThreadStubLibrary -#define BuildThreadStubLibrary (NeedThreadStubLibrary && BuildLibraries) -#endif #ifndef HasWChar32 #define HasWChar32 SystemV4 #endif @@ -861,8 +861,8 @@ #ifndef DefaultFSFontPath /* * Define a default fontpath for Font Server independent of that - * for X server if building the X server for low memory footprint - */ + * for X server if building the X server for low memory footprint + */ #if BuildLowMem #if PrimaryScreenResolution < 88 /* (75 + 100) / 2 */ #define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/ @@ -940,10 +940,10 @@ #endif #endif #if HasStickyDirBit -STICKY_DEFINES = -DHAS_STICKY_DIR_BIT + STICKY_DEFINES = -DHAS_STICKY_DIR_BIT #endif #if HasFchown -FCHOWN_DEFINES = -DHAS_FCHOWN + FCHOWN_DEFINES = -DHAS_FCHOWN #endif #ifndef ExtraConnectionDefs #define ExtraConnectionDefs $(STICKY_DEFINES) $(FCHOWN_DEFINES) IPv6Flags @@ -1653,45 +1653,6 @@ #define DefaultFSConfigFile $(LIBDIR)/fs/config #endif -/* X-TrueType settings */ -#ifndef HasBlindFaithInUnicode -#define HasBlindFaithInUnicode YES -#endif -#ifndef XTrueTypeCConvModule -#if DoLoadableServer -#define XTrueTypeCConvModule YES -#else -#define XTrueTypeCConvModule NO -#endif -#endif -#ifndef XTrueTypeUseOptEncodings -#define XTrueTypeUseOptEncodings YES -#endif -#ifndef XTrueTypeCConvIncDir -#define XTrueTypeCConvIncDir $(INCROOT)/X11/fonts/codeconv -#endif -#ifndef XTrueTypeInstallCConvHeaders -#define XTrueTypeInstallCConvHeaders BuildLibraries -#endif -#ifndef XTrueTypeCConvModuleDir -#define XTrueTypeCConvModuleDir $(USRLIBDIR)/modules -#endif -#ifndef XTrueTypeCConvModuleSubDir -#define XTrueTypeCConvModuleSubDir codeconv -#endif -#ifndef XTrueTypeDebugXTT -#define XTrueTypeDebugXTT NO -#endif -#ifndef XTrueTypeStandAloneCConv -#define XTrueTypeStandAloneCConv NO -#endif -#ifndef XTrueTypeSrcDir -#define XTrueTypeSrcDir $(TOP)/extras/X-TrueType -#endif -#ifndef FreeTypeSrcDir -#define FreeTypeSrcDir $(TOP)/extras/FreeType -#endif - #ifndef BinDir #ifdef ProjectRoot #define BinDir Concat(ProjectRoot,/bin) @@ -2035,8 +1996,6 @@ FONTSERVERSRC = $(PROGRAMSRC)/xfs FONTINCSRC = $(XTOP)/include/fonts EXTINCSRC = $(XTOP)/include/extensions - FTSOURCEDIR = FreeTypeSrcDir - XTTSOURCEDIR = XTrueTypeSrcDir MESASRCDIR = MesaSrcDir DRMINCLUDESDIR = DRMIncludesDir OGLSAMPLESRCDIR = OglSampleSrcDir @@ -2074,10 +2033,10 @@ PRELOADFONTSETUP = PreloadFontSetup #endif #ifdef PreloadFreetypeSetup - PRELOADFREETYPESETUP = PreloadFreetypeSetup +PRELOADFREETYPESETUP = PreloadFreetypeSetup #endif #ifdef PreloadXFTSetup - PRELOADXFTSETUP = PreloadXFTSetup + PRELOADXFTSETUP = PreloadXFTSetup #endif #ifndef ShLibIncludeFile @@ -2095,21 +2054,35 @@ #define NeedLibInsideFlag NO #endif +#if BuildX11Lib || BuildServer #ifndef SharedLibX11 -#define SharedLibX11 HasSharedLibraries +#define SharedLibX11 HasSharedLibraries #endif #ifndef ExtraLibX11 -#define ExtraLibX11 SharedLibX11 +#define ExtraLibX11 SharedLibX11 #endif #ifndef NormalLibX11 -#define NormalLibX11 (!SharedLibX11 | ForceNormalLib) +#define NormalLibX11 (!SharedLibX11 || ForceNormalLib) #endif #ifndef DebugLibX11 -#define DebugLibX11 NO /* debugged X library */ +#define DebugLibX11 BuildDebugLibraries #endif #ifndef ProfileLibX11 -#define ProfileLibX11 NO /* profiled X library */ +#define ProfileLibX11 BuildProfileLibraries #endif +#else +#undef SharedLibX11 +#define SharedLibX11 NO +#undef ExtraLibX11 +#define ExtraLibX11 NO +#undef NormalLibX11 +#define NormalLibX11 NO +#undef DebugLibX11 +#define DebugLibX11 NO +#undef ProfileLibX11 +#define ProfileLibX11 NO +#endif + XLIBSRC = $(LIBSRC)/X11 #if SharedLibX11 #ifndef SharedX11Rev @@ -2123,71 +2096,88 @@ DEPXLIBONLY = $(DEPXONLYLIB) XLIBONLY = $(XONLYLIB) -#if BuildThreadStubLibrary -#ifndef SharedLibXThrStub -#define SharedLibXThrStub YES -#endif -#ifndef ExtraLibXThrStub -#define ExtraLibXThrStub SharedLibXThrStub +#if BuildXextLib +#ifndef SharedLibXext +#define SharedLibXext HasSharedLibraries #endif -#ifndef NormalLibXThrStub -#define NormalLibXThrStub NO +#ifndef ExtraLibXext +#define ExtraLibXext SharedLibXext #endif -#ifndef DebugLibXThrStub -#define DebugLibXThrStub NO +#ifndef NormalLibXext +#define NormalLibXext (!SharedLibXext || ForceNormalLib) #endif -#ifndef ProfileLibXThrStub -#define ProfileLibXThrStub NO +#ifndef DebugLibXext +#define DebugLibXext BuildDebugLibraries #endif - XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub -#if SharedLibXThrStub -#ifndef SharedXThrStubRev -#define SharedXThrStubRev 6.1 +#ifndef ProfileLibXext +#define ProfileLibXext BuildProfileLibraries #endif -SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev) #else -ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) +#undef SharedLibXext +#define SharedLibXext NO +#undef ExtraLibXext +#define ExtraLibXext NO +#undef NormalLibXext +#define NormalLibXext NO +#undef DebugLibXext +#define DebugLibXext NO +#undef ProfileLibXext +#define ProfileLibXext NO +#endif + + XEXTLIBSRC = $(LIBSRC)/Xext +#if SharedLibXext +#ifndef SharedXextRev +#define SharedXextRev 6.4 #endif +SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) #else -#undef SharedLibXThrStub -#define SharedLibXThrStub NO -#undef ExtraLibXThrStub -#define ExtraLibXThrStub NO -#undef NormalLibXThrStub -#define NormalLibXThrStub NO -#undef DebugLibXThrStub -#define DebugLibXThrStub NO -#undef ProfileLibXThrStub -#define ProfileLibXThrStub NO +ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) #endif + LINTEXTENSIONLIB = $(LINTEXTENSION) + DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) + XLIB = $(EXTENSIONLIB) $(XONLYLIB) + LINTXLIB = $(LINTXONLYLIB) #if BuildScreenSaverLibrary #ifndef SharedLibXss -#define SharedLibXss HasSharedLibraries +#define SharedLibXss HasSharedLibraries #endif #ifndef ExtraLibXss -#define ExtraLibXss SharedLibXss +#define ExtraLibXss SharedLibXss #endif #ifndef NormalLibXss -#define NormalLibXss (!SharedLibXss || ForceNormalLib) +#define NormalLibXss (!SharedLibXss || ForceNormalLib) #endif #ifndef DebugLibXss -#define DebugLibXss NO +#define DebugLibXss BuildDebugLibraries #endif #ifndef ProfileLibXss -#define ProfileLibXss NO +#define ProfileLibXss BuildProfileLibraries #endif #else #undef SharedLibXss -#define SharedLibXss NO +#define SharedLibXss NO #undef ExtraLibXss -#define ExtraLibXss NO +#define ExtraLibXss NO #undef NormalLibXss -#define NormalLibXss NO +#define NormalLibXss NO #undef DebugLibXss -#define DebugLibXss NO +#define DebugLibXss NO #undef ProfileLibXss -#define ProfileLibXss NO +#define ProfileLibXss NO +#endif + +#if BuildScreenSaverExt + XSSLIBSRC = $(LIBSRC)/Xss +#if SharedLibXss +#ifndef SharedXssRev +#define SharedXssRev 1.0 +#endif +SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) +#else +ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) +#endif #endif #if BuildXF86MiscLibrary @@ -2201,10 +2191,10 @@ #define NormalLibXxf86misc (!SharedLibXxf86misc || ForceNormalLib) #endif #ifndef DebugLibXxf86misc -#define DebugLibXxf86misc NO +#define DebugLibXxf86misc BuildDebugLibraries #endif #ifndef ProfileLibXxf86misc -#define ProfileLibXxf86misc NO +#define ProfileLibXxf86misc BuildProfileLibraries #endif #else #undef SharedLibXxf86misc @@ -2219,6 +2209,18 @@ #define ProfileLibXxf86misc NO #endif +#if BuildXF86MiscExt + XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc +#if SharedLibXxf86misc +#ifndef SharedXxf86miscRev +#define SharedXxf86miscRev 1.1 +#endif +SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) +#else +ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) +#endif +#endif + #if BuildXF86VidModeLibrary #ifndef SharedLibXxf86vm #define SharedLibXxf86vm HasSharedLibraries @@ -2230,16 +2232,16 @@ #define NormalLibXxf86vm (!SharedLibXxf86vm || ForceNormalLib) #endif #ifndef DebugLibXxf86vm -#define DebugLibXxf86vm NO +#define DebugLibXxf86vm BuildDebugLibraries #endif #ifndef ProfileLibXxf86vm -#define ProfileLibXxf86vm NO +#define ProfileLibXxf86vm BuildProfileLibraries #endif #else #undef SharedLibXxf86vm #define SharedLibXxf86vm NO #undef ExtraLibXxf86vm -#define ExtraLibXxf86vm NO +#define ExtraLibXxf86vm NO #undef NormalLibXxf86vm #define NormalLibXxf86vm NO #undef DebugLibXxf86vm @@ -2248,6 +2250,18 @@ #define ProfileLibXxf86vm NO #endif +#if BuildXF86VidModeExt + XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm +#if SharedLibXxf86vm +#ifndef SharedXxf86vmRev +#define SharedXxf86vmRev 1.0 +#endif +SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) +#else +ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) +#endif +#endif + #if BuildXF86DGALibrary #ifndef SharedLibXxf86dga #define SharedLibXxf86dga HasSharedLibraries @@ -2259,10 +2273,10 @@ #define NormalLibXxf86dga (!SharedLibXxf86dga || ForceNormalLib) #endif #ifndef DebugLibXxf86dga -#define DebugLibXxf86dga NO +#define DebugLibXxf86dga BuildDebugLibraries #endif #ifndef ProfileLibXxf86dga -#define ProfileLibXxf86dga NO +#define ProfileLibXxf86dga BuildProfileLibraries #endif #else #undef SharedLibXxf86dga @@ -2277,6 +2291,18 @@ #define ProfileLibXxf86dga NO #endif +#if BuildXF86DGA + XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga +#if SharedLibXxf86dga +#ifndef SharedXxf86dgaRev +#define SharedXxf86dgaRev 1.1 +#endif +SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) +#else +ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) +#endif +#endif + #if BuildXF86RushLibrary #ifndef SharedLibXxf86rush #define SharedLibXxf86rush HasSharedLibraries @@ -2288,10 +2314,10 @@ #define NormalLibXxf86rush (!SharedLibXxf86rush || ForceNormalLib) #endif #ifndef DebugLibXxf86rush -#define DebugLibXxf86rush NO +#define DebugLibXxf86rush BuildDebugLibraries #endif #ifndef ProfileLibXxf86rush -#define ProfileLibXxf86rush NO +#define ProfileLibXxf86rush BuildProfileLibraries #endif #else #undef SharedLibXxf86rush @@ -2306,6 +2332,18 @@ #define ProfileLibXxf86rush NO #endif +#if BuildXF86RushExt + XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush +#if SharedLibXxf86rush +#ifndef SharedXxf86rushRev +#define SharedXxf86rushRev 1.0 +#endif +SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) +#else +ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) +#endif +#endif + #if BuildXvLibrary #ifndef SharedLibXv #define SharedLibXv HasSharedLibraries @@ -2317,10 +2355,10 @@ #define NormalLibXv (!SharedLibXv || ForceNormalLib) #endif #ifndef DebugLibXv -#define DebugLibXv NO +#define DebugLibXv BuildDebugLibraries #endif #ifndef ProfileLibXv -#define ProfileLibXv NO +#define ProfileLibXv BuildProfileLibraries #endif #else #undef SharedLibXv @@ -2335,6 +2373,18 @@ #define ProfileLibXv NO #endif +#if BuildXvExt + XVLIBSRC = $(LIBSRC)/Xv +#if SharedLibXv +#ifndef SharedXvRev +#define SharedXvRev 1.0 +#endif +SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) +#else +ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) +#endif +#endif + #if BuildXvMCLibrary #ifndef SharedLibXvMC #define SharedLibXvMC HasSharedLibraries @@ -2346,10 +2396,10 @@ #define NormalLibXvMC (!SharedLibXvMC || ForceNormalLib) #endif #ifndef DebugLibXvMC -#define DebugLibXvMC NO +#define DebugLibXvMC BuildDebugLibraries #endif #ifndef ProfileLibXvMC -#define ProfileLibXvMC NO +#define ProfileLibXvMC BuildProfileLibraries #endif #else #undef SharedLibXvMC @@ -2364,6 +2414,18 @@ #define ProfileLibXvMC NO #endif +#if BuildXvMCExt + XVMCLIBSRC = $(LIBSRC)/XvMC +#if SharedLibXvMC +#ifndef SharedXvMCRev +#define SharedXvMCRev 1.0 +#endif +SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) +#else +ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) +#endif +#endif + #if BuildXineramaLibrary #ifndef SharedLibXinerama #define SharedLibXinerama HasSharedLibraries @@ -2375,10 +2437,10 @@ #define NormalLibXinerama (!SharedLibXinerama || ForceNormalLib) #endif #ifndef DebugLibXinerama -#define DebugLibXinerama NO +#define DebugLibXinerama BuildDebugLibraries #endif #ifndef ProfileLibXinerama -#define ProfileLibXinerama NO +#define ProfileLibXinerama BuildProfileLibraries #endif #else #undef SharedLibXinerama @@ -2393,6 +2455,18 @@ #define ProfileLibXinerama NO #endif +#if BuildXinerama + XINERAMALIBSRC = $(LIBSRC)/Xinerama +#if SharedLibXinerama +#ifndef SharedXineramaRev +#define SharedXineramaRev 1.0 +#endif +SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) +#else +ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) +#endif +#endif + #if BuildXResLibrary #ifndef SharedLibXRes #define SharedLibXRes HasSharedLibraries @@ -2404,10 +2478,10 @@ #define NormalLibXRes (!SharedLibXRes || ForceNormalLib) #endif #ifndef DebugLibXRes -#define DebugLibXRes NO +#define DebugLibXRes BuildDebugLibraries #endif #ifndef ProfileLibXRes -#define ProfileLibXRes NO +#define ProfileLibXRes BuildProfileLibraries #endif #else #undef SharedLibXRes @@ -2422,6 +2496,59 @@ #define ProfileLibXRes NO #endif +#if BuildXResExt + XRESLIBSRC = $(LIBSRC)/XRes +#if SharedLibXRes +#ifndef SharedXResRev +#define SharedXResRev 1.0 +#endif +SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) +#else +ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) +#endif +#endif + +#if BuildDmxLibrary +#ifndef SharedLibDmx +#define SharedLibDmx HasSharedLibraries +#endif +#ifndef ExtraLibDmx +#define ExtraLibDmx SharedLibDmx +#endif +#ifndef NormalLibDmx +#define NormalLibDmx YES +#endif +#ifndef DebugLibDmx +#define DebugLibDmx BuildDebugLibraries +#endif +#ifndef ProfileLibDmx +#define ProfileLibDmx BuildProfileLibraries +#endif +#else +#undef SharedLibDmx +#define SharedLibDmx NO +#undef ExtraLibDmx +#define ExtraLibDmx NO +#undef NormalLibDmx +#define NormalLibDmx NO +#undef DebugLibDmx +#define DebugLibDmx NO +#undef ProfileLibDmx +#define ProfileLibDmx NO +#endif + +#if BuildDmx + DMXLIBSRC = $(LIBSRC)/dmx +#if SharedLibDmx +#ifndef SharedDmxRev +#define SharedDmxRev 1.0 +#endif +SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) +#else +ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) +#endif +#endif + #if BuildDPSLibrary #ifndef SharedLibDps #define SharedLibDps HasSharedLibraries @@ -2433,10 +2560,10 @@ #define NormalLibDps (!SharedLibDps || ForceNormalLib) #endif #ifndef DebugLibDps -#define DebugLibDps NO +#define DebugLibDps BuildDebugLibraries #endif #ifndef ProfileLibDps -#define ProfileLibDps NO +#define ProfileLibDps BuildProfileLibraries #endif #else #undef SharedLibDps @@ -2451,6 +2578,16 @@ #define ProfileLibDps NO #endif + DPSLIBSRC = $(LIBSRC)/dps +#if SharedLibDps +#ifndef SharedDpsRev +#define SharedDpsRev 1.0 +#endif +SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) +#else +ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) +#endif + #if BuildDPSTkLibrary #ifndef SharedLibDpsTk #define SharedLibDpsTk HasSharedLibraries @@ -2462,10 +2599,10 @@ #define NormalLibDpsTk (!SharedLibDpsTk || ForceNormalLib) #endif #ifndef DebugLibDpsTk -#define DebugLibDpsTk NO +#define DebugLibDpsTk BuildDebugLibraries #endif #ifndef ProfileLibDpsTk -#define ProfileLibDpsTk NO +#define ProfileLibDpsTk BuildProfileLibraries #endif #else #undef SharedLibDpsTk @@ -2480,6 +2617,16 @@ #define ProfileLibDpsTk NO #endif + DPSTKLIBSRC = $(LIBSRC)/dpstk +#if SharedLibDpsTk +#ifndef SharedDpsTkRev +#define SharedDpsTkRev 1.0 +#endif +SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) +#else +ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) +#endif + #if BuildPSResLibrary #ifndef SharedLibPSRes #define SharedLibPSRes HasSharedLibraries @@ -2491,10 +2638,10 @@ #define NormalLibPSRes (!SharedLibPSRes || ForceNormalLib) #endif #ifndef DebugLibPSRes -#define DebugLibPSRes NO +#define DebugLibPSRes BuildDebugLibraries #endif #ifndef ProfileLibPSRes -#define ProfileLibPSRes NO +#define ProfileLibPSRes BuildProfileLibraries #endif #else #undef SharedLibPSRes @@ -2509,149 +2656,79 @@ #define ProfileLibPSRes NO #endif -#if BuildRenderLibrary -#ifndef SharedLibXrender -#define SharedLibXrender HasSharedLibraries -#endif -#ifndef ExtraLibXrender -#define ExtraLibXrender SharedLibXrender + PSRESLIBSRC = $(LIBSRC)/psres +#if SharedLibPSRes +#ifndef SharedPSResRev +#define SharedPSResRev 1.0 #endif -#ifndef NormalLibXrender -#define NormalLibXrender (!SharedLibXrender || ForceNormalLib) +SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) +#else +ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) #endif -#ifndef DebugLibXrender -#define DebugLibXrender NO + +#if BuildGLXLibrary +#ifndef SharedLibGlx +#define SharedLibGlx HasSharedLibraries #endif -#ifndef ProfileLibXrender -#define ProfileLibXrender NO -#endif -#else -#undef SharedLibXrender -#define SharedLibXrender NO -#undef ExtraLibXrender -#define ExtraLibXrender NO -#undef NormalLibXrender -#define NormalLibXrender NO -#undef DebugLibXrender -#define DebugLibXrender NO -#undef ProfileLibXrender -#define ProfileLibXrender NO -#endif - -#if BuildRandRLibrary -#ifndef SharedLibXrandr -#define SharedLibXrandr HasSharedLibraries +#ifndef ExtraLibGlx +#define ExtraLibGlx SharedLibGlx #endif -#ifndef ExtraLibXrandr -#define ExtraLibXrandr SharedLibXrandr +#ifndef NormalLibGlx +#define NormalLibGlx (!SharedLibX11 || ForceNormalLib) #endif -#ifndef NormalLibXrandr -#define NormalLibXrandr (!SharedLibXrandr || ForceNormalLib) +#ifndef DebugLibGlx +#define DebugLibGlx BuildDebugLibraries #endif -#ifndef DebugLibXrandr -#define DebugLibXrandr NO +#ifndef ProfileLibGlx +#define ProfileLibGlx BuildProfileLibraries #endif -#ifndef ProfileLibXrandr -#define ProfileLibXrandr NO +#ifndef BuildLibGlxWithoutPIC +#define BuildLibGlxWithoutPIC NO #endif +#if BuildLibGlxWithoutPIC && SharedLibGlx +#define SharedLibGlxWithoutPIC YES #else -#undef SharedLibXrandr -#define SharedLibXrandr NO -#undef ExtraLibXrandr -#define ExtraLibXrandr NO -#undef NormalLibXrandr -#define NormalLibXrandr NO -#undef DebugLibXrandr -#define DebugLibXrandr NO -#undef ProfileLibXrandr -#define ProfileLibXrandr NO -#endif - -#if BuildXcursorLibrary -#ifndef SharedLibXcursor -#define SharedLibXcursor HasSharedLibraries +#define SharedLibGlxWithoutPIC NO #endif -#ifndef ExtraLibXcursor -#define ExtraLibXcursor SharedLibXcursor +#ifndef LinkGLToUsrLib +#define LinkGLToUsrLib NO #endif -#ifndef NormalLibXcursor -#define NormalLibXcursor (!SharedLibXcursor || ForceNormalLib) +#if NothingOutsideProjectRoot +#undef LinkGLToUsrLib +#define LinkGLToUsrLib NO #endif -#ifndef DebugLibXcursor -#define DebugLibXcursor NO +#ifndef LinkGLToUsrInclude +#define LinkGLToUsrInclude NO #endif -#ifndef ProfileLibXcursor -#define ProfileLibXcursor NO +#if NothingOutsideProjectRoot +#undef LinkGLToUsrInclude +#define LinkGLToUsrInclude NO #endif #else -#undef SharedLibXcursor -#define SharedLibXcursor NO -#undef ExtraLibXcursor -#define ExtraLibXcursor NO -#undef NormalLibXcursor -#define NormalLibXcursor NO -#undef DebugLibXcursor -#define DebugLibXcursor NO -#undef ProfileLibXcursor -#define ProfileLibXcursor NO +#undef SharedLibGlx +#define SharedLibGlx NO +#undef ExtraLibGlx +#define ExtraLibGlx NO +#undef NormalLibGlx +#define NormalLibGlx NO +#undef DebugLibGlx +#define DebugLibGlx NO +#undef ProfileLibGlx +#define ProfileLibGlx NO +#undef LinkGLToUsrInclude +#define LinkGLToUsrInclude NO #endif -#if BuildAppleWMLibrary -#ifndef SharedLibAppleWM -#define SharedLibAppleWM HasSharedLibraries -#endif -#ifndef ExtraLibAppleWM -#define ExtraLibAppleWM SharedLibAppleWM -#endif -#ifndef NormalLibAppleWM -#define NormalLibAppleWM (!SharedLibAppleWM || ForceNormalLib) -#endif -#ifndef DebugLibAppleWM -#define DebugLibAppleWM NO -#endif -#ifndef ProfileLibAppleWM -#define ProfileLibAppleWM NO +#if BuildGlxExt + GLXLIBSRC = $(LIBSRC)/GL +#if SharedLibGlx +#ifndef SharedGlxRev +#define SharedGlxRev 1.2 #endif +SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) #else -#undef SharedLibAppleWM -#define SharedLibAppleWM NO -#undef ExtraLibAppleWM -#define ExtraLibAppleWM NO -#undef NormalLibAppleWM -#define NormalLibAppleWM NO -#undef DebugLibAppleWM -#define DebugLibAppleWM NO -#undef ProfileLibAppleWM -#define ProfileLibAppleWM NO +ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) #endif - -#if BuildWindowsWMLibrary -#ifndef SharedLibWindowsWM -#define SharedLibWindowsWM HasSharedLibraries -#endif -#ifndef ExtraLibWindowsWM -#define ExtraLibWindowsWM SharedLibWindowsWM -#endif -#ifndef NormalLibWindowsWM -#define NormalLibWindowsWM (!SharedLibWindowsWM || ForceNormalLib) -#endif -#ifndef DebugLibWindowsWM -#define DebugLibWindowsWM NO -#endif -#ifndef ProfileLibWindowsWM -#define ProfileLibWindowsWM NO -#endif -#else -#undef SharedLibWindowsWM -#define SharedLibWindowsWM NO -#undef ExtraLibWindowsWM -#define ExtraLibWindowsWM NO -#undef NormalLibWindowsWM -#define NormalLibWindowsWM NO -#undef DebugLibWindowsWM -#define DebugLibWindowsWM NO -#undef ProfileLibWindowsWM -#define ProfileLibWindowsWM NO #endif #if BuildGLULibrary @@ -2662,13 +2739,13 @@ #define ExtraLibGlu SharedLibGlu #endif #ifndef NormalLibGlu -#define NormalLibGlu (!SharedLibX11 | ForceNormalLib) +#define NormalLibGlu (!SharedLibX11 || ForceNormalLib) #endif #ifndef DebugLibGlu -#define DebugLibGlu NO +#define DebugLibGlu BuildDebugLibraries #endif #ifndef ProfileLibGlu -#define ProfileLibGlu NO +#define ProfileLibGlu BuildProfileLibraries #endif #else #undef SharedLibGlu @@ -2683,65 +2760,25 @@ #define ProfileLibGlu NO #endif -#if BuildGLXLibrary -#ifndef SharedLibGlx -#define SharedLibGlx HasSharedLibraries -#endif -#ifndef ExtraLibGlx -#define ExtraLibGlx SharedLibGlx -#endif -#ifndef NormalLibGlx -#define NormalLibGlx (!SharedLibX11 | ForceNormalLib) -#endif -#ifndef DebugLibGlx -#define DebugLibGlx NO -#endif -#ifndef ProfileLibGlx -#define ProfileLibGlx NO -#endif -#ifndef BuildLibGlxWithoutPIC -#define BuildLibGlxWithoutPIC NO +#if BuildGlxExt + GLULIBSRC = $(LIBSRC)/GLU +#if SharedLibGlu +#ifndef SharedGluRev +#define SharedGluRev 1.3 #endif -#if BuildLibGlxWithoutPIC && SharedLibGlx -#define SharedLibGlxWithoutPIC YES +SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) #else -#define SharedLibGlxWithoutPIC NO -#endif -#ifndef LinkGLToUsrLib -#define LinkGLToUsrLib NO -#endif -#if NothingOutsideProjectRoot -#undef LinkGLToUsrLib -#define LinkGLToUsrLib NO -#endif -#ifndef LinkGLToUsrInclude -#define LinkGLToUsrInclude NO -#endif -#if NothingOutsideProjectRoot -#undef LinkGLToUsrInclude -#define LinkGLToUsrInclude NO +ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) #endif -#else -#undef SharedLibGlx -#define SharedLibGlx NO -#undef ExtraLibGlx -#define ExtraLibGlx NO -#undef NormalLibGlx -#define NormalLibGlx NO -#undef DebugLibGlx -#define DebugLibGlx NO -#undef ProfileLibGlx -#define ProfileLibGlx NO -#undef LinkGLToUsrInclude -#define LinkGLToUsrInclude NO #endif + /* - * Only make a shared GLw library on systems with Weak symbols + * Only make a shared GLw library on systems with weak symbols * because it depends on Motif. See xc/lib/GLw/README.txt for details */ #if BuildGLwLibrary #ifndef SharedLibGLw -#define SharedLibGLw HasSharedLibraries && HasWeakSymbols +#define SharedLibGLw (HasSharedLibraries && HasWeakSymbols) #endif #ifndef ExtraLibGLw #define ExtraLibGLw SharedLibGLw @@ -2750,14 +2787,14 @@ #define NormalLibGLw (!SharedLibGLw || ForceNormalLib) #endif #ifndef DebugLibGLw -#define DebugLibGLw NO /* debugged widget library */ +#define DebugLibGLw BuildDebugLibraries #endif #ifndef ProfileLibGLw -#define ProfileLibGLw NO /* profiled widget library */ +#define ProfileLibGLw BuildProfileLibraries #endif #ifndef GLwUseXmStubs /* create stub (weak) Motif symbols */ -#define GLwUseXmStubs SharedLibGLw && HasWeakSymbols +#define GLwUseXmStubs (SharedLibGLw && HasWeakSymbols) #endif #else #undef SharedLibGLw @@ -2772,240 +2809,89 @@ #define ProfileLibGLw NO #endif -#ifndef SharedLibXext -#define SharedLibXext HasSharedLibraries -#endif -#ifndef ExtraLibXext -#define ExtraLibXext SharedLibXext -#endif -#ifndef NormalLibXext -#define NormalLibXext (!SharedLibXext | ForceNormalLib) -#endif -#ifndef DebugLibXext -#define DebugLibXext NO /* debugged Xext library */ -#endif -#ifndef ProfileLibXext -#define ProfileLibXext NO /* profiled Xext library */ -#endif - XEXTLIBSRC = $(LIBSRC)/Xext -#if SharedLibXext -#ifndef SharedXextRev -#define SharedXextRev 6.4 -#endif -SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) -#else -ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) -#endif -LINTEXTENSIONLIB = $(LINTEXTENSION) - DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) - XLIB = $(EXTENSIONLIB) $(XONLYLIB) - LINTXLIB = $(LINTXONLYLIB) - - XSSLIBSRC = $(LIBSRC)/Xss -#if SharedLibXss -#ifndef SharedXssRev -#define SharedXssRev 1.0 -#endif -SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) -#else -ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) -#endif - - XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -#if SharedLibXxf86misc -#ifndef SharedXxf86miscRev -#define SharedXxf86miscRev 1.1 -#endif -SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) -#else -ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) -#endif - - XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -#if SharedLibXxf86vm -#ifndef SharedXxf86vmRev -#define SharedXxf86vmRev 1.0 -#endif -SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) -#else -ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) -#endif - - XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -#if SharedLibXxf86dga -#ifndef SharedXxf86dgaRev -#define SharedXxf86dgaRev 1.1 -#endif -SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) -#else -ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) -#endif - -#if BuildDmxLibrary -#ifndef SharedLibDmx -#define SharedLibDmx HasSharedLibraries -#endif -#ifndef ExtraLibDmx -#define ExtraLibDmx SharedLibDmx -#endif -#ifndef NormalLibDmx -#define NormalLibDmx YES -#endif -#ifndef DebugLibDmx -#define DebugLibDmx NO -#endif -#ifndef ProfileLibDmx -#define ProfileLibDmx NO -#endif -#else -#ifndef SharedLibDmx -#define SharedLibDmx NO -#endif -#ifndef ExtraLibDmx -#define ExtraLibDmx NO -#endif -#ifndef NormalLibDmx -#define NormalLibDmx NO -#endif -#ifndef DebugLibDmx -#define DebugLibDmx NO -#endif -#ifndef ProfileLibDmx -#define ProfileLibDmx NO -#endif -#endif - - XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -#if SharedLibXxf86rush -#ifndef SharedXxf86rushRev -#define SharedXxf86rushRev 1.0 -#endif -SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) -#else -ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) -#endif - - - XVLIBSRC = $(LIBSRC)/Xv -#if SharedLibXv -#ifndef SharedXvRev -#define SharedXvRev 1.0 -#endif -SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) -#else -ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) -#endif - - - XVMCLIBSRC = $(LIBSRC)/XvMC -#if SharedLibXvMC -#ifndef SharedXvMCRev -#define SharedXvMCRev 1.0 -#endif -SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) -#else -ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) -#endif - - XINERAMALIBSRC = $(LIBSRC)/Xinerama -#if SharedLibXinerama -#ifndef SharedXineramaRev -#define SharedXineramaRev 1.0 +#if BuildGlxExt + GLWIDGETSRC = $(LIBSRC)/GLw +#if SharedLibGLw +#ifndef SharedGLwRev +#define SharedGLwRev 1.0 /* used to name the shared library */ #endif -SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) +SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) #else -ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) -#endif - - XRESLIBSRC = $(LIBSRC)/XRes -#if SharedLibXRes -#ifndef SharedXResRev -#define SharedXResRev 1.0 +ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) #endif -SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) -#else -ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) #endif - DMXLIBSRC = $(LIBSRC)/dmx -#if SharedLibDmx -#ifndef SharedDmxRev -#define SharedDmxRev 1.0 +#if BuildRenderLibrary +#ifndef SharedLibXrender +#define SharedLibXrender HasSharedLibraries #endif -SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) -#else -ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) +#ifndef ExtraLibXrender +#define ExtraLibXrender SharedLibXrender #endif - - DPSLIBSRC = $(LIBSRC)/dps -#if SharedLibDps -#ifndef SharedDpsRev -#define SharedDpsRev 1.0 +#ifndef NormalLibXrender +#define NormalLibXrender (!SharedLibXrender || ForceNormalLib) #endif -SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) -#else -ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) +#ifndef DebugLibXrender +#define DebugLibXrender BuildDebugLibraries #endif - - DPSTKLIBSRC = $(LIBSRC)/dpstk -#if SharedLibDpsTk -#ifndef SharedDpsTkRev -#define SharedDpsTkRev 1.0 +#ifndef ProfileLibXrender +#define ProfileLibXrender BuildProfileLibraries #endif -SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) #else -ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) +#undef SharedLibXrender +#define SharedLibXrender NO +#undef ExtraLibXrender +#define ExtraLibXrender NO +#undef NormalLibXrender +#define NormalLibXrender NO +#undef DebugLibXrender +#define DebugLibXrender NO +#undef ProfileLibXrender +#define ProfileLibXrender NO #endif - PSRESLIBSRC = $(LIBSRC)/psres -#if SharedLibPSRes -#ifndef SharedPSResRev -#define SharedPSResRev 1.0 +#if BuildRender + XRENDERLIBSRC = $(LIBSRC)/Xrender +#if SharedLibXrender +#ifndef SharedXrenderRev +#define SharedXrenderRev 1.2 #endif -SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) +SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) #else -ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) -#endif - - GLULIBSRC = $(LIBSRC)/GLU -#if SharedLibGlu -#ifndef SharedGluRev -#define SharedGluRev 1.3 +ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) #endif -SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) -#else -ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) #endif - GLXLIBSRC = $(LIBSRC)/GL -#if SharedLibGlx -#ifndef SharedGlxRev -#define SharedGlxRev 1.2 -#endif -SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) -#else -ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) +#if BuildRandRLibrary +#ifndef SharedLibXrandr +#define SharedLibXrandr HasSharedLibraries #endif - GLWIDGETSRC = $(LIBSRC)/GLw -#if SharedLibGLw -#ifndef SharedGLwRev -#define SharedGLwRev 1.0 /* used to name the shared library */ +#ifndef ExtraLibXrandr +#define ExtraLibXrandr SharedLibXrandr #endif -SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) -#else -ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) +#ifndef NormalLibXrandr +#define NormalLibXrandr (!SharedLibXrandr || ForceNormalLib) #endif - - XRENDERLIBSRC = $(LIBSRC)/Xrender -#if SharedLibXrender -#ifndef SharedXrenderRev -#define SharedXrenderRev 1.2 +#ifndef DebugLibXrandr +#define DebugLibXrandr BuildDebugLibraries +#endif +#ifndef ProfileLibXrandr +#define ProfileLibXrandr BuildProfileLibraries #endif -SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) #else -ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) +#undef SharedLibXrandr +#define SharedLibXrandr NO +#undef ExtraLibXrandr +#define ExtraLibXrandr NO +#undef NormalLibXrandr +#define NormalLibXrandr NO +#undef DebugLibXrandr +#define DebugLibXrandr NO +#undef ProfileLibXrandr +#define ProfileLibXrandr NO #endif +#if BuildRandR XRANDRRLIBSRC = $(LIBSRC)/Xrandr #if SharedLibXrandr #ifndef SharedXrandrRev @@ -3015,7 +2901,38 @@ #else ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) #endif +#endif + +#if BuildXcursorLibrary +#ifndef SharedLibXcursor +#define SharedLibXcursor HasSharedLibraries +#endif +#ifndef ExtraLibXcursor +#define ExtraLibXcursor SharedLibXcursor +#endif +#ifndef NormalLibXcursor +#define NormalLibXcursor (!SharedLibXcursor || ForceNormalLib) +#endif +#ifndef DebugLibXcursor +#define DebugLibXcursor BuildDebugLibraries +#endif +#ifndef ProfileLibXcursor +#define ProfileLibXcursor BuildProfileLibraries +#endif +#else +#undef SharedLibXcursor +#define SharedLibXcursor NO +#undef ExtraLibXcursor +#define ExtraLibXcursor NO +#undef NormalLibXcursor +#define NormalLibXcursor NO +#undef DebugLibXcursor +#define DebugLibXcursor NO +#undef ProfileLibXcursor +#define ProfileLibXcursor NO +#endif +#if BuildRender XCURSORRLIBSRC = $(LIBSRC)/Xcursor #if SharedLibXcursor #ifndef SharedXcursorRev @@ -3025,8 +2942,38 @@ #else ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) #endif +#endif + +#if BuildAppleWMLibrary +#ifndef SharedLibAppleWM +#define SharedLibAppleWM HasSharedLibraries +#endif +#ifndef ExtraLibAppleWM +#define ExtraLibAppleWM SharedLibAppleWM +#endif +#ifndef NormalLibAppleWM +#define NormalLibAppleWM (!SharedLibAppleWM || ForceNormalLib) +#endif +#ifndef DebugLibAppleWM +#define DebugLibAppleWM BuildDebugLibraries +#endif +#ifndef ProfileLibAppleWM +#define ProfileLibAppleWM BuildProfileLibraries +#endif +#else +#undef SharedLibAppleWM +#define SharedLibAppleWM NO +#undef ExtraLibAppleWM +#define ExtraLibAppleWM NO +#undef NormalLibAppleWM +#define NormalLibAppleWM NO +#undef DebugLibAppleWM +#define DebugLibAppleWM NO +#undef ProfileLibAppleWM +#define ProfileLibAppleWM NO +#endif - APPLEWMLIBSRC = $(LIBSRC)/apple + APPLEWMLIBSRC = $(LIBSRC)/apple #if SharedLibAppleWM #ifndef SharedAppleWMRev #define SharedAppleWMRev 1.0 @@ -3036,33 +2983,37 @@ ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) #endif - WINDOWSWMLIBSRC = $(LIBSRC)/windows -#if SharedLibWindowsWM -#ifndef SharedWindowsWMRev -#define SharedWindowsWMRev 1.0 -#endif -SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) -#else -ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) +#if BuildFontCacheLib +#ifndef SharedLibXfontcache +#define SharedLibXfontcache HasSharedLibraries +#endif +#ifndef ExtraLibXfontcache +#define ExtraLibXfontcache SharedLibXfontcache +#endif +#ifndef NormalLibXfontcache +#define NormalLibXfontcache (!SharedLibXfontcache || ForceNormalLib) +#endif +#ifndef DebugLibXfontcache +#define DebugLibXfontcache BuildDebugLibraries +#endif +#ifndef ProfileLibXfontcache +#define ProfileLibXfontcache BuildProfileLibraries +#endif +#else +#undef SharedLibXfontcache +#define SharedLibXfontcache NO +#undef ExtraLibXfontcache +#define ExtraLibXfontcache NO +#undef NormalLibXfontcache +#define NormalLibXfontcache NO +#undef DebugLibXfontcache +#define DebugLibXfontcache NO +#undef ProfileLibXfontcache +#define ProfileLibXfontcache NO #endif -# ifndef SharedLibXfontcache -# define SharedLibXfontcache HasSharedLibraries -# endif -# ifndef ExtraLibXfontcache -# define ExtraLibXfontcache SharedLibXfontcache -# endif -# ifndef NormalLibXfontcache -# define NormalLibXfontcache (!SharedLibXfontcache || ForceNormalLib) -# endif -# ifndef DebugLibXfontcache -# define DebugLibXfontcache NO -# endif -# ifndef ProfileLibXfontcache -# define ProfileLibXfontcache NO -# endif - - XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache +#if BuildFontCache + XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache #if SharedLibXfontcache #ifndef SharedXfontcacheRev #define SharedXfontcacheRev 1.2 @@ -3071,7 +3022,9 @@ #else ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) #endif +#endif +#if BuildXauLib #ifndef SharedLibXau #define SharedLibXau NO #endif @@ -3079,14 +3032,27 @@ #define ExtraLibXau SharedLibXau #endif #ifndef NormalLibXau -#define NormalLibXau (!SharedLibXau | ForceNormalLib) +#define NormalLibXau (!SharedLibXau || ForceNormalLib) #endif #ifndef DebugLibXau -#define DebugLibXau NO /* debugged auth library */ +#define DebugLibXau BuildDebugLibraries #endif #ifndef ProfileLibXau -#define ProfileLibXau NO /* profiled auth library */ +#define ProfileLibXau BuildProfileLibraries +#endif +#else +#undef SharedLibXau +#define SharedLibXau NO +#undef ExtraLibXau +#define ExtraLibXau NO +#undef NormalLibXau +#define NormalLibXau NO +#undef DebugLibXau +#define DebugLibXau NO +#undef ProfileLibXau +#define ProfileLibXau NO #endif + XAUTHSRC = $(LIBSRC)/Xau #if SharedLibXau #ifndef SharedXauRev @@ -3101,6 +3067,7 @@ #endif #endif +#if BuildXdmcpLib #ifndef SharedLibXdmcp #define SharedLibXdmcp NO #endif @@ -3108,14 +3075,27 @@ #define ExtraLibXdmcp SharedLibXdmcp #endif #ifndef NormalLibXdmcp -#define NormalLibXdmcp (!SharedLibXdmcp | ForceNormalLib) +#define NormalLibXdmcp (!SharedLibXdmcp || ForceNormalLib) #endif #ifndef DebugLibXdmcp -#define DebugLibXdmcp NO /* debugged XDMCP library */ +#define DebugLibXdmcp BuildDebugLibraries #endif #ifndef ProfileLibXdmcp -#define ProfileLibXdmcp NO /* profiled XDMCP library */ +#define ProfileLibXdmcp BuildProfileLibraries +#endif +#else +#undef SharedLibXdmcp +#define SharedLibXdmcp NO +#undef ExtraLibXdmcp +#define ExtraLibXdmcp NO +#undef NormalLibXdmcp +#define NormalLibXdmcp NO +#undef DebugLibXdmcp +#define DebugLibXdmcp NO +#undef ProfileLibXdmcp +#define ProfileLibXdmcp NO #endif + XDMCPLIBSRC = $(LIBSRC)/Xdmcp #if SharedLibXdmcp #ifndef SharedXdmcpRev @@ -3130,21 +3110,35 @@ #endif #endif +#if BuildXmuLib #ifndef SharedLibXmu -#define SharedLibXmu HasSharedLibraries +#define SharedLibXmu HasSharedLibraries #endif #ifndef ExtraLibXmu -#define ExtraLibXmu SharedLibXmu +#define ExtraLibXmu SharedLibXmu #endif #ifndef NormalLibXmu -#define NormalLibXmu (!SharedLibXmu | ForceNormalLib) +#define NormalLibXmu (!SharedLibXmu || ForceNormalLib) #endif #ifndef DebugLibXmu -#define DebugLibXmu NO /* debugged Xmu library */ +#define DebugLibXmu BuildDebugLibraries #endif #ifndef ProfileLibXmu -#define ProfileLibXmu NO /* profiled Xmu library */ +#define ProfileLibXmu BuildProfileLibraries +#endif +#else +#undef SharedLibXmu +#define SharedLibXmu NO +#undef ExtraLibXmu +#define ExtraLibXmu NO +#undef NormalLibXmu +#define NormalLibXmu NO +#undef DebugLibXmu +#define DebugLibXmu NO +#undef ProfileLibXmu +#define ProfileLibXmu NO #endif + XMUSRC = $(LIBSRC)/Xmu #if SharedLibXmu #ifndef SharedXmuRev @@ -3155,22 +3149,36 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) #endif +#if BuildXmuuLib #ifndef SharedLibXmuu -#define SharedLibXmuu HasSharedLibraries +#define SharedLibXmuu HasSharedLibraries #endif #ifndef ExtraLibXmuu -#define ExtraLibXmuu SharedLibXmuu +#define ExtraLibXmuu SharedLibXmuu #endif #ifndef NormalLibXmuu -#define NormalLibXmuu (!SharedLibXmuu | ForceNormalLib) +#define NormalLibXmuu (!SharedLibXmuu || ForceNormalLib) #endif #ifndef DebugLibXmuu -#define DebugLibXmuu NO /* debugged Xmuu library */ +#define DebugLibXmuu BuildDebugLibraries #endif #ifndef ProfileLibXmuu -#define ProfileLibXmuu NO /* profiled Xmuu library */ +#define ProfileLibXmuu BuildProfileLibraries #endif - XMUUSRC = $(LIBSRC)/Xmuu +#else +#undef SharedLibXmuu +#define SharedLibXmuu NO +#undef ExtraLibXmuu +#define ExtraLibXmuu NO +#undef NormalLibXmuu +#define NormalLibXmuu NO +#undef DebugLibXmuu +#define DebugLibXmuu NO +#undef ProfileLibXmuu +#define ProfileLibXmuu NO +#endif + + XMUUSRC = $(LIBSRC)/Xmuu #if SharedLibXmuu #ifndef SharedXmuuRev #define SharedXmuuRev 1.0 @@ -3180,21 +3188,35 @@ ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) #endif +#if BuildOldXLib #ifndef SharedOldX -#define SharedOldX HasSharedLibraries +#define SharedOldX HasSharedLibraries #endif #ifndef ExtraOldX -#define ExtraOldX SharedOldX +#define ExtraOldX SharedOldX #endif #ifndef NormalOldX -#define NormalOldX (!SharedOldX | ForceNormalLib) +#define NormalOldX (!SharedOldX || ForceNormalLib) #endif #ifndef DebugOldX -#define DebugOldX NO /* debugged old X library */ +#define DebugOldX BuildDebugLibraries #endif #ifndef ProfileOldX -#define ProfileOldX NO /* profiled old X library */ +#define ProfileOldX BuildProfileLibraries +#endif +#else +#undef SharedOldX +#define SharedOldX NO +#undef ExtraOldX +#define ExtraOldX NO +#undef NormalOldX +#define NormalOldX NO +#undef DebugOldX +#define DebugOldX NO +#undef ProfileOldX +#define ProfileOldX NO #endif + OLDXLIBSRC = $(LIBSRC)/oldX #if SharedOldX #ifndef SharedOldXRev @@ -3205,21 +3227,36 @@ ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) #endif +#if BuildXprintLib #ifndef SharedLibXp -#define SharedLibXp HasSharedLibraries +#define SharedLibXp HasSharedLibraries #endif #ifndef ExtraLibXp -#define ExtraLibXp SharedLibXp +#define ExtraLibXp SharedLibXp #endif #ifndef NormalLibXp -#define NormalLibXp (!SharedLibXp | ForceNormalLib) +#define NormalLibXp (!SharedLibXp || ForceNormalLib) #endif #ifndef DebugLibXp -#define DebugLibXp NO /* debugged Xp library */ +#define DebugLibXp BuildDebugLibraries #endif #ifndef ProfileLibXp -#define ProfileLibXp NO /* profiled Xp library */ +#define ProfileLibXp BuildProfileLibraries +#endif +#else +#undef SharedLibXp +#define SharedLibXp NO +#undef ExtraLibXp +#define ExtraLibXp NO +#undef NormalLibXp +#define NormalLibXp NO +#undef DebugLibXp +#define DebugLibXp NO +#undef ProfileLibXp +#define ProfileLibXp NO #endif + +#if BuildXprint XPLIBSRC = $(LIBSRC)/Xp #if SharedLibXp #ifndef SharedXpRev @@ -3229,22 +3266,37 @@ #else ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) #endif +#endif +#if BuildXtLib #ifndef SharedLibXt -#define SharedLibXt HasSharedLibraries +#define SharedLibXt HasSharedLibraries #endif #ifndef ExtraLibXt -#define ExtraLibXt SharedLibXt +#define ExtraLibXt SharedLibXt #endif #ifndef NormalLibXt -#define NormalLibXt (!SharedLibXt | ForceNormalLib) +#define NormalLibXt (!SharedLibXt || ForceNormalLib) #endif #ifndef DebugLibXt -#define DebugLibXt NO /* debugged toolkit library */ +#define DebugLibXt BuildDebugLibraries #endif #ifndef ProfileLibXt -#define ProfileLibXt NO /* profiled toolkit library */ +#define ProfileLibXt BuildProfileLibraries +#endif +#else +#undef SharedLibXt +#define SharedLibXt NO +#undef ExtraLibXt +#define ExtraLibXt NO +#undef NormalLibXt +#define NormalLibXt NO +#undef DebugLibXt +#define DebugLibXt NO +#undef ProfileLibXt +#define ProfileLibXt NO #endif + TOOLKITSRC = $(LIBSRC)/Xt #if SharedLibXt #ifndef SharedXtRev @@ -3258,21 +3310,35 @@ XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) LINTXTOOLLIB = $(LINTXTOOLONLYLIB) +#if BuildXawLib #ifndef SharedLibXaw -#define SharedLibXaw HasSharedLibraries +#define SharedLibXaw HasSharedLibraries #endif #ifndef ExtraLibXaw -#define ExtraLibXaw SharedLibXaw +#define ExtraLibXaw SharedLibXaw #endif #ifndef NormalLibXaw -#define NormalLibXaw (!SharedLibXaw | ForceNormalLib) +#define NormalLibXaw (!SharedLibXaw || ForceNormalLib) #endif #ifndef DebugLibXaw -#define DebugLibXaw NO /* debugged widget library */ +#define DebugLibXaw BuildDebugLibraries #endif #ifndef ProfileLibXaw -#define ProfileLibXaw NO /* profiled widget library */ +#define ProfileLibXaw BuildProfileLibraries +#endif +#else +#undef SharedLibXaw +#define SharedLibXaw NO +#undef ExtraLibXaw +#define ExtraLibXaw NO +#undef NormalLibXaw +#define NormalLibXaw NO +#undef DebugLibXaw +#define DebugLibXaw NO +#undef ProfileLibXaw +#define ProfileLibXaw NO #endif + AWIDGETSRC = $(LIBSRC)/Xaw #if SharedLibXaw #ifndef SharedXawRev @@ -3289,21 +3355,34 @@ #if BuildXaw6 #ifndef SharedLibXaw6 -#define SharedLibXaw6 HasSharedLibraries +#define SharedLibXaw6 HasSharedLibraries #endif #ifndef ExtraLibXaw6 -#define ExtraLibXaw6 SharedLibXaw6 +#define ExtraLibXaw6 SharedLibXaw6 #endif #ifndef NormalLibXaw6 #define NormalLibXaw6 NO #endif #ifndef DebugLibXaw6 -#define DebugLibXaw6 NO /* debugged widget library */ +#define DebugLibXaw6 NO #endif #ifndef ProfileLibXaw6 -#define ProfileLibXaw6 NO /* profiled widget library */ +#define ProfileLibXaw6 NO +#endif +#else +#undef SharedLibXaw6 +#define SharedLibXaw6 NO +#undef ExtraLibXaw6 +#define ExtraLibXaw6 NO +#undef NormalLibXaw6 +#define NormalLibXaw6 NO +#undef DebugLibXaw6 +#define DebugLibXaw6 NO +#undef ProfileLibXaw6 +#define ProfileLibXaw6 NO #endif - AWIDGET6SRC = $(LIBSRC)/Xaw6 + + AWIDGET6SRC = $(LIBSRC)/Xaw6 #if SharedLibXaw6 #ifndef SharedXaw6Rev #define SharedXaw6Rev 6.1 @@ -3312,23 +3391,37 @@ #else ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) #endif -#endif +#if BuildXInputLib #ifndef SharedLibXi -#define SharedLibXi HasSharedLibraries +#define SharedLibXi HasSharedLibraries #endif #ifndef ExtraLibXi -#define ExtraLibXi SharedLibXi +#define ExtraLibXi SharedLibXi #endif #ifndef NormalLibXi -#define NormalLibXi (!SharedLibXi | ForceNormalLib) +#define NormalLibXi (!SharedLibXi || ForceNormalLib) #endif #ifndef DebugLibXi -#define DebugLibXi NO /* debugged Xi library */ +#define DebugLibXi BuildDebugLibraries #endif #ifndef ProfileLibXi -#define ProfileLibXi NO /* profiled Xi library */ +#define ProfileLibXi BuildProfileLibraries +#endif +#else +#undef SharedLibXi +#define SharedLibXi NO +#undef ExtraLibXi +#define ExtraLibXi NO +#undef NormalLibXi +#define NormalLibXi NO +#undef DebugLibXi +#define DebugLibXi NO +#undef ProfileLibXi +#define ProfileLibXi NO #endif + +#if BuildXInputExt || BuildLibrariesForDmx XILIBSRC = $(LIBSRC)/Xi #if SharedLibXi #ifndef SharedXiRev @@ -3338,22 +3431,37 @@ #else ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) #endif +#endif +#if BuildXtstLib #ifndef SharedLibXtst -#define SharedLibXtst HasSharedLibraries +#define SharedLibXtst HasSharedLibraries #endif #ifndef ExtraLibXtst -#define ExtraLibXtst SharedLibXtst +#define ExtraLibXtst SharedLibXtst #endif #ifndef NormalLibXtst -#define NormalLibXtst (!SharedLibXtst | ForceNormalLib) +#define NormalLibXtst (!SharedLibXtst || ForceNormalLib) #endif #ifndef DebugLibXtst -#define DebugLibXtst NO /* debugged Xtst library */ +#define DebugLibXtst BuildDebugLibraries #endif #ifndef ProfileLibXtst -#define ProfileLibXtst NO /* profiled Xtst library */ +#define ProfileLibXtst BuildProfileLibraries +#endif +#else +#undef SharedLibXtst +#define SharedLibXtst NO +#undef ExtraLibXtst +#define ExtraLibXtst NO +#undef NormalLibXtst +#define NormalLibXtst NO +#undef DebugLibXtst +#define DebugLibXtst NO +#undef ProfileLibXtst +#define ProfileLibXtst NO #endif + XTESTLIBSRC = $(LIBSRC)/Xtst #if SharedLibXtst #ifndef SharedXtstRev @@ -3366,21 +3474,35 @@ ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) +#if BuildICELib #ifndef SharedLibICE -#define SharedLibICE HasSharedLibraries +#define SharedLibICE HasSharedLibraries #endif #ifndef ExtraLibICE -#define ExtraLibICE SharedLibICE +#define ExtraLibICE SharedLibICE #endif #ifndef NormalLibICE -#define NormalLibICE (!SharedLibICE | ForceNormalLib) +#define NormalLibICE (!SharedLibICE || ForceNormalLib) #endif #ifndef DebugLibICE -#define DebugLibICE NO /* debugged ICE library */ +#define DebugLibICE BuildDebugLibraries #endif #ifndef ProfileLibICE -#define ProfileLibICE NO /* profiled ICE library */ +#define ProfileLibICE BuildProfileLibraries +#endif +#else +#undef SharedLibICE +#define SharedLibICE NO +#undef ExtraLibICE +#define ExtraLibICE NO +#undef NormalLibICE +#define NormalLibICE NO +#undef DebugLibICE +#define DebugLibICE NO +#undef ProfileLibICE +#define ProfileLibICE NO #endif + ICESRC = $(LIBSRC)/ICE #if SharedLibICE #ifndef SharedICERev @@ -3391,21 +3513,35 @@ ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) #endif +#if BuildSMLib #ifndef SharedLibSM -#define SharedLibSM HasSharedLibraries +#define SharedLibSM HasSharedLibraries #endif #ifndef ExtraLibSM -#define ExtraLibSM SharedLibSM +#define ExtraLibSM SharedLibSM #endif #ifndef NormalLibSM -#define NormalLibSM (!SharedLibSM | ForceNormalLib) +#define NormalLibSM (!SharedLibSM || ForceNormalLib) #endif #ifndef DebugLibSM -#define DebugLibSM NO /* debugged SM library */ +#define DebugLibSM BuildDebugLibraries #endif #ifndef ProfileLibSM -#define ProfileLibSM NO /* profiled SM library */ +#define ProfileLibSM BuildProfileLibraries #endif +#else +#undef SharedLibSM +#define SharedLibSM NO +#undef ExtraLibSM +#define ExtraLibSM NO +#undef NormalLibSM +#define NormalLibSM NO +#undef DebugLibSM +#define DebugLibSM NO +#undef ProfileLibSM +#define ProfileLibSM NO +#endif + SMSRC = $(LIBSRC)/SM #if SharedLibSM #ifndef SharedSMRev @@ -3416,31 +3552,7 @@ ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) #endif -#ifndef SharedLibXkey -#define SharedLibXkey HasSharedLibraries -#endif -#ifndef ExtraLibXkey -#define ExtraLibXkey SharedLibXkey -#endif -#ifndef NormalLibXkey -#define NormalLibXkey (!SharedLibXkey | ForceNormalLib) -#endif -#ifndef DebugLibXkey -#define DebugLibXkey NO /* debugged Xkey library */ -#endif -#ifndef ProfileLibXkey -#define ProfileLibXkey NO /* profiled Xkey library */ -#endif - XKEYSRC = $(LIBSRC)/Xkey -#if SharedLibXkey -#ifndef SharedXkeyRev -#define SharedXkeyRev 6.0 -#endif -SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) -#else -ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) -#endif - +#if BuildFSLib #ifndef SharedLibFS #define SharedLibFS HasSharedLibraries #endif @@ -3448,14 +3560,27 @@ #define ExtraLibFS SharedLibFS #endif #ifndef NormalLibFS -#define NormalLibFS (!SharedLibFS | ForceNormalLib) +#define NormalLibFS (!SharedLibFS || ForceNormalLib) #endif #ifndef DebugLibFS -#define DebugLibFS NO /* debugged FS library */ +#define DebugLibFS BuildDebugLibraries #endif #ifndef ProfileLibFS -#define ProfileLibFS NO /* profiled FS library */ +#define ProfileLibFS BuildProfileLibraries #endif +#else +#undef SharedLibFS +#define SharedLibFS NO +#undef ExtraLibFS +#define ExtraLibFS NO +#undef NormalLibFS +#define NormalLibFS NO +#undef DebugLibFS +#define DebugLibFS NO +#undef ProfileLibFS +#define ProfileLibFS NO +#endif + FSLIBSRC = $(LIBSRC)/FS #if SharedLibFS #ifndef SharedFSRev @@ -3466,22 +3591,37 @@ ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) #endif +#if BuildServer || BuildClients || BuildLibraries || BuildFontLib #ifndef SharedLibFont -#define SharedLibFont HasSharedLibraries +#define SharedLibFont HasSharedLibraries #endif #ifndef ExtraLibFont -#define ExtraLibFont SharedLibFont +#define ExtraLibFont SharedLibFont #endif #ifndef NormalLibFont -#define NormalLibFont (!SharedLibFont | ForceNormalLib | XserverStaticFontLib) +#define NormalLibFont (!SharedLibFont || ForceNormalLib || \ + XserverStaticFontLib) #endif #ifndef DebugLibFont -#define DebugLibFont NO /* debugged Font library */ +#define DebugLibFont BuildDebugLibraries #endif #ifndef ProfileLibFont -#define ProfileLibFont NO /* profiled Font library */ +#define ProfileLibFont BuildProfileLibraries +#endif +#else +#undef SharedLibFont +#define SharedLibFont NO +#undef ExtraLibFont +#define ExtraLibFont NO +#undef NormalLibFont +#define NormalLibFont NO +#undef DebugLibFont +#define DebugLibFont NO +#undef ProfileLibFont +#define ProfileLibFont NO #endif - FONTLIBSRC = $(LIBSRC)/font + + FONTLIBSRC = $(LIBSRC)/font #if SharedLibFont #ifndef SharedFontRev #define SharedFontRev 1.5 @@ -3493,12 +3633,12 @@ XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir) #endif - FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs + FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) - DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) - + DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) +#if BuildFontEncLib || BuildServer #ifndef SharedLibFontEnc #define SharedLibFontEnc HasSharedLibraries #endif @@ -3506,15 +3646,28 @@ #define ExtraLibFontEnc SharedLibFontEnc #endif #ifndef NormalLibFontEnc -#define NormalLibFontEnc (!SharedLibFontEnc | ForceNormalLib) +#define NormalLibFontEnc (!SharedLibFontEnc || ForceNormalLib) #endif #ifndef DebugLibFontEnc -#define DebugLibFontEnc NO /* debugged fontenc library */ +#define DebugLibFontEnc BuildDebugLibraries #endif #ifndef ProfileLibFontEnc -#define ProfileLibFontEnc NO /* profiled fontenc library */ +#define ProfileLibFontEnc BuildProfileLibraries +#endif +#else +#undef SharedLibFontEnc +#define SharedLibFontEnc NO +#undef ExtraLibFontEnc +#define ExtraLibFontEnc NO +#undef NormalLibFontEnc +#define NormalLibFontEnc NO +#undef DebugLibFontEnc +#define DebugLibFontEnc NO +#undef ProfileLibFontEnc +#define ProfileLibFontEnc NO #endif - FONTENCLIBSRC = $(LIBSRC)/fontenc + + FONTENCLIBSRC = $(LIBSRC)/fontenc #if SharedLibFontEnc #ifndef SharedFontEncRev #define SharedFontEncRev 1.0 @@ -3524,22 +3677,36 @@ ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) #endif +#if BuildXpmLib #ifndef SharedLibXpm -#define SharedLibXpm HasSharedLibraries +#define SharedLibXpm HasSharedLibraries #endif #ifndef ExtraLibXpm -#define ExtraLibXpm SharedLibXpm +#define ExtraLibXpm SharedLibXpm #endif #ifndef NormalLibXpm -#define NormalLibXpm (!SharedLibXpm | ForceNormalLib) +#define NormalLibXpm (!SharedLibXpm || ForceNormalLib) #endif #ifndef DebugLibXpm -#define DebugLibXpm NO +#define DebugLibXpm BuildDebugLibraries #endif #ifndef ProfileLibXpm +#define ProfileLibXpm BuildProfileLibraries +#endif +#else +#undef SharedLibXpm +#define SharedLibXpm NO +#undef ExtraLibXpm +#define ExtraLibXpm NO +#undef NormalLibXpm +#define NormalLibXpm NO +#undef DebugLibXpm +#define DebugLibXpm NO +#undef ProfileLibXpm #define ProfileLibXpm NO #endif - XPMLIBSRC = $(LIBSRC)/Xpm + + XPMLIBSRC = $(LIBSRC)/Xpm #if SharedLibXpm #ifndef SharedXpmRev #define SharedXpmRev 4.11 @@ -3552,21 +3719,21 @@ #if BuildFreetype2Library #ifndef SharedLibFreetype2 -#define SharedLibFreetype2 HasSharedLibraries +#define SharedLibFreetype2 HasSharedLibraries #endif #ifndef ExtraLibFreetype2 -#define ExtraLibFreetype2 SharedLibFreetype2 +#define ExtraLibFreetype2 SharedLibFreetype2 #endif #ifndef NormalLibFreetype2 -#define NormalLibFreetype2 (!SharedLibFreetype2 | ForceNormalLib) +#define NormalLibFreetype2 (!SharedLibFreetype2 || ForceNormalLib) #endif #ifndef DebugLibFreetype2 -#define DebugLibFreetype2 NO +#define DebugLibFreetype2 BuildDebugLibraries #endif #ifndef ProfileLibFreetype2 -#define ProfileLibFreetype2 NO +#define ProfileLibFreetype2 BuildProfileLibraries #endif - FREETYPE2LIBSRC = $(LIBSRC)/freetype2 + FREETYPE2LIBSRC = $(LIBSRC)/freetype2 /* * FreeType 2.1.8 @@ -3581,7 +3748,7 @@ * Freetype2Version should be set to "current.revision.age" */ #ifndef Freetype2Version -#define Freetype2Version 9.6.3 +#define Freetype2Version 9.6.3 #endif #if SharedLibFreetype2 @@ -3590,9 +3757,9 @@ #endif #ifndef SharedFreetype2Rev #if LibtoolMinorVersions -#define SharedFreetype2Rev 6.3 +#define SharedFreetype2Rev 6.3 #else -#define SharedFreetype2Rev 9.0 +#define SharedFreetype2Rev 9.0 #endif #endif SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) @@ -3601,9 +3768,9 @@ #endif #ifdef UseInstalled -FREETYPE2INCDIR=$(INCDIR) + FREETYPE2INCDIR = $(INCDIR) #else -FREETYPE2INCDIR=$(BUILDINCDIR) + FREETYPE2INCDIR = $(BUILDINCDIR) #endif #endif /* BuildFreetype2Library */ @@ -3638,13 +3805,13 @@ # endif #endif -FREETYPE2DIR = Freetype2Dir -FREETYPE2LIBDIR = Freetype2LibDir -FREETYPE2INCDIR = Freetype2IncDir + FREETYPE2DIR = Freetype2Dir + FREETYPE2LIBDIR = Freetype2LibDir + FREETYPE2INCDIR = Freetype2IncDir #if Freetype2LibDirStandard -FREETYPE2LIB = -lfreetype + FREETYPE2LIB = -lfreetype #else -FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype + FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype #endif #endif /* HasFreetype2 && !BuildFreetype2Library */ @@ -3659,27 +3826,27 @@ #else FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 #endif -FREETYPE2DEFINES = -DFREETYPE2 + FREETYPE2DEFINES = -DFREETYPE2 #endif #endif /* UseFreetype2 */ #ifndef SharedLibExpat -#define SharedLibExpat HasSharedLibraries +#define SharedLibExpat HasSharedLibraries #endif #ifndef ExtraLibExpat -#define ExtraLibExpat SharedLibExpat +#define ExtraLibExpat SharedLibExpat #endif #ifndef NormalLibExpat -#define NormalLibExpat (!SharedLibExpat | ForceNormalLib) +#define NormalLibExpat (!SharedLibExpat || ForceNormalLib) #endif #ifndef DebugLibExpat -#define DebugLibExpat NO +#define DebugLibExpat BuildDebugLibraries #endif #ifndef ProfileLibExpat -#define ProfileLibExpat NO +#define ProfileLibExpat BuildProfileLibraries #endif - EXPATLIBSRC = $(LIBSRC)/expat + EXPATLIBSRC = $(LIBSRC)/expat /* * Expat 1.95.6. @@ -3693,7 +3860,7 @@ * The !LibtoolMinorVersions revision is "LIBCURRENT.0". */ #ifndef ExpatVersion -#define ExpatVersion 1.95.6 +#define ExpatVersion 1.95.6 #endif #if SharedLibExpat @@ -3702,9 +3869,9 @@ #endif #ifndef SharedExpatRev #if LibtoolMinorVersions -#define SharedExpatRev 0.4 +#define SharedExpatRev 0.4 #else -#define SharedExpatRev 4.0 +#define SharedExpatRev 4.0 #endif #endif SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) @@ -3715,8 +3882,8 @@ #if UseExpat #if BuildExpatLibrary -EXPATINCLUDES=$(TOP_X_INCLUDES) -EXPATDEFINES=-DEXPAT + EXPATINCLUDES = $(TOP_X_INCLUDES) + EXPATDEFINES = -DEXPAT #else /* BuildExpatLibrary */ #if HasExpat @@ -3749,20 +3916,20 @@ #define ExpatIncDirStandard NO #endif -EXPATDIR = ExpatDir -EXPATLIBDIR = ExpatLibDir -EXPATINCDIR = ExpatIncDir + EXPATDIR = ExpatDir + EXPATLIBDIR = ExpatLibDir + EXPATINCDIR = ExpatIncDir #if ExpatIncDirStandard -EXPATINCLUDES = + EXPATINCLUDES = #else -EXPATINCLUDES = -I$(EXPATINCDIR) + EXPATINCLUDES = -I$(EXPATINCDIR) #endif #if ExpatLibDirStandard -EXPATLIB = -lexpat + EXPATLIB = -lexpat #else -EXPATLIB = -L$(EXPATLIBDIR) -lexpat + EXPATLIB = -L$(EXPATLIBDIR) -lexpat #endif -EXPATDEFINES = -DEXPAT + EXPATDEFINES = -DEXPAT #endif /* HasExpat */ #endif /* else BuildExpatLibrary */ @@ -3772,11 +3939,12 @@ #endif /* UseExpat */ +#if BuildXft1Library #ifndef SharedLibXft1 -#define SharedLibXft1 HasSharedLibraries +#define SharedLibXft1 HasSharedLibraries #endif #ifndef ExtraLibXft1 -#define ExtraLibXft1 SharedLibXft1 +#define ExtraLibXft1 SharedLibXft1 #endif #ifndef NormalLibXft1 #define NormalLibXft1 NO @@ -3787,7 +3955,21 @@ #ifndef ProfileLibXft1 #define ProfileLibXft1 NO #endif - XFT1LIBSRC = $(LIBSRC)/Xft1 +#else +#undef SharedLibXft1 +#define SharedLibXft1 NO +#undef ExtraLibXft1 +#define ExtraLibXft1 NO +#undef NormalLibXft1 +#define NormalLibXft1 NO +#undef DebugLibXft1 +#define DebugLibXft1 NO +#undef ProfileLibXft1 +#define ProfileLibXft1 NO +#endif + +#if BuildRender + XFT1LIBSRC = $(LIBSRC)/Xft1 #if SharedLibXft1 #ifndef SharedXft1Rev #define SharedXft1Rev 1.1 @@ -3796,6 +3978,7 @@ #else ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) #endif +#endif #ifndef Xft1ClientDepLibs #if UseFreetype2 @@ -3812,22 +3995,37 @@ #endif #endif +#if BuildXftLibrary #ifndef SharedLibXft -#define SharedLibXft HasSharedLibraries +#define SharedLibXft HasSharedLibraries #endif #ifndef ExtraLibXft -#define ExtraLibXft SharedLibXft +#define ExtraLibXft SharedLibXft #endif #ifndef NormalLibXft -#define NormalLibXft (!SharedLibXft | ForceNormalLib) +#define NormalLibXft (!SharedLibXft || ForceNormalLib) #endif #ifndef DebugLibXft -#define DebugLibXft NO +#define DebugLibXft BuildDebugLibraries #endif #ifndef ProfileLibXft +#define ProfileLibXft BuildProfileLibraries +#endif +#else +#undef SharedLibXft +#define SharedLibXft NO +#undef ExtraLibXft +#define ExtraLibXft NO +#undef NormalLibXft +#define NormalLibXft NO +#undef DebugLibXft +#define DebugLibXft NO +#undef ProfileLibXft #define ProfileLibXft NO #endif - XFTLIBSRC = $(LIBSRC)/Xft + +#if BuildRender + XFTLIBSRC = $(LIBSRC)/Xft #if SharedLibXft #ifndef SharedXftRev #define SharedXftRev 2.1 @@ -3836,6 +4034,7 @@ #else ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) #endif +#endif #ifndef XftClientDepLibs #define XftClientDepLibs $(DEPXFTLIB) FontconfigClientDepLibs $(DEPXRENDERLIB) @@ -3846,22 +4045,22 @@ #if BuildFontconfigLibrary #ifndef SharedLibFontconfig -#define SharedLibFontconfig HasSharedLibraries +#define SharedLibFontconfig HasSharedLibraries #endif #ifndef ExtraLibFontconfig -#define ExtraLibFontconfig SharedLibFontconfig +#define ExtraLibFontconfig SharedLibFontconfig #endif #ifndef NormalLibFontconfig -#define NormalLibFontconfig (!SharedLibFontconfig | ForceNormalLib) +#define NormalLibFontconfig (!SharedLibFontconfig || ForceNormalLib) #endif #ifndef DebugLibFontconfig -#define DebugLibFontconfig NO +#define DebugLibFontconfig BuildDebugLibraries #endif #ifndef ProfileLibFontconfig -#define ProfileLibFontconfig NO +#define ProfileLibFontconfig BuildProfileLibraries #endif - FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig + FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig #if SharedLibFontconfig #ifndef SharedFontconfigRev #define SharedFontconfigRev 1.0 @@ -3872,22 +4071,22 @@ #endif #ifdef UseInstalled -FONTCONFIGINCDIR=$(INCDIR) + FONTCONFIGINCDIR = $(INCDIR) #else -FONTCONFIGINCDIR=$(BUILDINCDIR) + FONTCONFIGINCDIR = $(BUILDINCDIR) #endif FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) #if UseInstalledX11 -FCCACHE = $(BINDIR)/fc-cache + FCCACHE = $(BINDIR)/fc-cache #else -FCCACHE = set -x; $(CLIENTENVSETUP) $(PRELOADXFTSETUP) FONTCONFIG_PATH=$(FONTCONFIGLIBSRC) $(XBUILDBINDIR)/fc-cache + FCCACHE = set -x; $(CLIENTENVSETUP) $(PRELOADXFTSETUP) FONTCONFIG_PATH=$(FONTCONFIGLIBSRC) $(XBUILDBINDIR)/fc-cache #endif #endif /* BuildFontconfigLibrary */ -FCCACHEOPTS = -f -v + FCCACHEOPTS = -f -v #if UseFontconfig #if HasFontconfig && !BuildFontconfigLibrary @@ -3928,14 +4127,14 @@ # define FontconfigIncDirStandard NO #endif -FONTCONFIGDIR = FontconfigDir -FONTCONFIGLIBDIR = FontconfigLibDir -FONTCONFIGINCDIR = FontconfigIncDir -FONTCONFIGBINDIR = FontconfigBinDir + FONTCONFIGDIR = FontconfigDir + FONTCONFIGLIBDIR = FontconfigLibDir + FONTCONFIGINCDIR = FontconfigIncDir + FONTCONFIGBINDIR = FontconfigBinDir #if FontconfigLibDirStandard -FONTCONFIGLIB = -lfontconfig + FONTCONFIGLIB = -lfontconfig #else -FONTCONFIGLIB = -L$(FONTCONFIGLIBDIR) -lfontconfig + FONTCONFIGLIB = -L$(FONTCONFIGLIBDIR) -lfontconfig #endif #if FontconfigIncDirStandard @@ -3944,7 +4143,7 @@ FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) #endif -FCCACHE = $(FONTCONFIGBINDIR)/fc-cache + FCCACHE = $(FONTCONFIGBINDIR)/fc-cache #endif /* HasFontconfig && !BuildFontconfigLibrary */ @@ -3961,7 +4160,7 @@ #endif /* UseFontconfig */ -XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) + XFTINCLUDES = $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) #if defined(HasLibpng) && HasLibpng @@ -4012,19 +4211,19 @@ #define LibpngIncDirStandard NO #endif -LIBPNGINCDIR = LibpngIncDir + LIBPNGINCDIR = LibpngIncDir #if LibpngIncDirStandard -LIBPNGINC= + LIBPNGINC = #else -LIBPNGINC = -I$(LIBPNGINCDIR) + LIBPNGINC = -I$(LIBPNGINCDIR) #endif -LIBPNGDIR = LibpngDir -LIBPNGLIBDIR = LibpngLibDir -LIBPNGINCDIR = LibpngIncDir + LIBPNGDIR = LibpngDir + LIBPNGLIBDIR = LibpngLibDir + LIBPNGINCDIR = LibpngIncDir #if LibpngLibDirStandard -LIBPNGLIB = -lpng + LIBPNGLIB = -lpng #else -LIBPNGLIB = -L$(LIBPNGLIBDIR) -lpng + LIBPNGLIB = -L$(LIBPNGLIBDIR) -lpng #endif #endif @@ -4041,38 +4240,35 @@ #endif #if BuildXKBlib -# ifndef SharedLibxkbfile -# define SharedLibxkbfile HasSharedLibraries -# endif -# ifndef ExtraLibxkbfile -# define ExtraLibxkbfile SharedLibxkbfile -# endif -# ifndef NormalLibxkbfile -# define NormalLibxkbfile (!SharedLibxkbfile | ForceNormalLib) -# endif -# ifndef DebugLibxkbfile -# define DebugLibxkbfile NO -# endif -# ifndef ProfileLibxkbfile -# define ProfileLibxkbfile NO -# endif -#else -# ifndef SharedLibxkbfile -# define SharedLibxkbfile NO -# endif -# ifndef ExtraLibxkbfile -# define ExtraLibxkbfile NO -# endif -# ifndef NormalLibxkbfile -# define NormalLibxkbfile NO -# endif -# ifndef DebugLibxkbfile -# define DebugLibxkbfile NO -# endif -# ifndef ProfileLibxkbfile -# define ProfileLibxkbfile NO -# endif +#ifndef SharedLibxkbfile +#define SharedLibxkbfile HasSharedLibraries +#endif +#ifndef ExtraLibxkbfile +#define ExtraLibxkbfile SharedLibxkbfile +#endif +#ifndef NormalLibxkbfile +#define NormalLibxkbfile (!SharedLibxkbfile || ForceNormalLib) +#endif +#ifndef DebugLibxkbfile +#define DebugLibxkbfile BuildDebugLibraries +#endif +#ifndef ProfileLibxkbfile +#define ProfileLibxkbfile BuildProfileLibraries +#endif +#else +#undef SharedLibxkbfile +#define SharedLibxkbfile NO +#undef ExtraLibxkbfile +#define ExtraLibxkbfile NO +#undef NormalLibxkbfile +#define NormalLibxkbfile NO +#undef DebugLibxkbfile +#define DebugLibxkbfile NO +#undef ProfileLibxkbfile +#define ProfileLibxkbfile NO #endif + +#if BuildXKB XKBFILELIBSRC = $(LIBSRC)/xkbfile #if SharedLibxkbfile # ifndef SharedxkbfileRev @@ -4082,6 +4278,7 @@ #else ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) #endif +#endif #if BuildXKBlib # ifndef XkbClientDepLibs @@ -4100,13 +4297,13 @@ # endif # if defined(UseInstalled) || (CrossCompiling && UseInstalledOnCrossCompile) - XKBCOMPCMD = $(BINDIR)/XkbComp + XKBCOMPCMD = $(BINDIR)/XkbComp # else - XKBCOMPSRC = $(PROGRAMSRC)/XkbComp + XKBCOMPSRC = $(PROGRAMSRC)/XkbComp # if CrossCompiling - XKBCOMPCMD = $(PROGRAMSRC)/XkbComp/cross/XkbComp + XKBCOMPCMD = $(PROGRAMSRC)/XkbComp/cross/XkbComp # else - XKBCOMPCMD = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/XkbComp + XKBCOMPCMD = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/XkbComp # endif # endif #else /* !BuildXKBlib */ @@ -4119,36 +4316,34 @@ #endif /* BuildXKBlib */ #if BuildXKBlib -# ifndef SharedLibxkbui -# define SharedLibxkbui HasSharedLibraries -# endif -# ifndef ExtraLibxkbui -# define ExtraLibxkbui SharedLibxkbui -# endif -# ifndef NormalLibxkbui -# define NormalLibxkbui (!SharedLibxkbui || ForceNormalLib) -# endif -# ifndef DebugLibxkbui -# define DebugLibxkbui NO -# endif -# ifndef ProfileLibxkbui -# define ProfileLibxkbui NO -# endif -#else -# ifndef SharedLibxkbui -# define SharedLibxkbui NO -# endif -# ifndef NormalLibxkbui -# define NormalLibxkbui NO -# endif -# ifndef DebugLibxkbui -# define DebugLibxkbui NO -# endif -# ifndef ProfileLibxkbui -# define ProfileLibxkbui NO -# endif +#ifndef SharedLibxkbui +#define SharedLibxkbui HasSharedLibraries +#endif +#ifndef ExtraLibxkbui +#define ExtraLibxkbui SharedLibxkbui +#endif +#ifndef NormalLibxkbui +#define NormalLibxkbui (!SharedLibxkbui || ForceNormalLib) +#endif +#ifndef DebugLibxkbui +#define DebugLibxkbui BuildDebugLibraries +#endif +#ifndef ProfileLibxkbui +#define ProfileLibxkbui BuildProfileLibraries +#endif +#else +#undef SharedLibxkbui +#define SharedLibxkbui NO +#undef NormalLibxkbui +#define NormalLibxkbui NO +#undef DebugLibxkbui +#define DebugLibxkbui NO +#undef ProfileLibxkbui +#define ProfileLibxkbui NO #endif - XKBUILIBSRC = $(LIBSRC)/xkbui + +#if BuildXKB + XKBUILIBSRC = $(LIBSRC)/xkbui #if SharedLibxkbui # ifndef SharedxkbuiRev # define SharedxkbuiRev 1.0 @@ -4157,6 +4352,7 @@ #else ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) #endif +#endif #ifndef XkbuiLibs # define XkbuiLibs $(XKBUILIB) @@ -4172,22 +4368,37 @@ #define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #endif +#if BuildXTrapLibrary #ifndef SharedLibXTrap -#define SharedLibXTrap HasSharedLibraries +#define SharedLibXTrap HasSharedLibraries #endif #ifndef ExtraLibXTrap -#define ExtraLibXTrap SharedLibXTrap +#define ExtraLibXTrap SharedLibXTrap #endif #ifndef NormalLibXTrap -#define NormalLibXTrap (!SharedLibXTrap | ForceNormalLib) +#define NormalLibXTrap (!SharedLibXTrap | ForceNormalLib) #endif #ifndef DebugLibXTrap -#define DebugLibXTrap NO /* debugged XTrap library */ +#define DebugLibXTrap BuildDebugLibraries #endif #ifndef ProfileLibXTrap -#define ProfileLibXTrap NO /* profiled XTrap library */ +#define ProfileLibXTrap BuildProfileLibraries +#endif +#else +#undef SharedLibXTrap +#define SharedLibXTrap NO +#undef ExtraLibXTrap +#define ExtraLibXTrap NO +#undef NormalLibXTrap +#define NormalLibXTrap NO +#undef DebugLibXTrap +#define DebugLibXTrap NO +#undef ProfileLibXTrap +#define ProfileLibXTrap NO #endif - XTRAPLIBSRC = $(LIBSRC)/XTrap + +#if BuildXTrap + XTRAPLIBSRC = $(LIBSRC)/XTrap #if SharedLibXTrap #ifndef SharedXTrapRev #define SharedXTrapRev 6.4 @@ -4196,6 +4407,55 @@ #else ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir) #endif +#endif + +#ifndef RefThreads +#define RefThreads (BuildGLXLibrary || BuildOSMesaLib || \ + BuildX11Lib || BuildXtLib) +#endif +#ifndef BuildThreadStubLibrary +#define BuildThreadStubLibrary (NeedThreadStubLibrary && \ + (BuildLibraries || RefThreads)) +#endif + +#if BuildThreadStubLibrary +#ifndef SharedLibXThrStub +#define SharedLibXThrStub HasSharedLibraries +#endif +#ifndef ExtraLibXThrStub +#define ExtraLibXThrStub SharedLibXThrStub +#endif +#ifndef NormalLibXThrStub +#define NormalLibXThrStub (!SharedLibXThrStub || ForceNormalLib) +#endif +#ifndef DebugLibXThrStub +#define DebugLibXThrStub BuildDebugLibraries +#endif +#ifndef ProfileLibXThrStub +#define ProfileLibXThrStub BuildProfileLibraries +#endif + + XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub +#if SharedLibXThrStub +#ifndef SharedXThrStubRev +#define SharedXThrStubRev 6.1 +#endif +SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev) +#else +ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) +#endif +#else +#undef SharedLibXThrStub +#define SharedLibXThrStub NO +#undef ExtraLibXThrStub +#define ExtraLibXThrStub NO +#undef NormalLibXThrStub +#define NormalLibXThrStub NO +#undef DebugLibXThrStub +#define DebugLibXThrStub NO +#undef ProfileLibXThrStub +#define ProfileLibXThrStub NO +#endif #ifndef NeedDefaultDepLibs #define NeedDefaultDepLibs YES @@ -4210,7 +4470,7 @@ #else DEPLIBS = $(LOCAL_LIBRARIES) #endif - DEPLIBS1 = $(DEPLIBS) + DEPLIBS2 = $(DEPLIBS) DEPLIBS3 = $(DEPLIBS) DEPLIBS4 = $(DEPLIBS) @@ -4219,7 +4479,7 @@ DEPLIBS7 = $(DEPLIBS) DEPLIBS8 = $(DEPLIBS) DEPLIBS9 = $(DEPLIBS) - DEPLIBS10 = $(DEPLIBS) + DEPLIBS10 = $(DEPLIBS) #endif /* NeedDefaultDepLibs */ Index: xc/config/cf/bsdLib.rules diff -u xc/config/cf/bsdLib.rules:3.36 xc/config/cf/bsdLib.rules:3.37 --- xc/config/cf/bsdLib.rules:3.36 Mon May 31 20:16:53 2004 +++ xc/config/cf/bsdLib.rules Mon Nov 27 16:02:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.36 2004/06/01 00:16:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.37 2006/11/27 21:02:23 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -360,7 +360,7 @@ #define SharedLibraryTarget(libname,rev,solist,down,up) @@\ AllTarget(Concat($(LIBPREFIX),libname.so.rev)) @@\ @@\ -Concat($(LIBPREFIX),libname.so.rev): solist @@\ +Concat($(LIBPREFIX),libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ @SetSonameRev(rev); \ @@\ SONAME=Concat($(LIBPREFIX),libname.so.$$S); \ @@\ @@ -389,7 +389,7 @@ #define SharedLibtoolLibraryTarget(libname,rev,solist,down,up) @@\ AllTarget(Concat($(LIBPREFIX),libname.so)) @@\ @@\ -Concat($(LIBPREFIX),libname.so): solist @@\ +Concat($(LIBPREFIX),libname.so): solist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ @set +e; SetRevisions(rev); \ @@\ SONAME=$@.$$REV; \ @@\ @@ -423,7 +423,7 @@ #define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ AllTarget(Concat($(LIBPREFIX),libname.so.rev)) @@\ @@\ -Concat($(LIBPREFIX),libname.so.rev): deplist @@\ +Concat($(LIBPREFIX),libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ @SetSonameRev(rev); \ @@\ SONAME=Concat($(LIBPREFIX),libname.so.$$S); \ @@\ @@ -455,7 +455,7 @@ #define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\ AllTarget(Concat($(LIBPREFIX),libname.so.rev)) @@\ @@\ -Concat($(LIBPREFIX),libname.so.rev): deplist @@\ +Concat($(LIBPREFIX),libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ @SetSonameRev(rev); \ @@\ SONAME=Concat($(LIBPREFIX),libname.so.$$S); \ @@\ Index: xc/config/cf/bsdLib.tmpl diff -u xc/config/cf/bsdLib.tmpl:3.25 xc/config/cf/bsdLib.tmpl:3.26 --- xc/config/cf/bsdLib.tmpl:3.25 Mon Jan 9 09:56:13 2006 +++ xc/config/cf/bsdLib.tmpl Sun Jul 23 16:51:48 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.25 2006/01/09 14:56:13 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.26 2006/07/23 20:51:48 tsi Exp $ /* * NetBSD/FreeBSD/OpenBSD shared library template @@ -72,7 +72,7 @@ #define SharedGLReqs $(LDPRELIBS) $(XLIB) #endif #ifndef SharedGLUReqs -#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) +#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) $(XLIB) #endif #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) Index: xc/config/cf/bsdi.cf diff -u xc/config/cf/bsdi.cf:3.41 xc/config/cf/bsdi.cf:3.42 --- xc/config/cf/bsdi.cf:3.41 Tue Jul 5 12:43:54 2005 +++ xc/config/cf/bsdi.cf Sun Jul 23 16:51:48 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.41 2005/07/05 16:43:54 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.42 2006/07/23 20:51:48 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -84,7 +84,8 @@ #define Krb5Libraries -lkrb5 -lk5crypto -lprofile -lcom_err #endif -#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++ +#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) -lstdc++ #if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4) #define HasNCurses YES Index: xc/config/cf/bsdiLib.rules diff -u xc/config/cf/bsdiLib.rules:3.9 xc/config/cf/bsdiLib.rules:3.10 --- xc/config/cf/bsdiLib.rules:3.9 Mon May 31 20:16:53 2004 +++ xc/config/cf/bsdiLib.rules Mon Nov 27 16:02:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.9 2004/06/01 00:16:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.10 2006/11/27 21:02:23 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -121,7 +121,7 @@ #define SharedLibraryTarget(libname,rev,solist,down,up) @@\ AllTarget(Concat($(LIBPREFIX),libname.so.rev)) @@\ @@\ -Concat($(LIBPREFIX),libname.so.rev): solist @@\ +Concat($(LIBPREFIX),libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ @SetSonameRev(rev); \ @@\ SONAME=Concat($(LIBPREFIX),libname.so.$$S); \ @@\ @@ -156,7 +156,7 @@ #define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ AllTarget(Concat($(LIBPREFIX),libname.so.rev)) @@\ @@\ -Concat($(LIBPREFIX),libname.so.rev): deplist @@\ +Concat($(LIBPREFIX),libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ @SetSonameRev(rev); \ @@\ SONAME=Concat($(LIBPREFIX),libname.so.$$S); \ @@\ Index: xc/config/cf/cygwin.cf diff -u xc/config/cf/cygwin.cf:3.63 xc/config/cf/cygwin.cf:3.64 --- xc/config/cf/cygwin.cf:3.63 Sun Feb 19 10:51:12 2006 +++ xc/config/cf/cygwin.cf Tue May 16 10:01:21 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.63 2006/02/19 15:51:12 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.64 2006/05/16 14:01:21 tsi Exp $ #ifndef OSName # define OSName Cygwin @@ -301,7 +301,6 @@ #define BuildXCSecurity YES #define BuildAppgroup YES #define BuildShapeExt YES -#define BuildScanpci NO /* No direct access to hardware */ #define BuildScreenSaverExt NO Index: xc/config/cf/cygwin.tmpl diff -u xc/config/cf/cygwin.tmpl:3.20 xc/config/cf/cygwin.tmpl:3.21 --- xc/config/cf/cygwin.tmpl:3.20 Tue Jul 5 12:43:54 2005 +++ xc/config/cf/cygwin.tmpl Sun Jul 23 16:51:48 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.20 2005/07/05 16:43:54 tsi Exp $ +XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.21 2006/07/23 20:51:48 tsi Exp $ #if UseCygIPC # define SharedX11Reqs -lcygipc @@ -19,7 +19,7 @@ #define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(XLIB) #define SharedXvReqs $(LDPRELIB) $(XLIB) #define SharedGLReqs $(LDPRELIB) $(XLIB) -#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) +#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) $(XLIB) #define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) #define SharedFontencReqs $(LDPRELIB) GzipLibrary #define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) Index: xc/config/cf/darwin.cf diff -u xc/config/cf/darwin.cf:1.54 xc/config/cf/darwin.cf:1.59 --- xc/config/cf/darwin.cf:1.54 Wed Sep 14 10:23:13 2005 +++ xc/config/cf/darwin.cf Tue May 22 16:50:12 2007 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.54 2005/09/14 14:23:13 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.59 2007/05/22 20:50:12 tsi Exp $ /* Darwin / Mac OS X configuration by John Carmack */ @@ -53,6 +53,16 @@ #ifndef HasGcc4 # define HasGcc4 NO #endif +#if OSMajorVersion >= 7 +#define HasPam YES +#ifndef PamLibraries +#define PamLibraries -lpam +#endif + +#ifndef PamMiscLibraries +#define PamMiscLibraries -lpam_misc +#endif +#endif /* Older versions don't really support IPv6, but #define AF_INET6. */ #if OSMajorVersion < 6 @@ -158,27 +168,45 @@ /* * Our cpp isn't in /lib/cpp and early versions don't like -undef. - * The gcc 3.3 cpp that Apple ships inserts spurious #pragmas, - * so we use the 3.1-based version in this case. + * We support gcc 3.3 and 4.0 as the default compiler */ #if (GccMajorVersion == 3) && (GccMinorVersion == 3) -# define CppCmd /usr/bin/cpp3 +# define CppCmd /usr/bin/cpp-3.3 +# define StandardCppOptions -traditional -P +# define RawCppCmd CppCmd -undef #else -# define CppCmd /usr/bin/cpp -#endif -#if (GccMajorVersion == 3) && (GccMinorVersion == 3) || (GccMajorVersion > 3) -# define StandardCppOptions -traditional -D__GNUC__ -#endif -#if HasGcc3 +#if (GccMajorVersion > 3) +# define CppCmd /usr/bin/cpp-4.0 +# define StandardCppOptions -traditional -P # define RawCppCmd CppCmd -undef #else +# define CppCmd /usr/bin/cpp +# define StandardCppOptions -traditional # define RawCppCmd CppCmd #endif +#endif /* we have a gcc compatible compiler, but its not called gcc */ #define CcCmd /usr/bin/cc #define CplusplusCmd /usr/bin/c++ +/* + * makedepend doesn't understand ObjectiveC's #import directives, frameworks, + * and perhaps other things... + */ +#if HasGcc +# ifndef UseGccMakeDepend +# define UseGccMakeDepend YES +# endif +# ifndef PostIncDir +# define PostIncDir DefaultGccIncludeDir +# endif +#else +# ifndef UseCCMakeDepend +# define UseCCMakeDepend YES +# endif +#endif + /* default flags to pass to cc */ #ifndef DefaultCCOptions #if XFree86Devel @@ -205,7 +233,7 @@ #ifdef PpcDarwinArchitecture # define DarwinMachineDefines -D__powerpc__ # if HasGcc3 -# define OptimizedCDebugFlags -Os +# define OptimizedCDebugFlags -Os GccAliasingArgs # else # define OptimizedCDebugFlags -O2 # endif @@ -215,7 +243,7 @@ #ifdef i386DarwinArchitecture # define DarwinMachineDefines -D__i386__ # if HasGcc3 -# define OptimizedCDebugFlags -Os +# define OptimizedCDebugFlags -Os GccAliasingArgs # else # define OptimizedCDebugFlags -O2 -fno-strength-reduce # endif @@ -238,6 +266,15 @@ */ #define StandardDefines DarwinMachineDefines -D__DARWIN__ \ -DNO_ALLOCA -DCSRG_BASED DarwinLocaleDefines +#define StandardCppDefines StandardDefines + +/* + * Ensure locally built static libraries are found before dynamic libraries + * in system library search paths. + */ +#ifndef ExtraLoadOptions +# define ExtraLoadOptions -Wl,-search_paths_first +#endif /* * Set this to NO to just build the client libs, which should work without @@ -278,29 +315,77 @@ #define BuildLibPathVar DYLD_LIBRARY_PATH +#ifndef DefaultUserPath +#define DefaultUserPath /bin:/sbin:/usr/bin:/usr/sbin:$(BINDIR) +#endif +#define DefaultSystemPath DefaultUserPath + /* include rules to build shared libraries */ #include +#ifndef NothingOutsideProjectRoot +#define NothingOutsideProjectRoot NO +#endif + +#if NothingOutsideProjectRoot + XDARWINAPPDIR = $(BINDIR)/XDarwin.app/Contents +#else + XDARWINAPPDIR = /Applications/XDarwin.app/Contents +#endif + /* * BundleProgramTarget - Generate rules for compiling, linking and * installing a bundle executable. */ #ifndef BundleProgramTarget -#define BundleProgramTarget(program,loader,subdirs,objs,deplib,syslib,dstdir) @@\ +#define BundleProgramTarget(program,loader,subdirs,objs,deplib,syslib) @@\ @@\ AllTarget(program) @@\ @@\ program: loader subdirs objs deplib @@\ RemoveTargetProgram($@) @@\ - LinkRule($@,-bundle $(LDOPTIONS),objs,deplib $(LDLIBS) syslib -bundle_loader loader) @@\ + LinkRule($@,-bundle $(LDOPTIONS),objs,deplib $(LDLIBS) syslib -bundle_loader loader) @@\ @@\ -InstallProgram(program,dstdir/program.bundle/Contents/MacOS) @@\ +InstallProgram(program,$(XDARWINAPPDIR)/Resources/program.bundle/Contents/MacOS) @@\ @@\ clean:: @@\ RemoveFile(program) #endif /* BundleProgramTarget */ /* + * BundleSymbolicLink - Generate 'unsymlink' and 'resymlink' rules to + * temporarily replace symbolic links with the files they reference. + */ +#ifndef BundleSymbolicLink +#define BundleSymbolicLink(symdir,subdir,target) @@\ + @@\ +unsymlink:: @@\ + MakeDir(symdir/subdir) @@\ + @if [ -h target ]; then \ @@\ + set -x; \ @@\ + $(MV) target symdir/target; \ @@\ + touch target; \ @@\ + $(CP) symdir/target target; \ @@\ + fi @@\ + @@\ +resymlink clean:: @@\ + @if [ -h symdir/target ]; then \ @@\ + set -x; \ @@\ + $(MV) symdir/target target; \ @@\ + fi +#endif /* BundleSymbolicLink */ + +/* + * BundleSymbolicLinkSubdirs - Subdirectory recursion for 'unsymlink' and + * 'resymlink' targets. + */ +#ifndef BundleSymbolicLinkSubdirs +#define BundleSymbolicLinkSubdirs(dirs) @@\ +NamedTargetSubdirs(unsymlink,dirs,"unsymlinking",NullParameter,unsymlink) @@\ +NamedTargetSubdirs(resymlink,dirs,"resymlinking",NullParameter,resymlink) +#endif /* BundleSymbolicLinkSubdirs */ + +/* * Darwin specific Imake Config files */ #ifndef LocalConfigFiles Index: xc/config/cf/gnu.cf diff -u xc/config/cf/gnu.cf:1.14 xc/config/cf/gnu.cf:1.15 --- xc/config/cf/gnu.cf:1.14 Wed Jun 2 18:42:53 2004 +++ xc/config/cf/gnu.cf Tue May 16 12:01:50 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.14 2004/06/02 22:42:53 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.15 2006/05/16 16:01:50 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -217,7 +217,7 @@ #define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ - $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname + $(MAKE) -C dir $(PASSMFLAGS) $(PARALLELMFLAGS) flags subname #define ArchitectureDefines -DGNU_ARCHITECTURE Index: xc/config/cf/linux.cf diff -u xc/config/cf/linux.cf:3.241 xc/config/cf/linux.cf:3.245 --- xc/config/cf/linux.cf:3.241 Sun Apr 2 19:12:46 2006 +++ xc/config/cf/linux.cf Wed Jan 3 22:33:41 2007 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.241 2006/04/02 23:12:46 dickey Exp $ +XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.245 2007/01/04 03:33:41 tsi Exp $ /* * Copyright (c) 1994-2006 by The XFree86 Project, Inc. @@ -204,10 +204,16 @@ # define HasThreadSafeAPI YES # define ThreadsLibraries -lpthread # define SystemMTDefines -D_REENTRANT +# define InstallXtermSetGID YES +# if 1 /* XXX - This isn't dependent on [g]libc version. */ +# ifndef InstUtmpFlags +# define InstUtmpFlags -m 2755 -g utmp +# endif +# endif + # ifndef HasLibCrypt # define HasLibCrypt YES # endif -# define InstallXtermSetGID YES /* netscape wraps select but not poll as of communicator 4.72 */ # ifndef HasPoll # define HasPoll NO @@ -945,12 +951,30 @@ #define ServerExtraSysLibs /**/ +/* + * Note: Leave the setting of HasPam and UsePam to distribution maintainers + * (in their host.def, for example), because a binary generated with PAM + * support will not run on a system without PAM. + */ +#ifndef HasPam +#define HasPam NO +#endif + #ifndef PamLibraries +#if HasPam #define PamLibraries -lpam DlLibrary +#else +#define PamLibraries /**/ +#endif #endif -#ifndef PamMiscLibraries -#define PamMiscLibraries -lpam_misc +/* libpam_misc includes a generic conversation function */ +#ifndef ServerPamLibraries +#if HasPam +#define ServerPamLibraries -lpam_misc -lpam DlLibrary +#else +#define ServerPamLibraries PamLibraries +#endif #endif #ifndef HasDECnet @@ -998,7 +1022,7 @@ #define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ - $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname + $(MAKE) -C dir $(PASSMFLAGS) $(PARALLELMFLAGS) flags subname #define ArchitectureDefines -DLINUX_ARCHITECTURE Index: xc/config/cf/lnxLib.rules diff -u xc/config/cf/lnxLib.rules:3.61 xc/config/cf/lnxLib.rules:3.62 --- xc/config/cf/lnxLib.rules:3.61 Mon May 31 20:16:53 2004 +++ xc/config/cf/lnxLib.rules Tue May 16 12:01:50 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.61 2004/06/01 00:16:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.62 2006/05/16 16:01:50 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -613,7 +613,7 @@ @@\ mk_JUMP_HOST: @@\ @echo checking stub library $(JUMP_SA) in $(JUMP_HOST)... @@\ - @(cd $(JUMP_HOST); $(MAKE) $(MFLAGS) $(JUMP_SA)) || exit 1 @@\ + @(cd $(JUMP_HOST); $(MAKE) $(PASSMFLAGS) $(JUMP_SA)) || exit 1 @@\ @echo ok. continuing in $(Concat(JUMP_ROOT_,libname))... @@\ @@\ $(JUMP_SO): down/mk_JUMP_SO_$(JUMP_IS_HOST) @@\ @@ -636,7 +636,7 @@ mk_JUMP_SIBDIRS: @@\ @for d in $(Concat(JUMP_SIBDIRS_,libname)); do \ echo checking ar library in $$d...; \ - (cd $$d ; $(MAKE) $(MFLAGS) fastdo_JUMP_AR) || exit 1; \ + (cd $$d ; $(MAKE) $(PASSMFLAGS) fastdo_JUMP_AR) || exit 1; \ echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...;done@@\ @@\ fastdo_JUMP_AR: $(JUMP_DIR) down/mk_JUMP_AR @@\ @@ -652,13 +652,13 @@ @@\ jumpsetup_0: @@\ @echo doing jump setup in host $(JUMP_HOST)... @@\ - @(cd $(JUMP_HOST); $(MAKE) $(MFLAGS) jumpsetup) || exit 1 @@\ + @(cd $(JUMP_HOST); $(MAKE) $(PASSMFLAGS) jumpsetup) || exit 1 @@\ @echo ok. continuing in $(Concat(JUMP_ROOT_,libname))... @@\ @@\ jumpsetup_1:: @@\ @for d in $(Concat(JUMP_SUBDIRS_,libname)); do \ echo checking stub library in $$d...; \ - (cd $$d ; $(MAKE) $(MFLAGS) do_JUMP_SA) || exit 1; \ + (cd $$d ; $(MAKE) $(PASSMFLAGS) do_JUMP_SA) || exit 1; \ echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...;done@@\ @@\ jumpsetup_1:: $(JUMP_DIR)/jump.funcs $(JUMP_DIR)/jump.vars \ Index: xc/config/cf/os2.cf diff -u xc/config/cf/os2.cf:3.48 xc/config/cf/os2.cf:3.49 --- xc/config/cf/os2.cf:3.48 Sat Apr 8 14:30:23 2006 +++ xc/config/cf/os2.cf Fri Jul 14 11:26:39 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.48 2006/04/08 18:30:23 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.49 2006/07/14 15:26:39 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -221,14 +221,16 @@ /* "shell scripts" in OS/2 have this extension */ #define SHsuf sh -#define InstPgmFlags /**/ -#define InstBinFlags /**/ -#define InstUidFlags /**/ -#define InstLibFlags /**/ -#define InstIncFlags /**/ -#define InstManFlags /**/ -#define InstDatFlags /**/ -#define InstallFlags /**/ +#define InstPgmFlags /**/ +#define InstBinFlags /**/ +#define InstUidFlags /**/ +#define InstLibFlags /**/ +#define InstIncFlags /**/ +#define InstManFlags /**/ +#define InstDatFlags /**/ +#define InstKmemFlags /**/ +#define InstUtmpFlags /**/ +#define InstallFlags /**/ #define OptimizedCDebugFlags DefaultGcc2i386Opt #define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF Index: xc/config/cf/os2Lib.tmpl diff -u xc/config/cf/os2Lib.tmpl:3.21 xc/config/cf/os2Lib.tmpl:3.22 --- xc/config/cf/os2Lib.tmpl:3.21 Mon Jan 9 09:56:13 2006 +++ xc/config/cf/os2Lib.tmpl Sun Jul 23 16:51:48 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.21 2006/01/09 14:56:13 dawes Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.22 2006/07/23 20:51:48 tsi Exp $ /* * OS2/EMX shared library template @@ -28,7 +28,7 @@ #define SharedXpmReqs $(LDPRELIB) $(XLIB) #define SharedDPSReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedDPSTKReqs $(LDPRELIB) $(DPSLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) +#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) $(XLIB) #define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedXssReqs $(LDPRELIB) $(XLIB) Index: xc/config/cf/sco5.cf diff -u xc/config/cf/sco5.cf:3.20 xc/config/cf/sco5.cf:3.22 --- xc/config/cf/sco5.cf:3.20 Fri Oct 14 11:15:52 2005 +++ xc/config/cf/sco5.cf Sun Jul 23 16:51:48 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.20 2005/10/14 15:15:52 tsi Exp $ +XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.22 2006/07/23 20:51:48 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -201,7 +201,7 @@ #define MesaUseX86Asm NO #define MakeNamedTargetSubdir(dir,flags,subname)\ - $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname + $(MAKE) -C dir $(PASSMFLAGS) $(PARALLELMFLAGS) flags subname #define ArCmdBase ar #define AsCmd CcCmd @@ -258,8 +258,8 @@ #define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) $(XLIB) #define SharedFontencReqs $(LDPRELIB) GzipLibrary #define SharedGLReqs $(LDPRELIB) $(XLIB) -#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -#define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) +#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) $(XLIB) +#define SharedOSMesaReqs $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) $(XLIB) #define SharedSMReqs $(LDPRELIB) $(ICELIB) #define SharedX11Reqs $(LDPRELIB) -lsocket #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) Index: xc/config/cf/sgi.cf diff -u xc/config/cf/sgi.cf:1.26 xc/config/cf/sgi.cf:1.28 --- xc/config/cf/sgi.cf:1.26 Mon Feb 20 14:10:52 2006 +++ xc/config/cf/sgi.cf Tue Apr 3 11:17:55 2007 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.26 2006/02/20 19:10:52 tsi Exp $ +XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.28 2007/04/03 15:17:55 tsi Exp $ #ifndef OSName # define OSName DefaultOSName @@ -178,10 +178,10 @@ #endif #ifndef DefaultCCOptions -#define DefaultCCOptions sgiCCOptions SymbolTables +#define DefaultCCOptions sgiCCOptions -U__INLINE_INTRINSICS SymbolTables #endif #ifndef ServerCCOptions -#define ServerCCOptions sgiCCOptions ServerSymbolTables +#define ServerCCOptions sgiCCOptions -U__INLINE_INTRINSICS ServerSymbolTables #endif #ifndef DefaultCplusplusOptions #define DefaultCplusplusOptions DefaultCCOptions @@ -243,12 +243,18 @@ && $(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c \ @@\ && $(MV) $@ dir/$@ +#ifndef HasGnuMake +#define HasGnuMake NO /* Assume IRIX make */ +#endif + +#if !HasGnuMake #ifndef HasMakefileSafeInclude #define HasMakefileSafeInclude YES #endif #ifndef IncludeMakefile #define IncludeMakefile(file) @@sinclude file #endif +#endif /* needs to find nroff on the system to work */ #ifndef ManKeywordsTarget Index: xc/config/cf/sun.cf diff -u xc/config/cf/sun.cf:3.83 xc/config/cf/sun.cf:3.84 --- xc/config/cf/sun.cf:3.83 Tue Feb 7 15:54:23 2006 +++ xc/config/cf/sun.cf Wed Jan 3 22:33:42 2007 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.83 2006/02/07 20:54:23 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.84 2007/01/04 03:33:42 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -537,26 +537,18 @@ catman -M $(DESTDIR)manpath -w #endif -#if !defined(UsePamLibrary) -# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4)) -# define UsePamLibrary YES -# endif -#endif - /* PAM appeared in SunOS 5.6 */ -#if !defined(HasPam) +/* + * WARNING: Binaries generated with PAM support will not run on older systems. + */ +#ifndef HasPam # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6) # define HasPam YES # endif #endif -#ifndef PamLibraries -#define PamLibraries -lpam -#endif - #define MotifDefines \ -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST -#define PamUnixDefines -DPAM_NIS #define TtLargePICTable YES #define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP #define DtSearchDefines -DI18N_MSG DtSvcDefines Index: xc/config/cf/sv4Lib.tmpl diff -u xc/config/cf/sv4Lib.tmpl:3.9 xc/config/cf/sv4Lib.tmpl:3.10 --- xc/config/cf/sv4Lib.tmpl:3.9 Mon Jan 9 09:56:13 2006 +++ xc/config/cf/sv4Lib.tmpl Sun Jul 23 16:51:48 2006 @@ -2,7 +2,7 @@ * SVR4 shared library template */ -XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.9 2006/01/09 14:56:13 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.10 2006/07/23 20:51:48 tsi Exp $ /* SVR4 shared libraries are deficient in link semantics */ XMULIBONLY = -lXmu @@ -80,8 +80,8 @@ #ifndef SharedGLUReqs # if HasGcc2ForCplusplus -# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) +# define SharedGLUReqs $(LDPRELIBS) $(GLXLIB) $(XXF86VMLIB) $(XLIB) $(CXXLIB) # else -# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) +# define SharedGLUReqs $(LDPRELIBS) $(GLXLIB) $(XXF86VMLIB) $(XLIB) # endif #endif Index: xc/config/cf/xf86.rules diff -u xc/config/cf/xf86.rules:3.37 xc/config/cf/xf86.rules:3.38 --- xc/config/cf/xf86.rules:3.37 Mon May 31 20:16:53 2004 +++ xc/config/cf/xf86.rules Tue May 16 12:01:50 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.37 2004/06/01 00:16:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.38 2006/05/16 16:01:50 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -81,8 +81,8 @@ Configure:: target.o @@\ @@\ target.c: script dep @@\ - $(MAKE) $(MFLAGS) Makefile @@\ - $(MAKE) $(MFLAGS) extra Concat(Build,target) @@\ + $(MAKE) $(PASSMFLAGS) Makefile @@\ + $(MAKE) $(PASSMFLAGS) extra Concat(Build,target) @@\ @@\ Concat(Build,target): @@\ $(RM) target.c @@\ Index: xc/config/cf/xf86.tmpl diff -u xc/config/cf/xf86.tmpl:3.38 xc/config/cf/xf86.tmpl:3.39 --- xc/config/cf/xf86.tmpl:3.38 Fri Oct 14 11:15:52 2005 +++ xc/config/cf/xf86.tmpl Mon Jun 26 20:52:48 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.38 2005/10/14 15:15:52 tsi Exp $ +XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.39 2006/06/27 00:52:48 dawes Exp $ #ifdef BuilderEMailAddr BUILDERADDR = BuilderEMailAddr @@ -45,9 +45,11 @@ #define HasGccStackProtector NO #endif +#if 0 #if HasGccStackProtector MODULE_GCC_FLAGS1 = -fno-stack-protector #endif +#endif #ifndef HasGccMergeConstants #define HasGccMergeConstants NO Index: xc/config/cf/xfree86.cf diff -u xc/config/cf/xfree86.cf:3.511 xc/config/cf/xfree86.cf:3.517 --- xc/config/cf/xfree86.cf:3.511 Tue Apr 25 20:28:16 2006 +++ xc/config/cf/xfree86.cf Sun Jul 1 11:14:49 2007 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.511 2006/04/26 00:28:16 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.517 2007/07/01 15:14:49 tsi Exp $ /* * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. @@ -95,8 +95,8 @@ #ifndef ChangelogDateCmd # define ChangelogDateCmd if tail $(CHANGELOGFILE) | \ @@\ - fgrep '$$XFree86:' >/dev/null 2>&1; then \ @@\ - tail $(CHANGELOGFILE) | fgrep '$$XFree86:' | \ @@\ + fgrep '$$$(CHANGELOGID):' >/dev/null 2>&1; then \ @@\ + tail $(CHANGELOGFILE) | fgrep '$$$(CHANGELOGID):' | \ @@\ sed s,'.* \([0-9][0-9]*\)/\([0-9][0-9]*\)/\([0-9][0-9]*\).*,\1\2\3,'; \ @@\ else echo 0; fi #endif @@ -161,59 +161,6 @@ #define BuildServersOnly NO #endif -/* - * BuildXFree86ConfigTools: - * - * Turning this on allows the XFree86 config tools to build when - * BuildServersOnly is YES. This requires more than the servonly CVS - * module. This cannot be used to disable building the config tools with - * a full build. - */ -#ifndef BuildXFree86ConfigTools -#if BuildServer -#define BuildXFree86ConfigTools !BuildServersOnly -#else -#define BuildXFree86ConfigTools NO -#endif -#endif - -#ifndef BuildLibrariesForConfigTools -#define BuildLibrariesForConfigTools BuildXFree86ConfigTools -#endif - -#if BuildXFree86ConfigTools && BuildLibrariesForConfigTools -#ifndef BuildX11Lib -#define BuildX11Lib YES -#endif -#ifndef BuildXawLibrary -#define BuildXawLibrary YES -#endif -#ifndef BuildXtLibrary -#define BuildXtLibrary YES -#endif -#ifndef BuildXmuLibrary -#define BuildXmuLibrary YES -#endif -#ifndef BuildXpmLibrary -#define BuildXpmLibrary YES -#endif -#ifndef BuildXF86MiscLibrary -#define BuildXF86MiscLibrary YES -#endif -#ifndef BuildXF86VidModeLibrary -#define BuildXF86VidModeLibrary YES -#endif -#ifndef BuildXKBlib -#define BuildXKBlib YES -#endif -#ifndef BuildXKBfilelib -#define BuildXKBfilelib YES -#endif -#ifndef BuildXKBuilib -#define BuildXKBuilib YES -#endif -#endif - #ifndef MakeDllModules #define MakeDllModules NO #endif @@ -512,10 +459,7 @@ /* SPARC and UltraSPARC drivers */ -#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) && \ - !defined(LynxOSArchitecture) && \ - !defined(NetBSDArchitecture) && \ - !defined(OpenBSDArchitecture) +#if defined(SparcArchitecture) && !defined(LynxOSArchitecture) # ifndef XF86Server # define XF86Server YES # endif @@ -605,9 +549,9 @@ /* Pure SBUS and PCI drivers should go first */ # ifndef XF86CardDrivers -# define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ - sunbw2 glint mga tdfx ati vesa vga fbdev \ - XF86OSCardDrivers XF86ExtraCardDrivers \ +# define XF86CardDrivers pnozz sunffb sunleo suncg6 suncg3 suncg14 \ + suntcx sunbw2 glint mga tdfx ati vesa vga \ + fbdev XF86OSCardDrivers XF86ExtraCardDrivers \ DevelDrivers # endif # ifndef DriDrivers @@ -616,100 +560,6 @@ #endif -/* Sparc64 Drivers */ -#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif - -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -# ifndef UseX86Emu -# define UseX86Emu NO -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati \ - DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -# define TdfxDriDriver /**/ -# ifndef DriDrivers -# define DriDrivers /**/ -# endif -#endif - /* MIPS drivers */ #ifdef MipsArchitecture @@ -976,7 +826,9 @@ /* * Intel StrongARM and Hewlett-Packard PA-RISC */ -#if defined(Arm32Architecture) || defined(HPArchitecture) +#if defined(Arm32Architecture) || \ + defined(HPArchitecture) || \ + defined(CatsArchitecture) # ifndef XF86Server # define XF86Server YES # endif @@ -1159,6 +1011,59 @@ # define DoLoadableServer NO #endif +/* + * BuildXFree86ConfigTools: + * + * Turning this on allows the XFree86 config tools to build when + * BuildServersOnly is YES. This requires more than the servonly CVS + * module. This cannot be used to disable building the config tools with + * a full build. + */ +#ifndef BuildXFree86ConfigTools +#if BuildServer +#define BuildXFree86ConfigTools (!BuildServersOnly && XF86Server) +#else +#define BuildXFree86ConfigTools NO +#endif +#endif + +#ifndef BuildLibrariesForConfigTools +#define BuildLibrariesForConfigTools BuildXFree86ConfigTools +#endif + +#if BuildXFree86ConfigTools && BuildLibrariesForConfigTools +#ifndef BuildX11Lib +#define BuildX11Lib YES +#endif +#ifndef BuildXawLibrary +#define BuildXawLibrary YES +#endif +#ifndef BuildXtLibrary +#define BuildXtLibrary YES +#endif +#ifndef BuildXmuLibrary +#define BuildXmuLibrary YES +#endif +#ifndef BuildXpmLibrary +#define BuildXpmLibrary YES +#endif +#ifndef BuildXF86MiscLibrary +#define BuildXF86MiscLibrary YES +#endif +#ifndef BuildXF86VidModeLibrary +#define BuildXF86VidModeLibrary YES +#endif +#ifndef BuildXKBlib +#define BuildXKBlib YES +#endif +#ifndef BuildXKBfilelib +#define BuildXKBfilelib YES +#endif +#ifndef BuildXKBuilib +#define BuildXKBuilib YES +#endif +#endif + /* The glide driver only works for the loadable server at the moment */ #ifndef HasGlide2 #define HasGlide2 NO @@ -1421,7 +1326,7 @@ # endif # if defined(SparcArchitecture) \ - || defined (Sparc64Architecture) \ + || defined(Sparc64Architecture) \ || defined(ia64Architecture) \ || defined(s390xArchitecture) \ || defined(AMD64Architecture) @@ -1618,16 +1523,6 @@ #ifndef SystemV4 #define SystemV4 NO #endif -#ifndef BuildScanpci -# if SystemV || SystemV4 || \ - (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ - defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ - defined(OS2Architecture) || defined(GNUMachArchitecture) -# define BuildScanpci YES -# else -# define BuildScanpci NO -# endif -#endif #ifndef CompressAllFonts # define CompressAllFonts YES @@ -1932,7 +1827,7 @@ # ifndef Has3DNowSupport # define Has3DNowSupport NO # endif -#elif defined (AMD64Architecture) +#elif defined(AMD64Architecture) # ifndef HasX86Support # define HasX86Support NO # endif @@ -1961,12 +1856,12 @@ #endif #ifndef StaticNeedsPicForShared -# if defined (AMD64Architecture)\ - || defined (AlphaArchitecture) \ - || defined (ia64Architecture) \ - || defined (PpcArchitecture) \ - || defined (SparcArchitecture) \ - || defined (s390xArchitecture) +# if defined(AMD64Architecture)\ + || defined(AlphaArchitecture) \ + || defined(ia64Architecture) \ + || defined(PpcArchitecture) \ + || defined(SparcArchitecture) \ + || defined(s390xArchitecture) # define StaticNeedsPicForShared YES # else # define StaticNeedsPicForShared NO @@ -2052,14 +1947,47 @@ #define TouchScreenDefines /**/ #endif +#ifndef XsunServer +#define XsunServer NO +#endif +#ifndef Xsun24Server +#define Xsun24Server NO +#endif +#ifndef XsunMonoServer +#define XsunMonoServer NO +#endif + +#ifndef XsunLynxServer +#define XsunLynxServer NO +#endif +#ifndef XsunLynxMonoServer +#define XsunLynxMonoServer NO +#endif + +#ifndef XWinServer +#define XWinServer NO +#endif + +#ifndef XDarwinServer +#define XDarwinServer NO +#endif + +#ifndef XnonServer +#define XnonServer NO +#endif + /* * When this is set, modules are always built separately from the libraries - * that statically link into an Xserver. This is for platforms where the + * that statically link into an Xserver. This deals with platforms where the * module and native object formats are different (e.g., OS/2). + * BuildModuleInSubdir should also be set when both the loader server and + * another server are to be built in the same build. */ #ifndef BuildModuleInSubdir #if TinyXServer || XVirtualFramebufferServer || XdmxServer || XnestServer || \ - XprtServer + XprtServer || XsunServer || Xsun24Server || XsunMonoServer || \ + XsunLynxServer || XsunLynxMonoServer || XWinServer || XDarwinServer || \ + XnonServer #define BuildModuleInSubdir YES #else #define BuildModuleInSubdir NO @@ -2071,4 +1999,3 @@ #include #endif #include - Index: xc/config/imake/Imakefile diff -u xc/config/imake/Imakefile:3.20 xc/config/imake/Imakefile:3.21 --- xc/config/imake/Imakefile:3.20 Fri Oct 14 11:15:53 2005 +++ xc/config/imake/Imakefile Mon Jun 26 20:43:50 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/imake/Imakefile,v 3.20 2005/10/14 15:15:53 tsi Exp $ +XCOMM $XFree86: xc/config/imake/Imakefile,v 3.21 2006/06/27 00:43:50 dawes Exp $ XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. @@ -12,6 +12,10 @@ CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\"" GCC_COMMAND = $(CC) -fmerge-constants -xc /dev/null -S -o /dev/null 2> /dev/null 1> /dev/null GCC_DEFINES = -DHAS_MERGE_CONSTANTS=`if $(GCC_COMMAND); then echo 1; else echo 0; fi` +#ifdef CcCmd +CCCMD = CcCmd +CCCMDDEFS = -DCCCMD="\"$(CCCMD)\"" +#endif #ifdef CrossCompileDir CROSSCOMPILEDIR = CrossCompileDir @@ -23,7 +27,7 @@ #endif DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) $(GCC_DEFINES) \ - $(CROSSCOMPILEDEFINES) + $(CROSSCOMPILEDEFINES) $(CCCMDDEFS) EXTRAMANDEFS = -D__cpp__="\"$(CPP_PROGRAM)\"" Index: xc/config/imake/imake.c diff -u xc/config/imake/imake.c:3.68 xc/config/imake/imake.c:3.71 --- xc/config/imake/imake.c:3.68 Mon Jan 9 09:56:14 2006 +++ xc/config/imake/imake.c Mon Jun 26 20:52:48 2006 @@ -58,6 +58,7 @@ * argument is provided, the output is placed there. * -e[F] execute instead of show; optionally name Makefile F * -v verbose. Show the make command line executed. + * -k Keep the temporary "Imakefile.c" file. * * Environment variables: * @@ -394,6 +395,7 @@ boolean verbose = FALSE; boolean show = TRUE; +boolean keepTmp = FALSE; int main(int argc, char *argv[]) @@ -481,7 +483,7 @@ unlink(tmpMakefile); if (cleanedImakefile && cleanedImakefile != Imakefile) unlink(cleanedImakefile); - if (haveImakefileC) + if (haveImakefileC && !keepTmp) unlink(ImakefileC); } @@ -526,7 +528,7 @@ * Sharable imake configurations require a * machine identifier. */ - if (uname(&uts) != 0) + if (uname(&uts) < 0) LogFatal("uname(3) failed; can't tell what %s", "kind of machine you have."); @@ -651,6 +653,8 @@ } } else if (argv[0][1] == 'v') { verbose = TRUE; + } else if (argv[0][1] == 'k') { + keepTmp = TRUE; } else AddMakeArg(argv[0]); } else @@ -971,12 +975,11 @@ ; static void -get_libc_version(FILE *inFile) +get_libc_version(FILE *inFile, const char *cc) { char aout[] = "/tmp/imakeXXXXXX"; FILE *fp; const char *format = "%s -o %s -x c -"; - char *cc; int len; char *command; @@ -990,9 +993,6 @@ } close(tmpfd); } - cc = getenv ("CC"); - if (cc == NULL) - cc = "gcc"; len = strlen (aout) + strlen (format) + strlen (cc); if (len < 128) len = 128; command = alloca (len); @@ -1019,18 +1019,12 @@ } #endif -#if defined(__OpenBSD__) static void -get_stackprotector(FILE *inFile) +get_gcc_stackprotector(FILE *inFile, const char *cc) { FILE *fp; - char *cc; char command[1024], buf[1024]; - cc = getenv("CC"); - if (cc == NULL) { - cc = "cc"; - } snprintf(command, sizeof(command), "%s -v 2>&1", cc); fp = popen(command, "r"); if (fp == NULL) @@ -1044,8 +1038,6 @@ if (pclose(fp)) abort(); } -#endif - #if defined CROSSCOMPILE || defined linux static void @@ -1141,7 +1133,7 @@ } #endif -#if defined __FreeBSD__ +#if defined(__FreeBSD__) && !defined(__DragonFly__) static void get_binary_format(FILE *inFile) { @@ -1276,9 +1268,10 @@ #endif static boolean -get_gcc(char *cmd) +get_cc_name(char *cmd) { - struct stat sb; +#ifndef CCCMD + struct stat sb; static char* gcc_path[] = { # if defined(linux) || \ defined(__NetBSD__) || \ @@ -1293,6 +1286,7 @@ "/usr/pkg/bin/gcc", "/usr/bin/gcc" }; +#endif #ifdef CROSSCOMPILE static char* cross_cc_name[] = { @@ -1308,21 +1302,40 @@ strcat (cmd, cross_cc_name[i]); if (lstat (cmd, &sb) == 0) { return TRUE; - break; } } } else #endif - { - int i; - for (i = 0; i < sizeof (gcc_path) / sizeof gcc_path[0]; i++) { - if (lstat (gcc_path[i], &sb) == 0) { - strcpy (cmd, gcc_path[i]); - return TRUE; + { + const char *cc; + + cc = getenv("CC"); + if (cc) { + strcpy(cmd, cc); + return TRUE; + } else { +#ifdef CCCMD + strcpy(cmd, CCCMD); + return TRUE; +#else + int i; + for (i = 0; i < sizeof (gcc_path) / sizeof gcc_path[0]; i++) { + if (lstat(gcc_path[i], &sb) == 0) { + strcpy(cmd, gcc_path[i]); + return TRUE; + } } + strcpy(cmd, "cc"); + return TRUE; +#endif } - } - return FALSE; + } + /* + * Need to return TRUE. + * XXX Should make sure that the cross-compile case never gets here. + */ + strcpy(cmd, "cc"); + return TRUE; } #if defined CROSSCOMPILE || !defined __UNIXOS2__ @@ -1354,6 +1367,7 @@ boolean define_os_defaults(FILE *inFile) { + char ccname[PATH_MAX] = ""; #if defined CROSSCOMPILE || ( !defined(WIN32) && !defined(__UNIXOS2__) ) #ifdef CROSSCOMPILE if ((sys != win32) && (sys != emx)) @@ -1523,11 +1537,28 @@ # endif get_distrib (inFile); # endif + /* get_cc_name() will always succeed. */ + get_cc_name(ccname); +# if defined CROSSCOMPILE || defined __GNUC__ +# if defined CROSSCOMPILE + if (gnu_c) +# endif + { + get_gcc_version(inFile, ccname); +# if defined CROSSCOMPILE || !defined __UNIXOS2__ +# if defined CROSSCOMPILE + if (sys != emx) +# endif + get_gcc_incdir(inFile, ccname); +# endif + get_gcc_stackprotector(inFile, ccname); + } +# endif # if defined linux # if defined CROSSCOMPILE if (!CrossCompiling) # endif - get_libc_version (inFile); + get_libc_version(inFile, ccname); # if defined CROSSCOMPILE else { fprintf(inFile,"#define DefaultLinuxCLibMajorVersion %d\n", @@ -1547,24 +1578,7 @@ # if defined (sun) && defined(SVR4) get_sun_compiler_versions (inFile); # endif -# if defined CROSSCOMPILE || defined __GNUC__ -# if defined CROSSCOMPILE - if (gnu_c) -# endif - { - char name[PATH_MAX]; - if (get_gcc(name)) { - get_gcc_version (inFile,name); -# if defined CROSSCOMPILE || !defined __UNIXOS2__ -# if defined CROSSCOMPILE - if (sys != emx) -# endif - get_gcc_incdir(inFile,name); -# endif - } - } -# endif -# if defined __FreeBSD__ +# if defined(__FreeBSD__) && !defined(__DragonFly__) # if defined CROSSCOMPILE if (sys == freeBSD) # endif @@ -1603,9 +1617,6 @@ fprintf(inFile, "#define DefaultOSTeenyVersion 0\n"); } #endif /* EMX */ -#if defined(__OpenBSD__) - get_stackprotector(inFile); -#endif return FALSE; } @@ -1916,7 +1927,7 @@ initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); fprintf (tmpfd, "# %s\n", - "$XFree86: xc/config/imake/imake.c,v 3.68 2006/01/09 14:56:14 dawes Exp $"); + "$XFree86: xc/config/imake/imake.c,v 3.71 2006/06/27 00:52:48 dawes Exp $"); } for (p1 = pline; p1 < end; p1++) { Index: xc/config/imake/imake.man diff -u xc/config/imake/imake.man:1.12 xc/config/imake/imake.man:1.13 --- xc/config/imake/imake.man:1.12 Mon Jan 9 09:56:14 2006 +++ xc/config/imake/imake.man Mon Jun 26 20:43:51 2006 @@ -22,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/config/imake/imake.man,v 1.12 2006/01/09 14:56:14 dawes Exp $ +.\" $XFree86: xc/config/imake/imake.man,v 1.13 2006/06/27 00:43:51 dawes Exp $ .\" .TH IMAKE 1 __vendorversion__ .SH NAME @@ -88,6 +88,10 @@ .B \-v This option indicates that \fIimake\fP should print the \fIcpp\fP command line that it is using to generate the \fIMakefile\fP. +.TP 8 +.B \-k +This option indicates that \fIimake\fP should not remove the temporary .c +file that it constructs. This is for debugging purposes. .SH "HOW IT WORKS" \fIImake\fP invokes \fIcpp\fP with any \fI\-I\fP or \fI\-D\fP flags passed on the command line and passes the name of a file containing the Index: xc/config/imake/imakemdep.h diff -u xc/config/imake/imakemdep.h:3.82 xc/config/imake/imakemdep.h:3.84 --- xc/config/imake/imakemdep.h:3.82 Tue Jun 28 21:14:08 2005 +++ xc/config/imake/imakemdep.h Thu May 24 11:40:38 2007 @@ -23,9 +23,9 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/imake/imakemdep.h,v 3.82 2005/06/29 01:14:08 dawes Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.84 2007/05/24 15:40:38 tsi Exp $ */ /* - * Copyright (c) 1994-2005 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -330,7 +330,8 @@ #if defined(__386BSD__) #define DEFAULT_CPP "/usr/libexec/cpp" #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__DragonFly__) #define USE_CC_E #endif #if defined(__sgi) && defined(__ANSI_CPP__) @@ -394,7 +395,8 @@ #endif #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ defined(__FreeBSD__) || defined(MACH) || defined(linux) || \ - defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__) + defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__) || \ + defined(__DragonFly__) # ifdef __i386__ "-D__i386__", # if defined(__GNUC__) && (__GNUC__ >= 3) @@ -852,7 +854,7 @@ # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" # define DEFAULT_OS_TEENY_REV "v %[0-9]" /* # define DEFAULT_OS_NAME "srm %[^\n]" */ /* Not useful on ISC */ -# elif defined(__FreeBSD__) || defined(__OpenBSD__) +# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) /* BSD/OS too? */ /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */ # define DEFAULT_OS_MAJOR_REV "r %[0-9]" @@ -1154,6 +1156,27 @@ #ifdef __HIGHC__ {"__HIGHC__", "1"}, #endif +#ifdef __CHAR_UNSIGNED__ + {"__CHAR_UNSIGNED__", "1"}, +#endif +#ifdef __CHAR_BIT__ + {"__CHAR_BIT__", DEF_STRINGIFY(__CHAR_BIT__)}, +#endif +#ifdef __SCHAR_MAX__ + {"__SCHAR_MAX__", DEF_STRINGIFY(__SCHAR_MAX__)}, +#endif +#ifdef __SHRT_MAX__ + {"__SHRT_MAX__", DEF_STRINGIFY(__SHRT_MAX__)}, +#endif +#ifdef __INT_MAX__ + {"__INT_MAX__", DEF_STRINGIFY(__INT_MAX__)}, +#endif +#ifdef __LONG_MAX__ + {"__LONG_MAX__", DEF_STRINGIFY(__LONG_MAX__)}, +#endif +#ifdef __LONG_LONG_MAX__ + {"__LONG_LONG_MAX__", DEF_STRINGIFY(__LONG_LONG_MAX__)}, +#endif #ifdef CMU {"CMU", "1"}, #endif @@ -1302,6 +1325,9 @@ #ifdef __FreeBSD__ {"__FreeBSD__", DEF_STRINGIFY(__FreeBSD__)}, #endif +#ifdef __DragonFly__ + {"__DragonFly__", DEF_STRINGIFY(__DragonFly__)}, +#endif #ifdef __OpenBSD__ {"__OpenBSD__", "1"}, #endif @@ -1467,11 +1493,14 @@ netBSD, LinuX, emx, - win32 + win32, + dragonFly } System; # ifdef linux System sys = LinuX; +# elif defined __DragonFly__ +System sys = dragonfly; # elif defined __FreeBSD__ System sys = freebsd; # elif defined __NetBSD__ Index: xc/config/makedepend/cppsetup.c diff -u xc/config/makedepend/cppsetup.c:3.13 xc/config/makedepend/cppsetup.c:3.14 --- xc/config/makedepend/cppsetup.c:3.13 Mon Jan 9 09:56:15 2006 +++ xc/config/makedepend/cppsetup.c Sun Jun 17 16:24:59 2007 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.13 2006/01/09 14:56:15 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.14 2007/06/17 20:24:59 tsi Exp $ */ #include "def.h" @@ -92,30 +92,29 @@ return(value); } -struct symtab **lookup(symbol) - char *symbol; +struct symtab **lookup(char *symbol) { - static struct symtab *undefined; - struct symtab **sp; + static struct symtab undefstr, *undefined = &undefstr; + struct symtab **sp; - sp = isdefined(symbol, currentinc, NULL); + sp = isdefined(symbol, currentinc); if (sp == NULL) { sp = &undefined; + (*sp)->s_name = symbol; (*sp)->s_value = NULL; + (*sp)->s_args = NULL; } return (sp); } -pperror(tag, x0,x1,x2,x3,x4) - int tag,x0,x1,x2,x3,x4; +pperror(int tag,int x0,int x1,int x2,int x3,int x4) { warning("\"%s\", line %d: ", currentinc->i_file, currentfile->f_line); warning(x0,x1,x2,x3,x4); } -yyerror(s) - register char *s; +yyerror(char *s) { fatalerr("Fatal error: %s\n", s); } @@ -167,7 +166,7 @@ strncpy (tmpbuf, var, len); tmpbuf[len] = '\0'; - return isdefined (tmpbuf, pd->inc, NULL); + return isdefined (tmpbuf, pd->inc); } @@ -258,7 +257,7 @@ static const keyword_type* -get_keyword_entry (const keyword_type* phead, const char* keyname, const int keylen) +get_keyword_entry (const keyword_type* phead, const char* keyname, int keylen) { while (phead) { @@ -398,6 +397,8 @@ else { var = (*s)->s_value; + if (!var) + return 0; } var = ParseIfExpression(ip, var, &val); Index: xc/config/makedepend/def.h diff -u xc/config/makedepend/def.h:3.17 xc/config/makedepend/def.h:3.18 --- xc/config/makedepend/def.h:3.17 Mon Jan 9 09:56:15 2006 +++ xc/config/makedepend/def.h Sun Jun 17 16:24:59 2007 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/def.h,v 3.17 2006/01/09 14:56:15 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/def.h,v 3.18 2007/06/17 20:24:59 tsi Exp $ */ #include "Xos.h" #include "Xfuncproto.h" @@ -75,6 +75,8 @@ #define ELIFGUESSFALSE 21 /* pseudo value --- never matched */ #define INCLUDENEXTDOT 22 /* pseudo value --- never matched */ +#undef DEBUG +#define DEBUG 1 #ifdef DEBUG extern int _debugmask; /* @@ -114,8 +116,6 @@ struct symtab **i_defs; /* symbol table for this file and its children when merged */ int i_ndefs; /* current # defines */ - boolean *i_merged; /* whether we have merged child - defines */ unsigned char i_flags; }; @@ -138,13 +138,9 @@ char *copy(char *str); int match(char *str, char **list); -char *base_name(char *file); char *getnextline(struct filepointer *fp); struct symtab **slookup(char *symbol, struct inclist *file); -struct symtab **isdefined(char *symbol, struct inclist *file, - struct inclist **srcfile); -struct symtab **fdefined(char *symbol, struct inclist *file, - struct inclist **srcfile); +struct symtab **isdefined(char *symbol, struct inclist *file); struct filepointer *getfile(char *file); void included_by(struct inclist *ip, struct inclist *newfile); @@ -165,7 +161,7 @@ void recursive_pr_include(struct inclist *head, char *file, char *base); -void add_include(struct filepointer *filep, +struct inclist * add_include(struct filepointer *filep, struct inclist *file, struct inclist *file_red, char *include, int type, Index: xc/config/makedepend/include.c diff -u xc/config/makedepend/include.c:3.9 xc/config/makedepend/include.c:3.10 --- xc/config/makedepend/include.c:3.9 Mon Jan 9 09:56:15 2006 +++ xc/config/makedepend/include.c Sun Jun 17 16:24:59 2007 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/include.c,v 3.9 2006/01/09 14:56:15 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/include.c,v 3.10 2007/06/17 20:24:59 tsi Exp $ */ #include "def.h" @@ -82,10 +82,9 @@ static void remove_dotdot(char *path) { - register char *end, *from, *to, **cp; - char *components[ MAXFILES ], - newpath[ BUFSIZ ]; - boolean component_copied; + char *end, *from, *to, **cp; + char *components[ MAXFILES ], newpath[ BUFSIZ ]; + boolean component_copied; /* * slice path up into components. @@ -117,7 +116,7 @@ char **fp = cp + 2; char **tp = cp; - do + do *tp++ = *fp; /* move all the pointers down */ while (*fp++); if (cp != components) @@ -154,7 +153,7 @@ struct inclist * newinclude(char *newfile, char *incstring) { - register struct inclist *ip; + struct inclist *ip; /* * First, put this file on the global list of include files. @@ -176,7 +175,7 @@ void included_by(struct inclist *ip, struct inclist *newfile) { - register int i; + int i; if (ip == NULL) return; @@ -189,8 +188,6 @@ if (ip->i_list == NULL) { ip->i_list = (struct inclist **) malloc(sizeof(struct inclist *) * ++ip->i_listlen); - ip->i_merged = (boolean *) - malloc(sizeof(boolean) * ip->i_listlen); } else { for (i=0; ii_listlen; i++) if (ip->i_list[ i ] == newfile) { @@ -206,17 +203,14 @@ } ip->i_list = (struct inclist **) realloc(ip->i_list, sizeof(struct inclist *) * ++ip->i_listlen); - ip->i_merged = (boolean *) - realloc(ip->i_merged, sizeof(boolean) * ip->i_listlen); } ip->i_list[ ip->i_listlen-1 ] = newfile; - ip->i_merged[ ip->i_listlen-1 ] = FALSE; } void inc_clean (void) { - register struct inclist *ip; + struct inclist *ip; for (ip = inclist; ip < inclistp; ip++) { ip->i_flags &= ~MARKED; @@ -226,10 +220,10 @@ struct inclist * inc_path(char *file, char *include, int type) { - static char path[ BUFSIZ ]; - register char **pp, *p; - register struct inclist *ip; - struct stat st; + static char path[ BUFSIZ ]; + char **pp, *p; + struct inclist *ip; + struct stat st; /* * Check all previously found include files for a path that Index: xc/config/makedepend/main.c diff -u xc/config/makedepend/main.c:3.35 xc/config/makedepend/main.c:3.38 --- xc/config/makedepend/main.c:3.35 Mon Jan 9 09:56:15 2006 +++ xc/config/makedepend/main.c Sun Jun 17 16:24:59 2007 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/main.c,v 3.35 2006/01/09 14:56:15 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.38 2007/06/17 20:24:59 tsi Exp $ */ #include "def.h" #ifdef hpux @@ -64,7 +64,7 @@ #define DASH_INC_PRE "#include \"" #define DASH_INC_POST "\"" -char *ProgramName; +static char *ProgramName; char *directives[] = { "if", @@ -113,6 +113,7 @@ /* Warn on multiple includes of same file */ boolean warn_multiple = FALSE; +static char *base_name(char *file); static void setfile_cmdinc(struct filepointer *filep, long count, char **list); static void redirect(char *line, char *makefile); @@ -139,7 +140,7 @@ #define sa_mask sv_mask #define sa_flags sv_flags #endif -struct sigaction sig_act; +static struct sigaction sig_act; #endif /* USGISH */ int @@ -229,6 +230,7 @@ endmarker = &argv[0][2]; if (endmarker[0] == '\0') endmarker = "--"; break; + case 'D': if (argv[0][2] == '\0') { argv++; @@ -241,6 +243,7 @@ } define(argv[0] + 2, &maininclist); break; + case 'I': if (incp >= includedirs + MAXDIRS) fatalerr("Too many -I flags.\n"); @@ -250,6 +253,7 @@ argc--; } break; + case 'U': /* Undef's override all -D's so save them up */ numundefs++; @@ -264,15 +268,18 @@ } undeflist[numundefs - 1] = argv[0] + 2; break; + case 'Y': defincdir = argv[0]+2; break; + /* do not use if endmarker processing */ case 'a': if (endmarker) break; if (argv[0][2]) goto badopt; append = TRUE; break; + case 'w': if (endmarker) break; if (argv[0][2] == '\0') { @@ -283,6 +290,7 @@ } else width = atoi(argv[0]+2); break; + case 'o': if (endmarker) break; if (argv[0][2] == '\0') { @@ -292,6 +300,7 @@ } else objsuffix = argv[0]+2; break; + case 'p': if (endmarker) break; if (argv[0][2] == '\0') { @@ -301,6 +310,7 @@ } else objprefix = argv[0]+2; break; + case 'v': if (endmarker) break; verbose = TRUE; @@ -309,6 +319,7 @@ _debugmask = atoi(argv[0]+2); #endif break; + case 's': if (endmarker) break; startat = argv[0]+2; @@ -320,6 +331,7 @@ fatalerr("-s flag's value should start %s\n", "with '#'."); break; + case 'f': if (endmarker) break; makefile = argv[0]+2; @@ -335,12 +347,11 @@ warn_multiple = TRUE; break; - /* Ignore -O, -g so we can just pass ${CFLAGS} to - makedepend - */ + /* Ignore -O, -g so we can just pass ${CFLAGS} to makedepend */ case 'O': case 'g': break; + case 'i': if (strcmp(&argv[0][1],"include") == 0) { char *buf; @@ -363,8 +374,10 @@ break; } /* intentional fall through */ + default: if (endmarker) break; + badopt: /* fatalerr("unknown option = %s\n", argv[0]); */ warning("ignoring option %s\n", argv[0]); @@ -579,8 +592,13 @@ char *copy(char *str) { - char *p = (char *)malloc(strlen(str) + 1); + char *p; + if (!str) + return NULL; + p = (char *)malloc(strlen(str) + 1); + if (!p) + fatalerr("out of memory"); strcpy(p, str); return(p); } @@ -704,6 +722,12 @@ /* punt lines with just # (yacc generated) */ for (cp = bol+1; *cp && (*cp == ' ' || *cp == '\t'); cp++); + /* + * TurboC seems to want its pragmas in column + * 2. + */ + if (!strncmp(cp, "pragma", 6)) + whitespace = FALSE; if (*cp) goto done; --p; } @@ -731,7 +755,7 @@ * Strip the file name down to what we want to see in the Makefile. * It will have objprefix and objsuffix around it. */ -char *base_name(char *file) +static char *base_name(char *file) { char *p; Index: xc/config/makedepend/parse.c diff -u xc/config/makedepend/parse.c:1.17 xc/config/makedepend/parse.c:1.18 --- xc/config/makedepend/parse.c:1.17 Mon Jan 9 09:56:15 2006 +++ xc/config/makedepend/parse.c Sun Jun 17 16:24:59 2007 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/parse.c,v 1.17 2006/01/09 14:56:15 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/parse.c,v 1.18 2007/06/17 20:24:59 tsi Exp $ */ #include "def.h" @@ -39,8 +39,6 @@ int parse_it); static int zero_value(char *filename, char *exp, struct filepointer *filep, struct inclist *file_red); -static int merge2defines(struct inclist *file1, struct inclist *file2); - static int gobble(struct filepointer *filep, struct inclist *file, struct inclist *file_red) @@ -104,9 +102,9 @@ deftype (char *line, struct filepointer *filep, struct inclist *file_red, struct inclist *file, int parse_it) { - register char *p; + char *p; char *directive, savechar, *q; - register int ret; + int ret; /* * Parse the directive... @@ -123,7 +121,8 @@ ret = match(directive, directives); *p = savechar; - /* If we don't recognize this compiler directive or we happen to just + /* + * If we don't recognize this compiler directive or we happen to just * be gobbling up text while waiting for an #endif or #elif or #else * in the case of an #elif we must check the zero_value and return an * ELIF or an ELIFFALSE. @@ -201,15 +200,16 @@ if (!*p || *p == '"' || *p == '<') break; - sym = isdefined(p, file_red, NULL); + sym = isdefined(p, file_red); if (!sym) break; p = (*sym)->s_value; debug(3,("%s : #includes SYMBOL %s = %s\n", file->i_incstring, - (*sym) -> s_name, - (*sym) -> s_value)); + (*sym) -> s_name, p ? p : "")); + if (!p) + return(-2); } /* @@ -256,49 +256,51 @@ return(ret); } -struct symtab ** -fdefined(char *symbol, struct inclist *file, struct inclist **srcfile) +static struct symtab ** +fdefined(char *symbol, struct inclist *file) { - struct inclist **ip; struct symtab **val; - int i; - static int recurse_lvl = 0; + struct inclist *ip; if (file->i_flags & DEFCHECKED) return(NULL); debug(2,("Looking for %s in %s\n", symbol, file->i_file)); file->i_flags |= DEFCHECKED; - if ((val = slookup(symbol, file))) + /* Look in most deeply #include'd unfinished file first */ + if (file->i_list && (ip = file->i_list[file->i_listlen - 1]) && + !(ip->i_flags & FINISHED) && (val = fdefined(symbol, ip))) + { debug(1,("%s defined in %s as %s\n", - symbol, file->i_file, (*val)->s_value)); - if (val == NULL && file->i_list) + symbol, file->i_list[file->i_listlen - 1]->i_file, + (*val)->s_value ? (*val)->s_value : "")); + } + else if ((val = slookup(symbol, file))) { - for (ip = file->i_list, i=0; i < file->i_listlen; i++, ip++) - if (file->i_merged[i]==FALSE) { - val = fdefined(symbol, *ip, srcfile); - file->i_merged[i]=merge2defines(file,*ip); - if (val!=NULL) break; - } + debug(1,("%s defined in %s as %s\n", + symbol, file->i_file, + (*val)->s_value ? (*val)->s_value : "")); } - else if (val != NULL && srcfile != NULL) *srcfile = file; - recurse_lvl--; file->i_flags &= ~DEFCHECKED; return(val); } struct symtab ** -isdefined(char *symbol, struct inclist *file, struct inclist **srcfile) +isdefined(char *symbol, struct inclist *file) { struct symtab **val; - if ((val = slookup(symbol, &maininclist))) { + if ((val = fdefined(symbol, file))) + { + if ((*val)->s_value != NULL) + return(val); + } + else if ((val = slookup(symbol, &maininclist)) && + ((*val)->s_value != NULL)) + { debug(1,("%s defined on command line\n", symbol)); - if (srcfile != NULL) *srcfile = &maininclist; return(val); } - if ((val = fdefined(symbol, file, srcfile))) - return(val); debug(1,("%s not defined in %s\n", symbol, file->i_file)); return(NULL); } @@ -322,7 +324,7 @@ define2(char *name, char *args, char *val, struct inclist *file) { int first, last, below; - register struct symtab **sp = NULL, **dest; + struct symtab **sp = NULL, **dest; struct symtab *stab; /* Make space if it's needed */ @@ -345,9 +347,9 @@ while (last >= first) { /* Fast inline binary search */ - register char *s1; - register char *s2; - register int middle = (first + last) / 2; + char *s1; + char *s2; + int middle = (first + last) / 2; /* Fast inline strchr() */ s1 = name; @@ -375,12 +377,15 @@ } } - /* Search is done. If we found an exact match to the symbol name, - just replace its s_args and s_value if they are changed */ + /* + * Search is done. If we found an exact match to the symbol name, + * just replace its s_args and s_value if they are changed. + */ if (sp != NULL) { debug(1,("redefining %s from %s to %s in file %s\n", - name, (*sp)->s_value, val, file->i_file)); + name, (*sp)->s_value ? (*sp)->s_value : "", + val ? val : "", file->i_file)); if ( (*sp)->s_args ) free((*sp)->s_args); @@ -405,7 +410,8 @@ if (stab == NULL) fatalerr("malloc()/realloc() failure in insert_defn()\n"); - debug(1,("defining %s to %s in file %s\n", name, val, file->i_file)); + debug(1,("defining %s to %s in file %s\n", + name, val ? val : "", file->i_file)); stab->s_name = copy(name); if (args) stab->s_args = copy(args); @@ -415,11 +421,13 @@ *sp = stab; } +/* we dont expect too much macro parameters usage */ +#define S_ARGS_BUFLEN 1024 + void define(char *def, struct inclist *file) { -#define S_ARGS_BUFLEN 1024 /* we dont expect too much macro parameters usage */ -static char args[S_ARGS_BUFLEN]; + static char args[S_ARGS_BUFLEN]; char *val; char *p_args = args; @@ -517,7 +525,7 @@ struct symtab ** slookup(char *symbol, struct inclist *file) { - register int first = 0, last; + int first = 0, last; if (!file) return NULL; @@ -526,9 +534,9 @@ while (last >= first) { /* Fast inline binary search */ - register char *s1; - register char *s2; - register int middle = (first + last) / 2; + char *s1; + char *s2; + int middle = (first + last) / 2; /* Fast inline strchr() */ s1 = symbol; @@ -557,20 +565,12 @@ return NULL; } -static int +static void merge2defines(struct inclist *file1, struct inclist *file2) { - int i; - - if ((file1==NULL) || (file2==NULL) || - !(file2->i_flags & FINISHED)) - return 0; - - for (i=0; i < file2->i_listlen; i++) - if (file2->i_merged[i]==FALSE) - return 0; - - { /* local var encapsulation */ + if ((file1 != NULL) && (file2 != NULL) && + (file2->i_flags & FINISHED)) + { int first1 = 0; int last1 = file1->i_ndefs - 1; @@ -590,7 +590,8 @@ deflen += (SYMTABINC - deflen % SYMTABINC) % SYMTABINC; i_defs=(struct symtab**) malloc(deflen*sizeof(struct symtab*)); - if (i_defs==NULL) return 0; + if (i_defs==NULL) + fatalerr("out of memory"); } while ((last1 >= first1) && (last2 >= first2)) @@ -620,33 +621,25 @@ if (file1->i_defs) free(file1->i_defs); file1->i_defs=i_defs; file1->i_ndefs=first; - - return 1; } } void undefine(char *symbol, struct inclist *file) { - register struct symtab **ptr; - struct inclist *srcfile; - while ((ptr = isdefined(symbol, file, &srcfile)) != NULL) - { - srcfile->i_ndefs--; - for (; ptr < srcfile->i_defs + srcfile->i_ndefs; ptr++) - *ptr = ptr[1]; - } + /* Just define it to NULL in the current file */ + define2(symbol, NULL, NULL, file); } int find_includes(struct filepointer *filep, struct inclist *file, struct inclist *file_red, int recursion, boolean failOK) { - struct inclist *inclistp; + struct inclist *inclistp, *newfile; char **includedirsp; - register char *line; - register int type; - boolean recfailOK; + char *line; + int type; + boolean recfailOK; while ((line = getnextline(filep))) { switch(type = deftype(line, filep, file_red, file, TRUE)) { @@ -681,7 +674,7 @@ case IFDEF: case IFNDEF: { - int isdef = (isdefined(line, file_red, NULL) != NULL); + int isdef = (isdefined(line, file_red) != NULL); if (type == IFNDEF) isdef = !isdef; if (isdef) { @@ -691,7 +684,9 @@ file->i_file, file_red->i_file, ": doit")); type = find_includes(filep, file, file_red, recursion+1, failOK); - while (type == ELIF || type == ELIFFALSE || type == ELIFGUESSFALSE) + while (type == ELIF || + type == ELIFFALSE || + type == ELIFGUESSFALSE) type = gobble(filep, file, file_red); if (type == ELSE) gobble(filep, file, file_red); @@ -700,14 +695,16 @@ debug(1,(type == IFDEF ? "line %d: %s !def'd in %s via %s%s\n" : "", filep->f_line, line, - file->i_file, file_red->i_file, ": gobble")); + file->i_file, file_red->i_file, + ": gobble")); type = gobble(filep, file, file_red); if (type == ELSE) find_includes(filep, file, file_red, recursion+1, failOK); else if (type == ELIF) goto doif; - else if (type == ELIFFALSE || type == ELIFGUESSFALSE) + else if (type == ELIFFALSE || + type == ELIFGUESSFALSE) goto doiffalse; } } @@ -733,7 +730,7 @@ filep->f_line, line); break; } - undefine(line, file_red); + undefine(line, file); break; case INCLUDE: case INCLUDEDOT: @@ -743,9 +740,11 @@ includedirsp = includedirsnext; debug(2,("%s, reading %s, includes %s\n", file_red->i_file, file->i_file, line)); - add_include(filep, file, file_red, line, type, failOK); + newfile = add_include(filep, file, file_red, line, + type, failOK); inclistnext = inclistp; includedirsnext = includedirsp; + merge2defines(file, newfile); break; case ERROR: case WARNING: Index: xc/config/makedepend/pr.c diff -u xc/config/makedepend/pr.c:1.6 xc/config/makedepend/pr.c:1.7 --- xc/config/makedepend/pr.c:1.6 Mon Jan 9 09:56:15 2006 +++ xc/config/makedepend/pr.c Sun Jun 17 16:24:59 2007 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/pr.c,v 1.6 2006/01/09 14:56:15 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/pr.c,v 1.7 2007/06/17 20:24:59 tsi Exp $ */ #include "def.h" @@ -36,13 +36,13 @@ extern boolean verbose; extern boolean show_where_not; -void -add_include(struct filepointer *filep, struct inclist *file, +struct inclist * +add_include(struct filepointer *filep, struct inclist *file, struct inclist *file_red, char *include, int type, boolean failOK) { - register struct inclist *newfile; - register struct filepointer *content; + struct inclist *newfile; + struct filepointer *content; /* * First decide what the pathname of this include file really is. @@ -50,7 +50,7 @@ newfile = inc_path(file->i_file, include, type); if (newfile == NULL) { if (failOK) - return; + return NULL; if (file != file_red) warning("%s (reading %s, line %d): ", file_red->i_file, file->i_file, filep->f_line); @@ -71,6 +71,7 @@ freefile(content); } } + return newfile; } static void @@ -78,8 +79,8 @@ { static char *lastfile; static int current_len; - register int len, i; - char buf[ BUFSIZ ]; + int len, i; + char buf[ BUFSIZ ]; printed = TRUE; len = strlen(ip->i_file)+1; Index: xc/config/util/Imakefile diff -u xc/config/util/Imakefile:3.51 xc/config/util/Imakefile:3.52 --- xc/config/util/Imakefile:3.51 Mon Jan 9 09:56:16 2006 +++ xc/config/util/Imakefile Tue May 16 10:57:08 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/util/Imakefile,v 3.51 2006/01/09 14:56:16 dawes Exp $ +XCOMM $XFree86: xc/config/util/Imakefile,v 3.52 2006/05/16 14:57:08 tsi Exp $ CCMDEP_PROG = ccmakedep @@ -71,7 +71,6 @@ CppScriptTarget(mergelib,mergelib.cpp,"-DARCMD=$(AR)" "-DRANLIB=$(RANLIB)",$(ICONFIGFILES)) CppScriptTarget(gccmakedep,gccmdep.cpp,-DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES)) -#ifndef OpenBSDArchitecture #if HasSymLinks #if CrossCompiling SimpleHostProgramTarget_2(lndir) @@ -80,7 +79,6 @@ SimpleProgramTarget_2(lndir) #endif #endif -#endif #if defined(Win32Architecture) AllTarget(ProgramTargetName(mkdirhier)) Index: xc/config/util/checktree.c diff -u xc/config/util/checktree.c:1.5 xc/config/util/checktree.c:1.6 --- xc/config/util/checktree.c:1.5 Mon Jan 9 09:56:16 2006 +++ xc/config/util/checktree.c Tue May 16 10:57:09 2006 @@ -22,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/util/checktree.c,v 1.5 2006/01/09 14:56:16 dawes Exp $ */ +/* $XFree86: xc/config/util/checktree.c,v 1.6 2006/05/16 14:57:09 tsi Exp $ */ #include #include @@ -100,18 +100,18 @@ if (len > maxlen && !dontcare(fn)) printf("too long (%d): %s\n", len, fullname); #ifdef S_IFLNK - if ((fs->st_mode & S_IFLNK) == S_IFLNK) { + if ((fs->st_mode & S_IFMT) == S_IFLNK) { printf("symbolic link: %s\n", fullname); return; } #endif mode = fs->st_mode & (~S_IFMT); - if ((fs->st_mode & S_IFDIR) == S_IFDIR) { + if ((fs->st_mode & S_IFMT) == S_IFDIR) { maxlen = 14; if ((mode & dmode_bits_minset) != dmode_bits_minset) printf("directory mode 0%o not minimum 0%o: %s\n", mode, dmode_bits_minset, fullname); - } else if ((fs->st_mode & S_IFREG) != S_IFREG) + } else if ((fs->st_mode & S_IFMT) != S_IFREG) printf("not a regular file: %s\n", fullname); else { if ((mode & fmode_bits_minset) != fmode_bits_minset) @@ -234,7 +234,7 @@ perror(dir); continue; } - if ((fs.st_mode & S_IFDIR) == S_IFDIR) { + if ((fs.st_mode & S_IFMT) == S_IFDIR) { if (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))) Index: xc/config/util/gccmdep.cpp diff -u xc/config/util/gccmdep.cpp:3.11 xc/config/util/gccmdep.cpp:3.13 --- xc/config/util/gccmdep.cpp:3.11 Sun Jun 15 12:53:11 2003 +++ xc/config/util/gccmdep.cpp Mon Apr 2 20:21:06 2007 @@ -3,7 +3,7 @@ XCOMM XCOMM makedepend which uses 'gcc -M' XCOMM -XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.11 2003/06/15 16:53:11 tsi Exp $ +XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.13 2007/04/03 00:21:06 tsi Exp $ XCOMM XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu XCOMM @@ -31,8 +31,14 @@ endmarker= else case "$1" in +#ifdef __DARWIN__ + -D*|-F*|-I*|-U*) +#else -D*|-I*|-U*) - args="$args '$1'" +#endif +XCOMM allow single quotes in args + qarg=`echo "$1" | sed "s/'/'\\\\\\\\''/g"` + args="$args '$qarg'" ;; -g*|-O*) ;; @@ -74,7 +80,9 @@ echo "Unknown option '$1' ignored" 1>&2 ;; *) - files="$files $1" +XCOMM allow single quotes and blanks in filenames + file=`echo "$1" | sed "s/'/'\\\\\\\\''/g"` + files="$files '$file'" ;; esac fi @@ -115,7 +123,9 @@ if [ X"$makefile" != X- ]; then CMD="$CMD >> $TMP" fi -eval $CMD + +XCOMM Disable filename expansion in CMD +eval "$CMD" if [ X"$makefile" != X- ]; then $RM ${makefile}.bak $MV $makefile ${makefile}.bak Index: xc/config/util/lndir.c diff -u xc/config/util/lndir.c:3.20 xc/config/util/lndir.c:3.26 --- xc/config/util/lndir.c:3.20 Fri Oct 14 11:15:53 2005 +++ xc/config/util/lndir.c Thu Apr 12 11:53:03 2007 @@ -1,4 +1,4 @@ -/* $XFree86: xc/config/util/lndir.c,v 3.20 2005/10/14 15:15:53 tsi Exp $ */ +/* $XFree86: xc/config/util/lndir.c,v 3.26 2007/04/12 15:53:03 tsi Exp $ */ /* Create shadow link tree (after X11R4 script of the same name) Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */ @@ -26,12 +26,58 @@ in this Software without prior written authorization from The Open Group. */ +/* + * Copyright (c) 2005-2006 by The XFree86 Project, 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, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* From the original /bin/sh script: Used to create a copy of the a directory tree that has links for all - non-directories (except, by default, those named BitKeeper, RCS, SCCS - or CVS.adm). If you are building the distribution on more than one + non-directories (except, by default, those named BitKeeper, RCS, SCCS, + CVS.adm, or .svn). If you are building the distribution on more than one machine, you should use this technique. If your master sources are located in /usr/local/src/X and you would like @@ -51,13 +97,7 @@ #endif #include -#ifndef X_NOT_POSIX -#include -#else -#ifdef SYSV -#include -#else -#ifdef USG +#if !defined(X_NOT_POSIX) || defined(SYSV) || defined(USG) #include #else #include @@ -65,17 +105,25 @@ #define dirent direct #endif #endif -#endif -#endif #ifndef MAXPATHLEN #define MAXPATHLEN 2048 #endif #include -int silent = 0; /* -silent */ -int ignore_links = 0; /* -ignorelinks */ -int with_revinfo = 0; /* -withrevinfo */ +struct except { + char *name; + struct except *next; +}; + +static int silent = 0; /* -silent */ +static int ignore_links = 0; /* -ignorelinks */ +static int with_revinfo = 0; /* -withrevinfo */ +static int with_symdirs = 0; /* -withsymdirs */ +static int clean = 0; /* -clean */ +static int clean_only = 0; /* -cleanonly */ +static int no_exceptions = 0; +static struct except *exceptions = 0; char *rcurdir; char *curdir; @@ -122,7 +170,6 @@ perror (s); } - static int equivalent(char *lname, char *rname, char **p) { @@ -139,6 +186,21 @@ return !strcmp(lname, rname); } +static void +add_exception(char *name) +{ + struct except *new = malloc(sizeof(struct except)); + + if (!new) + quiterr(1, name); + + new->name = strdup(name); + if (!new->name) + quiterr(1, name); + + new->next = exceptions; + exceptions = new; +} /* Recursively create symbolic links from the current directory to the "from" directory. Assumes that files described by fs and ts are directories. */ @@ -157,8 +219,9 @@ struct stat sb, sc; int n_dirs; int symlen; - int basesymlen = -1; + int basesymlen; char *ocurdir; + struct except *cur; if ((fs->st_dev == ts->st_dev) && (fs->st_ino == ts->st_ino)) { msg ("%s: From and to directories are identical!", fn); @@ -181,14 +244,28 @@ *p++ = '/'; n_dirs = fs->st_nlink; while ((dp = readdir (df))) { - if (dp->d_name[strlen(dp->d_name) - 1] == '~') - continue; -#ifdef __DARWIN__ - /* Ignore these Mac OS X Finder data files */ - if (!strcmp(dp->d_name, ".DS_Store") || - !strcmp(dp->d_name, "._.DS_Store")) - continue; -#endif + if (!no_exceptions) { + if ((strlen(dp->d_name) <= 0) || + (dp->d_name[strlen(dp->d_name) - 1] == '~') || + ((dp->d_name[0] == '.') && (dp->d_name[1] == '#'))) + continue; + /* Ignore these Mac OS X Finder data files */ + if (!strcmp(dp->d_name, ".DS_Store") || + !strcmp(dp->d_name, "._.DS_Store")) + continue; + } + + if (!with_revinfo) { + if (!strcmp (dp->d_name, ".cvsignore")) + continue; + if (!strcmp (dp->d_name, ".gitignore")) + continue; + } + + for (cur = exceptions; cur; cur = cur->next) + if (!strcmp(dp->d_name, cur->name)) + goto next; + strcpy (p, dp->d_name); if (n_dirs > 0) { @@ -200,11 +277,13 @@ #ifdef S_ISDIR if(S_ISDIR(sb.st_mode)) #else - if (sb.st_mode & S_IFDIR) + if ((sb.st_mode & S_IFMT) == S_IFDIR) #endif { /* directory */ n_dirs--; + + do_symdir: if (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))) @@ -262,6 +341,7 @@ /* The option to ignore links exists mostly because checking for them slows us down by 10-20%. But it is off by default because this really is a useful check. */ + basesymlen = -1; if (!ignore_links) { /* see if the file in the base tree was a symlink */ basesymlen = readlink(buf, basesym, sizeof(basesym) - 1); @@ -277,6 +357,17 @@ } else { char *sympath; + if (with_symdirs) { + if (stat (buf, &sb) < 0) + mperror (buf); +#ifdef S_ISDIR + else if (S_ISDIR(sb.st_mode)) +#else + else if ((sb.st_mode & S_FMT) == S_IFDIR) +#endif + goto do_symdir; + } + if (basesymlen>=0) { if ((buf[0] == '.') && (buf[1] == '.') && (buf[2] == '/') && (basesym[0] == '.') && (basesym[1] == '.') && @@ -325,26 +416,146 @@ if (symlink (sympath, dp->d_name) < 0) mperror (dp->d_name); } +next:; } closedir (df); return 0; } +/* + * Recursively clean out symbolic links that point nowhere and remove + * empty directories. + * + * Return values: + * 1: directory is empty and should be removed. + * 0: OK, nothing else to do for this directory. + * -1: error. + */ +static int +cleandir(const char *dir) +{ + DIR *df; + struct dirent *dp; + char reldir[MAXPATHLEN + 1]; + char symbuf[MAXPATHLEN + 1]; + struct stat sb; + int empty = 1; + + if (!(df = opendir("."))) { + msg ("%s: Cannot opendir", dir); + return -1; + } + + while ((dp = readdir(df))) { + + if (strcmp(dp->d_name, ".") == 0 || + strcmp(dp->d_name, "..") == 0) { + continue; + } + + /* Check for dangling links, and remove them. */ + if (stat(dp->d_name, &sb) < 0 && errno == ENOENT) { + if (strcmp(dir, ".") == 0) + msg("Removing dangling link: %s", dp->d_name); + else + msg("Removing dangling link: %s/%s", dir, dp->d_name); + if (unlink(dp->d_name) < 0) + mperror("Link removal failed"); + continue; + } + +#ifdef S_ISDIR + if (S_ISDIR(sb.st_mode)) +#else + if ((sb.st_mode & S_IFMT) == S_IFDIR) +#endif + { + /* directory */ + if (readlink (dp->d_name, symbuf, sizeof(symbuf) - 1) < 0) { + /* Not a symlink to a directory. */ + if (chdir (dp->d_name) < 0) { + mperror (dp->d_name); + continue; + } + if (strcmp(dir, ".") == 0) + strcpy(reldir, dp->d_name); + else { + if (strlen(dir) + strlen(dp->d_name) + 1 > MAXPATHLEN) + quit(1, "path name too long: %s/%s", dir, dp->d_name); + sprintf(reldir, "%s/%s", dir, dp->d_name); + } + switch (cleandir(reldir)) { + case -1: + return -1; + break; + case 0: + /* Directory not empty, which means curdir is not empty. */ + if (chdir ("..") < 0) + quiterr (1, ".."); + empty = 0; + break; + case 1: + /* Directory is empty, so remove it. */ + if (chdir ("..") < 0) + quiterr (1, ".."); + msg("Removing empty directory: %s", reldir); + if (rmdir(dp->d_name) < 0) + mperror("Directory removal failed"); + break; + default: + /* Never get here. */ + break; + } + + } + continue; + } + + /* A remaining entry, so this directory is not empty. */ + empty = 0; + } + closedir (df); + return empty; +} + int main (int ac, char *av[]) { char *prog_name = av[0]; - char *fn, *tn; + char *fn = NULL, *tn; struct stat fs, ts; + int ret = 0; while (++av, --ac) { - if (strcmp(*av, "-silent") == 0) + if ((strcmp(*av, "-silent") == 0) || + (strcmp(*av, "-s") == 0)) silent = 1; - else if (strcmp(*av, "-ignorelinks") == 0) + else if ((strcmp(*av, "-clean") == 0) || + (strcmp(*av, "-c") == 0)) + clean = 1; + else if ((strcmp(*av, "-cleanonly") == 0)) + clean_only = 1; + else if ((strcmp(*av, "-ignorelinks") == 0) || + (strcmp(*av, "-i") == 0)) ignore_links = 1; - else if (strcmp(*av, "-withrevinfo") == 0) + else if ((strcmp(*av, "-withrevinfo") == 0) || + (strcmp(*av, "-r") == 0)) with_revinfo = 1; + else if ((strcmp(*av, "-withsymdirs") == 0) || + (strcmp(*av, "-d") == 0)) + with_symdirs = 1; + else if ((strcmp(*av, "-noexceptions") == 0) || + (strcmp(*av, "-E") == 0)) + no_exceptions = 1; + else if ((ac > 2) && + ((strcmp(*av , "-except") == 0) || + (strcmp(*av, "-e") == 0))) { + av++; + ac--; + + add_exception(*av); + } else if (strcmp(*av, "--") == 0) { ++av, --ac; break; @@ -353,13 +564,17 @@ break; } - if (ac < 1 || ac > 2) - quit (1, "usage: %s [-silent] [-ignorelinks] fromdir [todir]", + if ((ac < 1 && !clean_only) || ac > 2 || (clean_only && ac > 1)) + quit (1, "usage: %s [-s] [-i] [-E] [-r] [-d] [-c] [-e ] ... fromdir [todir]", prog_name); - fn = av[0]; - if (ac == 2) - tn = av[1]; + if (!clean_only) { + fn = av[0]; + av++, --ac; + } + + if (ac == 1) + tn = av[0]; else tn = "."; @@ -369,21 +584,33 @@ #ifdef S_ISDIR if (!(S_ISDIR(ts.st_mode))) #else - if (!(ts.st_mode & S_IFDIR)) + if ((ts.st_mode & S_IFMT) != S_IFDIR) #endif quit (2, "%s: Not a directory", tn); if (chdir (tn) < 0) quiterr (1, tn); + if (clean_only) { + if (cleandir(tn) == -1) + exit(1); + exit(0); + } + /* from directory */ if (stat (fn, &fs) < 0) quiterr (1, fn); #ifdef S_ISDIR if (!(S_ISDIR(fs.st_mode))) #else - if (!(fs.st_mode & S_IFDIR)) + if ((fs.st_mode & S_IFMT) != S_IFDIR) #endif quit (2, "%s: Not a directory", fn); - exit (dodir (fn, &fs, &ts, 0)); + ret = dodir (fn, &fs, &ts, 0); + + if (ret == 0 && clean) + if (cleandir(tn) < 0) + ret = 1; + + exit(ret); } Index: xc/config/util/lndir.man diff -u xc/config/util/lndir.man:1.7 xc/config/util/lndir.man:1.12 --- xc/config/util/lndir.man:1.7 Mon Jan 9 09:56:16 2006 +++ xc/config/util/lndir.man Thu Apr 12 11:53:03 2007 @@ -23,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/config/util/lndir.man,v 1.7 2006/01/09 14:56:16 dawes Exp $ +.\" $XFree86: xc/config/util/lndir.man,v 1.12 2007/04/12 15:53:03 tsi Exp $ .\" .TH LNDIR 1 __vendorversion__ .SH NAME @@ -31,11 +31,7 @@ .SH SYNOPSIS .B lndir [ -.B \-silent -] [ -.B \-ignorelinks -] [ -.B \-withrevinfo +.I options ] .I \|fromdir\| [ @@ -48,22 +44,20 @@ .I todir of a directory tree .I fromdir, -except that the shadow is not -populated with real files but instead with symbolic links pointing at -the real files in the +except that the shadow is not populated with real files but instead with +symbolic links pointing at the real files in the .I fromdir directory tree. This is usually useful for maintaining source code for -different machine architectures. You create a shadow directory -containing links to the real source, which you will have usually -mounted from a remote machine. You can build in the shadow tree, and -the object files will be in the shadow directory, while the -source files in the shadow directory are just symlinks to the real -files. +different machine architectures. You create a shadow directory containing +links to the real source, which you will have usually mounted from a remote +machine. You can build in the shadow tree, and the object files will be in the +shadow directory, while the source files in the shadow directory are just +symlinks to the real files. .PP This scheme has the advantage that if you update the source, you need not -propagate the change to the other architectures by hand, since all -source in all shadow directories are symlinks to the real thing: just cd -to the shadow directory and recompile away. +propagate the change to the other architectures by hand, since all source in +all shadow directories are symlinks to the real thing: just cd to the shadow +directory and recompile away. .PP The .I todir @@ -72,39 +66,54 @@ argument may be relative (e.g., ../src) and is relative to .I todir (not the current directory). -.PP -.\" CVS.adm is used by the Concurrent Versions System. -Note that BitKeeper, RCS, SCCS, CVS and CVS.adm directories are -shadowed only if the \fB\-withrevinfo\fP flag is specified. .PP If you add files, simply run .I lndir -again. New files will be silently added. Old files will be -checked that they have the correct link. +again. New files will be silently added. Old files will be checked that they +have the correct link. .PP -Deleting files is a more painful problem; the symlinks will -just point into never never land. -.PP -If a file in \fIfromdir\fP is a symbolic link, \fIlndir\fP will make -the same link in \fItodir\fP rather than making a link back to the -(symbolic link) entry in \fIfromdir.\fP The \fB\-ignorelinks\fP flag -changes this behavior. +Deleting files is a more painful problem; the symlinks will just point into +never\-never land. .SH OPTIONS .IP \-silent Normally \fIlndir\fP outputs the name of each subdirectory as it descends into it. The \fB\-silent\fP option suppresses these status -messages. +messages. \fB\-silent\fP may be abbreviated to \fB\-s\fP. .IP \-ignorelinks -Causes the program to not treat symbolic links in \fIfromdir\fP -specially. The link created in \fItodir\fP will point back to the -corresponding (symbolic link) file in \fIfromdir\fP. -If the link is to a directory, this is almost certainly the wrong thing. -.IP -This option exists mostly to emulate the behavior the C version of -\fIlndir\fP had in X11R6. Its use is not recommended. +If a file in \fIfromdir\fP is a symbolic link, \fIlndir\fP will make the same +link in \fItodir\fP rather than making a link back to the (symbolic link) entry +in \fIfromdir.\fP The \fB\-ignorelinks\fP option changes this behavior. The +link created in \fItodir\fP will point back to the corresponding (symbolic +link) file in \fIfromdir\fP. If the link is to a directory, this is almost +certainly the wrong thing. The \fB\-ignorelinks\fP option may be +abbreviated to \fB\-i\fP. +.IP \-withsymdirs +If a file in \fIfromdir\fP is a symbolic link to a directory and the +\fB\-withsymdirs\fP option is specified, \fIlndir\fP will shadow the directory +tree the symbolic link points to, whether or not the \fB\-ignorelinks\fP is +also specified. The \fB\-withsymdirs\fP option may be abbreviated to +\fB\-d\fP. +.IP \-clean +\fIlndir\fP will remove dangling symbolic links and empty directories in the +shadow tree. The \fB\-clean\fP option may be abbreviated to \fB\-c\fP. +.IP \-cleanonly +\fIlndir\fP will do the cleaning phase only, not creating the shadow tree. +The \fItodir\fP argument may be provided, and defaults to the current +directory when not provided. .IP \-withrevinfo -Causes any BitKeeper, RCS, SCCS, CVS and CVS.adm subdirectories to be -treated as any other directory, rather than ignored. +\fIlndir\fP will normally not shadow any BitKeeper, RCS, SCCS, CVS, CVS.adm +and .svn subdirectories, nor any .cvsignore and .gitignore files. This option +causes these directories and files to be treated as any other, rather than +ignored. +\fB\-withrevinfo\fP may be shortened to \fB\-r\fP. +.IP \-noexceptions +By default, \fIlndir\fP does not shadow files or directories whose name is +\&.DS_Store, or ._.DS_Store, or starts with '.#', or ends in '~'. This option, +which may be abbreviated to \fB\-E\fP, causes such files to also be shadowed. +.IP \-except \fIname\fP +This option adds \fIname\fP to an initially empty list of filenames in +\fIfromdir\fP that are not to be shadowed. \fB\-except\fP may be specified as +\fB\-e\fP. This option may be repeated as many times as necessary. .SH DIAGNOSTICS The program displays the name of each subdirectory it enters, followed by a colon. The \fB\-silent\fP option suppresses these messages. @@ -114,4 +123,4 @@ exists. .PP If the link already exists but doesn't point to the correct file, the -program prints the link name and the location where it does point. +program prints the link name and the location to which it does point. Index: xc/config/util/printver.c diff -u xc/config/util/printver.c:1.3 xc/config/util/printver.c:1.4 --- xc/config/util/printver.c:1.3 Sat Jan 31 21:08:48 2004 +++ xc/config/util/printver.c Tue Jun 27 23:20:26 2006 @@ -1,19 +1,21 @@ /* * A simple program to make it possible to print the XFree86 version and - * date info as defined in xf86Version.h and xf86Date.h very early in the + * date info as defined in xf86Version.h and xf86Date.h, as well as + * XFree86CustomVersion as defined in site.def very early in the * build process. */ -/* $XFree86: xc/config/util/printver.c,v 1.3 2004/02/01 02:08:48 dawes Exp $ */ +/* $XFree86: xc/config/util/printver.c,v 1.4 2006/06/28 03:20:26 dawes Exp $ */ #include #include #include "xf86Version.h" #include "xf86Date.h" +#include "site.h" int -main() +main(int argc, char *argv[]) { #ifdef XF86_VERSION_MAJOR printf(" version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR, @@ -24,6 +26,9 @@ printf(" (%s)", XF86_DATE); #endif #endif +#ifdef XFree86CustomVersion + printf(" (%s)", XFree86CustomVersion); +#endif exit(0); } Index: xc/doc/man/general/X.man diff -u xc/doc/man/general/X.man:1.11 xc/doc/man/general/X.man:1.12 --- xc/doc/man/general/X.man:1.11 Tue Jul 5 12:43:55 2005 +++ xc/doc/man/general/X.man Mon Nov 27 16:45:45 2006 @@ -1,5 +1,5 @@ .\" Copyright (c) 1994 X Consortium -.\" Copyright \(co 2000 The XFree86 Project, Inc. +.\" Copyright \(co 2000-2006 The XFree86 Project, Inc. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -24,7 +24,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/general/X.man,v 1.11 2005/07/05 16:43:55 tsi Exp $ +.\" $XFree86: xc/doc/man/general/X.man,v 1.12 2006/11/27 21:45:45 tsi Exp $ .\" .TH X __miscmansuffix__ __vendorversion__ .SH NAME @@ -503,7 +503,7 @@ If the name is not found, the color is looked up in the X server's database. The text form of this database is commonly stored in the file -\fI__projectroot__/lib/X11/rgb.txt\fP. +\fI\&__projectroot__/lib/X11/rgb.txt\fP. .PP A numerical color specification consists of a color space name and a set of values in the following syntax: @@ -1014,12 +1014,12 @@ .B XLOCALEDIR This must point to a directory containing the locale.alias file and Compose and XLC_LOCALE file hierarchies for all locales. The default value -is \fI__projectroot__/lib/X11/locale\fP. +is \fI\&__projectroot__/lib/X11/locale\fP. .TP .SM .B XENVIRONMENT This must point to a file containing X resources. The default is -\fI$HOME/.Xdefaults-\fP. Unlike \fI__projectroot__/lib/X11/Xresources\fP, +\fI$HOME/.Xdefaults-\fP. Unlike \fI\&__projectroot__/lib/X11/Xresources\fP, it is consulted each time an X application starts. .TP .SM @@ -1092,17 +1092,17 @@ .SM .B XKEYSYMDB This must point to a file containing nonstandard keysym definitions. -The default value is \fI__projectroot__/lib/X11/XKeysymDB\fP. +The default value is \fI\&__projectroot__/lib/X11/XKeysymDB\fP. .TP .SM .B XCMSDB This must point to a color name database file. The default value is -\fI__projectroot__/lib/X11/Xcms.txt\fP. +\fI\&__projectroot__/lib/X11/Xcms.txt\fP. .TP .SM .B XFT_CONFIG This must point to a configuration file for the Xft library. The default -value is \fI__projectroot__/lib/X11/XftConfig\fP. +value is \fI\&__projectroot__/lib/X11/XftConfig\fP. .TP .SM .B RESOURCE_NAME @@ -1184,7 +1184,7 @@ The default error handler in \fIXlib\fP (also used by many toolkits) uses standard resources to construct diagnostic messages when errors occur. The defaults for these messages are usually stored in -\fI__projectroot__/lib/X11/XErrorDB\fP. If this file is not present, +\fI\&__projectroot__/lib/X11/XErrorDB\fP. If this file is not present, error messages will be rather terse and cryptic. .PP When the X Toolkit Intrinsics encounter errors converting resource strings to Index: xc/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py diff -u xc/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py:1.1.1.2 xc/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py:1.1.1.2 Fri Dec 10 10:32:32 2004 +++ xc/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py Tue May 16 11:34:45 2006 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004 # All Rights Reserved. @@ -24,6 +24,8 @@ # # Authors: # Ian Romanick +# +# $XFree86: xc/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py,v 1.2 2006/05/16 15:34:45 tsi Exp $ from xml.sax import saxutils from xml.sax import make_parser Index: xc/extras/Mesa/src/mesa/glapi/gl_XML.py diff -u xc/extras/Mesa/src/mesa/glapi/gl_XML.py:1.1.1.1 xc/extras/Mesa/src/mesa/glapi/gl_XML.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/gl_XML.py:1.1.1.1 Fri Dec 10 10:05:28 2004 +++ xc/extras/Mesa/src/mesa/glapi/gl_XML.py Tue May 16 11:34:46 2006 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004 # All Rights Reserved. @@ -24,6 +24,8 @@ # # Authors: # Ian Romanick +# +# $XFree86: xc/extras/Mesa/src/mesa/glapi/gl_XML.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ from xml.sax import saxutils from xml.sax import make_parser Index: xc/extras/Mesa/src/mesa/glapi/gl_apitemp.py diff -u xc/extras/Mesa/src/mesa/glapi/gl_apitemp.py:1.1.1.2 xc/extras/Mesa/src/mesa/glapi/gl_apitemp.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/gl_apitemp.py:1.1.1.2 Fri Dec 10 10:32:36 2004 +++ xc/extras/Mesa/src/mesa/glapi/gl_apitemp.py Tue May 16 11:34:46 2006 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004 # All Rights Reserved. @@ -24,6 +24,8 @@ # # Authors: # Ian Romanick +# +# $XFree86: xc/extras/Mesa/src/mesa/glapi/gl_apitemp.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ from xml.sax import saxutils from xml.sax import make_parser Index: xc/extras/Mesa/src/mesa/glapi/gl_offsets.py diff -u xc/extras/Mesa/src/mesa/glapi/gl_offsets.py:1.1.1.1 xc/extras/Mesa/src/mesa/glapi/gl_offsets.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/gl_offsets.py:1.1.1.1 Fri Dec 10 10:05:29 2004 +++ xc/extras/Mesa/src/mesa/glapi/gl_offsets.py Tue May 16 11:34:46 2006 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004 # All Rights Reserved. @@ -24,6 +24,8 @@ # # Authors: # Ian Romanick +# +# $XFree86: xc/extras/Mesa/src/mesa/glapi/gl_offsets.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ from xml.sax import saxutils from xml.sax import make_parser Index: xc/extras/Mesa/src/mesa/glapi/gl_procs.py diff -u xc/extras/Mesa/src/mesa/glapi/gl_procs.py:1.1.1.2 xc/extras/Mesa/src/mesa/glapi/gl_procs.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/gl_procs.py:1.1.1.2 Fri Dec 10 10:32:35 2004 +++ xc/extras/Mesa/src/mesa/glapi/gl_procs.py Tue May 16 11:34:46 2006 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004 # All Rights Reserved. @@ -24,6 +24,8 @@ # # Authors: # Ian Romanick +# +# $XFree86: xc/extras/Mesa/src/mesa/glapi/gl_procs.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ from xml.sax import saxutils from xml.sax import make_parser Index: xc/extras/Mesa/src/mesa/glapi/gl_table.py diff -u xc/extras/Mesa/src/mesa/glapi/gl_table.py:1.1.1.1 xc/extras/Mesa/src/mesa/glapi/gl_table.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/gl_table.py:1.1.1.1 Fri Dec 10 10:05:28 2004 +++ xc/extras/Mesa/src/mesa/glapi/gl_table.py Tue May 16 11:34:46 2006 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004 # All Rights Reserved. @@ -24,6 +24,8 @@ # # Authors: # Ian Romanick +# +# $XFree86: xc/extras/Mesa/src/mesa/glapi/gl_table.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ from xml.sax import saxutils from xml.sax import make_parser Index: xc/extras/Mesa/src/mesa/glapi/gl_x86_asm.py diff -u xc/extras/Mesa/src/mesa/glapi/gl_x86_asm.py:1.1.1.1 xc/extras/Mesa/src/mesa/glapi/gl_x86_asm.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/gl_x86_asm.py:1.1.1.1 Fri Dec 10 10:05:29 2004 +++ xc/extras/Mesa/src/mesa/glapi/gl_x86_asm.py Tue May 16 11:34:46 2006 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004 # All Rights Reserved. @@ -24,6 +24,8 @@ # # Authors: # Ian Romanick +# +# $XFree86: xc/extras/Mesa/src/mesa/glapi/gl_x86_asm.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ from xml.sax import saxutils from xml.sax import make_parser Index: xc/extras/Mesa/src/mesa/glapi/glapi.c diff -u xc/extras/Mesa/src/mesa/glapi/glapi.c:1.2 xc/extras/Mesa/src/mesa/glapi/glapi.c:1.3 --- xc/extras/Mesa/src/mesa/glapi/glapi.c:1.2 Fri Dec 17 11:38:02 2004 +++ xc/extras/Mesa/src/mesa/glapi/glapi.c Sun Dec 10 10:58:23 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/Mesa/src/mesa/glapi/glapi.c,v 1.2 2004/12/17 16:38:02 tsi Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/glapi/glapi.c,v 1.3 2006/12/10 15:58:23 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.3 @@ -955,6 +955,7 @@ for (i = 1; i < entries; i++) { assert(tab[i]); } + (void)tab; /* Do some spot checks to be sure that the dispatch table * slots are assigned correctly. @@ -965,6 +966,8 @@ GLuint offset = (BeginFunc - (char *) table) / sizeof(void *); assert(BeginOffset == _gloffset_Begin); assert(BeginOffset == offset); + (void)BeginOffset; + (void)offset; } { GLuint viewportOffset = _glapi_get_proc_offset("glViewport"); @@ -972,6 +975,8 @@ GLuint offset = (viewportFunc - (char *) table) / sizeof(void *); assert(viewportOffset == _gloffset_Viewport); assert(viewportOffset == offset); + (void)viewportOffset; + (void)offset; } { GLuint VertexPointerOffset = _glapi_get_proc_offset("glVertexPointer"); @@ -979,6 +984,8 @@ GLuint offset = (VertexPointerFunc - (char *) table) / sizeof(void *); assert(VertexPointerOffset == _gloffset_VertexPointer); assert(VertexPointerOffset == offset); + (void)VertexPointerOffset; + (void)offset; } { GLuint ResetMinMaxOffset = _glapi_get_proc_offset("glResetMinmax"); @@ -986,6 +993,8 @@ GLuint offset = (ResetMinMaxFunc - (char *) table) / sizeof(void *); assert(ResetMinMaxOffset == _gloffset_ResetMinmax); assert(ResetMinMaxOffset == offset); + (void)ResetMinMaxOffset; + (void)offset; } { GLuint blendColorOffset = _glapi_get_proc_offset("glBlendColor"); @@ -993,6 +1002,8 @@ GLuint offset = (blendColorFunc - (char *) table) / sizeof(void *); assert(blendColorOffset == _gloffset_BlendColor); assert(blendColorOffset == offset); + (void)blendColorOffset; + (void)offset; } { GLuint istextureOffset = _glapi_get_proc_offset("glIsTextureEXT"); @@ -1000,6 +1011,8 @@ GLuint offset = (istextureFunc - (char *) table) / sizeof(void *); assert(istextureOffset == _gloffset_IsTextureEXT); assert(istextureOffset == offset); + (void)istextureOffset; + (void)offset; } { GLuint secondaryColor3fOffset = _glapi_get_proc_offset("glSecondaryColor3fEXT"); @@ -1008,6 +1021,8 @@ assert(secondaryColor3fOffset == _gloffset_SecondaryColor3fEXT); assert(secondaryColor3fOffset == offset); assert(_glapi_get_proc_address("glSecondaryColor3fEXT") == (_glapi_proc) &glSecondaryColor3fEXT); + (void)secondaryColor3fOffset; + (void)offset; } { GLuint pointParameterivOffset = _glapi_get_proc_offset("glPointParameterivNV"); @@ -1016,6 +1031,8 @@ assert(pointParameterivOffset == _gloffset_PointParameterivNV); assert(pointParameterivOffset == offset); assert(_glapi_get_proc_address("glPointParameterivNV") == (_glapi_proc) &glPointParameterivNV); + (void)pointParameterivOffset; + (void)offset; } { GLuint setFenceOffset = _glapi_get_proc_offset("glSetFenceNV"); @@ -1024,6 +1041,8 @@ assert(setFenceOffset == _gloffset_SetFenceNV); assert(setFenceOffset == offset); assert(_glapi_get_proc_address("glSetFenceNV") == (_glapi_proc) &glSetFenceNV); + (void)setFenceOffset; + (void)offset; } #else (void) table; Index: xc/extras/Mesa/src/mesa/glapi/glsparcasm.py diff -u xc/extras/Mesa/src/mesa/glapi/glsparcasm.py:1.1.1.2 xc/extras/Mesa/src/mesa/glapi/glsparcasm.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/glsparcasm.py:1.1.1.2 Fri Dec 10 10:32:32 2004 +++ xc/extras/Mesa/src/mesa/glapi/glsparcasm.py Tue May 16 11:34:46 2006 @@ -1,4 +1,5 @@ #!/usr/bin/env python +# $XFree86: xc/extras/Mesa/src/mesa/glapi/glsparcasm.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ # Mesa 3-D graphics library # Version: 5.1 @@ -36,13 +37,19 @@ def PrintHead(): + print '/* $%s$ */' % 'XFree86' print '/* DO NOT EDIT - This file generated automatically with glsparcasm.py script */' + print '' print '#include "glapioffsets.h"' print '' print '/* The _glapi_Dispatch symbol addresses get relocated into the' print ' * sethi/or instruction sequences below at library init time.' print ' */' print '' + print '#if defined(__sparc_v9__)' + print '\t.register %g2, #scratch' + print '\t.register %g3, #scratch' + print '#endif' print '' print '.text' print '.align 32' @@ -105,23 +112,27 @@ records.append((name, dispatchName, offset)) # print the assembly code + # note that for clarity this has been changed to supply _glapi_Dispatch + # instead of zeroes, but _mesa_init_sparc_glapi_relocs() will replace + # the relocations regardless print '' print '.globl gl%s' % (name) print '.type gl%s,#function' % (name) print 'gl%s:' % (name) - print '#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))' - print '\tsethi\t%hi(0x00000000), %g2' - print '\tsethi\t%hi(0x00000000), %g1' - print '\tor\t%g2, %lo(0x00000000), %g2' - print '\tor\t%g1, %lo(0x00000000), %g1' + print '#if (defined(__sparc_v9__) && \\' + print ' (!defined(__linux__) || defined(__linux_sparc_64__)))' + print '\tsethi\t%uhi(_glapi_Dispatch), %g2' + print '\tsethi\t%hi(_glapi_Dispatch), %g1' + print '\tor\t%g2, %ulo(_glapi_Dispatch), %g2' + print '\tor\t%g1, %lo(_glapi_Dispatch), %g1' print '\tsllx\t%g2, 32, %g2' print '\tldx\t[%g1 + %g2], %g1' print "\tsethi\t%%hi(8 * _gloffset_%s), %%g2" % (dispatchName) print "\tor\t%%g2, %%lo(8 * _gloffset_%s), %%g2" % (dispatchName) print '\tldx\t[%g1 + %g2], %g3' print '#else' - print '\tsethi\t%hi(0x00000000), %g1' - print '\tld\t[%g1 + %lo(0x00000000)], %g1' + print '\tsethi\t%hi(_glapi_Dispatch), %g1' + print '\tld\t[%g1 + %lo(_glapi_Dispatch)], %g1' print "\tld\t[%%g1 + (4 * _gloffset_%s)], %%g3" % (dispatchName) print '#endif' print '\tjmpl\t%g3, %g0' Index: xc/extras/Mesa/src/mesa/glapi/license.py diff -u xc/extras/Mesa/src/mesa/glapi/license.py:1.1.1.1 xc/extras/Mesa/src/mesa/glapi/license.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/license.py:1.1.1.1 Fri Dec 10 10:05:29 2004 +++ xc/extras/Mesa/src/mesa/glapi/license.py Tue May 16 11:34:46 2006 @@ -1,3 +1,6 @@ +#!/usr/bin/env python +# $XFree86: xc/extras/Mesa/src/mesa/glapi/license.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ +# # (C) Copyright IBM Corporation 2004 # All Rights Reserved. # Index: xc/extras/Mesa/src/mesa/main/texcompress_s3tc.c diff -u xc/extras/Mesa/src/mesa/main/texcompress_s3tc.c:1.2 xc/extras/Mesa/src/mesa/main/texcompress_s3tc.c:1.3 --- xc/extras/Mesa/src/mesa/main/texcompress_s3tc.c:1.2 Fri Dec 17 11:38:03 2004 +++ xc/extras/Mesa/src/mesa/main/texcompress_s3tc.c Mon Apr 9 11:37:09 2007 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/Mesa/src/mesa/main/texcompress_s3tc.c,v 1.2 2004/12/17 16:38:03 tsi Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/main/texcompress_s3tc.c,v 1.3 2007/04/09 15:37:09 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -278,7 +278,8 @@ fetch_texel_2d_rgb_dxt1( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - (void) texImage; (void) i; (void) j; (void) k; (void) texel; + (void) texImage; (void) i; (void) j; (void) k; + texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = texel[ACOMP] = 0; } @@ -300,7 +301,8 @@ fetch_texel_2d_rgba_dxt1( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - (void) texImage; (void) i; (void) j; (void) k; (void) texel; + (void) texImage; (void) i; (void) j; (void) k; + texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = texel[ACOMP] = 0; } @@ -322,7 +324,8 @@ fetch_texel_2d_rgba_dxt3( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - (void) texImage; (void) i; (void) j; (void) k; (void) texel; + (void) texImage; (void) i; (void) j; (void) k; + texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = texel[ACOMP] = 0; } @@ -344,7 +347,8 @@ fetch_texel_2d_rgba_dxt5( const struct gl_texture_image *texImage, GLint i, GLint j, GLint k, GLchan *texel ) { - (void) texImage; (void) i; (void) j; (void) k; (void) texel; + (void) texImage; (void) i; (void) j; (void) k; + texel[RCOMP] = texel[GCOMP] = texel[BCOMP] = texel[ACOMP] = 0; } Index: xc/extras/Mesa/src/mesa/math/m_debug_util.h diff -u xc/extras/Mesa/src/mesa/math/m_debug_util.h:1.1.1.2 xc/extras/Mesa/src/mesa/math/m_debug_util.h:1.2 --- xc/extras/Mesa/src/mesa/math/m_debug_util.h:1.1.1.2 Fri Dec 10 10:05:26 2004 +++ xc/extras/Mesa/src/mesa/math/m_debug_util.h Sun Dec 10 10:58:23 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/math/m_debug_util.h,v 1.2 2006/12/10 15:58:23 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -193,8 +194,8 @@ #define BEGIN_RACE(x) \ x = LONG_MAX; \ for (cycle_i = 0; cycle_i <10; cycle_i++) { \ - register long cycle_tmp1 asm("l0"); \ - register long cycle_tmp2 asm("l1"); \ + register long cycle_tmp1 __asm__("l0"); \ + register long cycle_tmp2 __asm__("l1"); \ /* rd %tick, %l0 */ \ __asm__ __volatile__ (".word 0xa1410000" : "=r" (cycle_tmp1)); /* save timestamp */ Index: xc/extras/Mesa/src/mesa/math/m_debug_xform.c diff -u xc/extras/Mesa/src/mesa/math/m_debug_xform.c:1.3 xc/extras/Mesa/src/mesa/math/m_debug_xform.c:1.4 --- xc/extras/Mesa/src/mesa/math/m_debug_xform.c:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/math/m_debug_xform.c Sun Dec 10 10:58:23 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/math/m_debug_xform.c,v 1.4 2006/12/10 15:58:23 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -187,7 +188,7 @@ mat->type = mtypes[mtype]; m = mat->m; - ASSERT( ((GLuint)m & 15) == 0 ); + ASSERT( ((unsigned long)m & 15) == 0 ); init_matrix( m ); Index: xc/extras/Mesa/src/mesa/shader/arbprogparse.c diff -u xc/extras/Mesa/src/mesa/shader/arbprogparse.c:1.3 xc/extras/Mesa/src/mesa/shader/arbprogparse.c:1.4 --- xc/extras/Mesa/src/mesa/shader/arbprogparse.c:1.3 Fri Dec 17 11:38:03 2004 +++ xc/extras/Mesa/src/mesa/shader/arbprogparse.c Mon Apr 9 11:37:10 2007 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/Mesa/src/mesa/shader/arbprogparse.c,v 1.3 2004/12/17 16:38:03 tsi Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/shader/arbprogparse.c,v 1.4 2007/04/09 15:37:10 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -843,6 +843,7 @@ _mesa_set_program_error (ctx, Program->Position, "Invalid texture unit index"); _mesa_error (ctx, GL_INVALID_OPERATION, "Invalid texture unit index"); + *coord = 0; return 1; } Index: xc/extras/Mesa/src/mesa/shader/arbprogram.c diff -u xc/extras/Mesa/src/mesa/shader/arbprogram.c:1.1.1.2 xc/extras/Mesa/src/mesa/shader/arbprogram.c:1.2 --- xc/extras/Mesa/src/mesa/shader/arbprogram.c:1.1.1.2 Fri Dec 10 10:33:51 2004 +++ xc/extras/Mesa/src/mesa/shader/arbprogram.c Mon Apr 9 11:37:10 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/shader/arbprogram.c,v 1.2 2007/04/09 15:37:10 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 5.1 @@ -472,7 +473,7 @@ GLdouble *params) { GET_CURRENT_CONTEXT(ctx); - GLfloat floatParams[4]; + GLfloat floatParams[4] = {0.0, }; _mesa_GetProgramLocalParameterfvARB(target, index, floatParams); if (ctx->ErrorValue == GL_NO_ERROR) { COPY_4V(params, floatParams); Index: xc/extras/Mesa/src/mesa/shader/nvvertexec.c diff -u xc/extras/Mesa/src/mesa/shader/nvvertexec.c:1.1.1.1 xc/extras/Mesa/src/mesa/shader/nvvertexec.c:1.2 --- xc/extras/Mesa/src/mesa/shader/nvvertexec.c:1.1.1.1 Fri Dec 10 10:06:46 2004 +++ xc/extras/Mesa/src/mesa/shader/nvvertexec.c Mon Apr 9 11:37:10 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/shader/nvvertexec.c,v 1.2 2007/04/09 15:37:10 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -755,6 +756,7 @@ cross[0] = t[1] * u[2] - t[2] * u[1]; cross[1] = t[2] * u[0] - t[0] * u[2]; cross[2] = t[0] * u[1] - t[1] * u[0]; + cross[3] = 0.0; store_vector4( &inst->DstReg, state, cross ); } break; @@ -776,6 +778,7 @@ if (source->Negate) result[i] = -result[i]; } + result[3] = 0.0; store_vector4( &inst->DstReg, state, result ); } break; Index: xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S diff -u xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S:1.1.1.3 xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S:1.2 --- xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S:1.1.1.3 Fri Dec 10 10:32:38 2004 +++ xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S Tue May 16 11:34:46 2006 @@ -1,10 +1,16 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S,v 1.2 2006/05/16 15:34:46 tsi Exp $ */ /* DO NOT EDIT - This file generated automatically with glsparcasm.py script */ + #include "glapioffsets.h" /* The _glapi_Dispatch symbol addresses get relocated into the * sethi/or instruction sequences below at library init time. */ +#if defined(__sparc_v9__) + .register %g2, #scratch + .register %g3, #scratch +#endif .text .align 32 @@ -24,19 +30,20 @@ .globl glNewList .type glNewList,#function glNewList: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_NewList), %g2 or %g2, %lo(8 * _gloffset_NewList), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_NewList)], %g3 #endif jmpl %g3, %g0 @@ -45,19 +52,20 @@ .globl glEndList .type glEndList,#function glEndList: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EndList), %g2 or %g2, %lo(8 * _gloffset_EndList), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EndList)], %g3 #endif jmpl %g3, %g0 @@ -66,19 +74,20 @@ .globl glCallList .type glCallList,#function glCallList: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CallList), %g2 or %g2, %lo(8 * _gloffset_CallList), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CallList)], %g3 #endif jmpl %g3, %g0 @@ -87,19 +96,20 @@ .globl glCallLists .type glCallLists,#function glCallLists: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CallLists), %g2 or %g2, %lo(8 * _gloffset_CallLists), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CallLists)], %g3 #endif jmpl %g3, %g0 @@ -108,19 +118,20 @@ .globl glDeleteLists .type glDeleteLists,#function glDeleteLists: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteLists), %g2 or %g2, %lo(8 * _gloffset_DeleteLists), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteLists)], %g3 #endif jmpl %g3, %g0 @@ -129,19 +140,20 @@ .globl glGenLists .type glGenLists,#function glGenLists: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenLists), %g2 or %g2, %lo(8 * _gloffset_GenLists), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenLists)], %g3 #endif jmpl %g3, %g0 @@ -150,19 +162,20 @@ .globl glListBase .type glListBase,#function glListBase: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ListBase), %g2 or %g2, %lo(8 * _gloffset_ListBase), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ListBase)], %g3 #endif jmpl %g3, %g0 @@ -171,19 +184,20 @@ .globl glBegin .type glBegin,#function glBegin: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Begin), %g2 or %g2, %lo(8 * _gloffset_Begin), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Begin)], %g3 #endif jmpl %g3, %g0 @@ -192,19 +206,20 @@ .globl glBitmap .type glBitmap,#function glBitmap: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Bitmap), %g2 or %g2, %lo(8 * _gloffset_Bitmap), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Bitmap)], %g3 #endif jmpl %g3, %g0 @@ -213,19 +228,20 @@ .globl glColor3b .type glColor3b,#function glColor3b: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3b), %g2 or %g2, %lo(8 * _gloffset_Color3b), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3b)], %g3 #endif jmpl %g3, %g0 @@ -234,19 +250,20 @@ .globl glColor3bv .type glColor3bv,#function glColor3bv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3bv), %g2 or %g2, %lo(8 * _gloffset_Color3bv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3bv)], %g3 #endif jmpl %g3, %g0 @@ -255,19 +272,20 @@ .globl glColor3d .type glColor3d,#function glColor3d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3d), %g2 or %g2, %lo(8 * _gloffset_Color3d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3d)], %g3 #endif jmpl %g3, %g0 @@ -276,19 +294,20 @@ .globl glColor3dv .type glColor3dv,#function glColor3dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3dv), %g2 or %g2, %lo(8 * _gloffset_Color3dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3dv)], %g3 #endif jmpl %g3, %g0 @@ -297,19 +316,20 @@ .globl glColor3f .type glColor3f,#function glColor3f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3f), %g2 or %g2, %lo(8 * _gloffset_Color3f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3f)], %g3 #endif jmpl %g3, %g0 @@ -318,19 +338,20 @@ .globl glColor3fv .type glColor3fv,#function glColor3fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3fv), %g2 or %g2, %lo(8 * _gloffset_Color3fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3fv)], %g3 #endif jmpl %g3, %g0 @@ -339,19 +360,20 @@ .globl glColor3i .type glColor3i,#function glColor3i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3i), %g2 or %g2, %lo(8 * _gloffset_Color3i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3i)], %g3 #endif jmpl %g3, %g0 @@ -360,19 +382,20 @@ .globl glColor3iv .type glColor3iv,#function glColor3iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3iv), %g2 or %g2, %lo(8 * _gloffset_Color3iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3iv)], %g3 #endif jmpl %g3, %g0 @@ -381,19 +404,20 @@ .globl glColor3s .type glColor3s,#function glColor3s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3s), %g2 or %g2, %lo(8 * _gloffset_Color3s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3s)], %g3 #endif jmpl %g3, %g0 @@ -402,19 +426,20 @@ .globl glColor3sv .type glColor3sv,#function glColor3sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3sv), %g2 or %g2, %lo(8 * _gloffset_Color3sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3sv)], %g3 #endif jmpl %g3, %g0 @@ -423,19 +448,20 @@ .globl glColor3ub .type glColor3ub,#function glColor3ub: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3ub), %g2 or %g2, %lo(8 * _gloffset_Color3ub), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3ub)], %g3 #endif jmpl %g3, %g0 @@ -444,19 +470,20 @@ .globl glColor3ubv .type glColor3ubv,#function glColor3ubv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3ubv), %g2 or %g2, %lo(8 * _gloffset_Color3ubv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3ubv)], %g3 #endif jmpl %g3, %g0 @@ -465,19 +492,20 @@ .globl glColor3ui .type glColor3ui,#function glColor3ui: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3ui), %g2 or %g2, %lo(8 * _gloffset_Color3ui), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3ui)], %g3 #endif jmpl %g3, %g0 @@ -486,19 +514,20 @@ .globl glColor3uiv .type glColor3uiv,#function glColor3uiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3uiv), %g2 or %g2, %lo(8 * _gloffset_Color3uiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3uiv)], %g3 #endif jmpl %g3, %g0 @@ -507,19 +536,20 @@ .globl glColor3us .type glColor3us,#function glColor3us: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3us), %g2 or %g2, %lo(8 * _gloffset_Color3us), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3us)], %g3 #endif jmpl %g3, %g0 @@ -528,19 +558,20 @@ .globl glColor3usv .type glColor3usv,#function glColor3usv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color3usv), %g2 or %g2, %lo(8 * _gloffset_Color3usv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color3usv)], %g3 #endif jmpl %g3, %g0 @@ -549,19 +580,20 @@ .globl glColor4b .type glColor4b,#function glColor4b: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4b), %g2 or %g2, %lo(8 * _gloffset_Color4b), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4b)], %g3 #endif jmpl %g3, %g0 @@ -570,19 +602,20 @@ .globl glColor4bv .type glColor4bv,#function glColor4bv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4bv), %g2 or %g2, %lo(8 * _gloffset_Color4bv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4bv)], %g3 #endif jmpl %g3, %g0 @@ -591,19 +624,20 @@ .globl glColor4d .type glColor4d,#function glColor4d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4d), %g2 or %g2, %lo(8 * _gloffset_Color4d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4d)], %g3 #endif jmpl %g3, %g0 @@ -612,19 +646,20 @@ .globl glColor4dv .type glColor4dv,#function glColor4dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4dv), %g2 or %g2, %lo(8 * _gloffset_Color4dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4dv)], %g3 #endif jmpl %g3, %g0 @@ -633,19 +668,20 @@ .globl glColor4f .type glColor4f,#function glColor4f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4f), %g2 or %g2, %lo(8 * _gloffset_Color4f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4f)], %g3 #endif jmpl %g3, %g0 @@ -654,19 +690,20 @@ .globl glColor4fv .type glColor4fv,#function glColor4fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4fv), %g2 or %g2, %lo(8 * _gloffset_Color4fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4fv)], %g3 #endif jmpl %g3, %g0 @@ -675,19 +712,20 @@ .globl glColor4i .type glColor4i,#function glColor4i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4i), %g2 or %g2, %lo(8 * _gloffset_Color4i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4i)], %g3 #endif jmpl %g3, %g0 @@ -696,19 +734,20 @@ .globl glColor4iv .type glColor4iv,#function glColor4iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4iv), %g2 or %g2, %lo(8 * _gloffset_Color4iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4iv)], %g3 #endif jmpl %g3, %g0 @@ -717,19 +756,20 @@ .globl glColor4s .type glColor4s,#function glColor4s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4s), %g2 or %g2, %lo(8 * _gloffset_Color4s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4s)], %g3 #endif jmpl %g3, %g0 @@ -738,19 +778,20 @@ .globl glColor4sv .type glColor4sv,#function glColor4sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4sv), %g2 or %g2, %lo(8 * _gloffset_Color4sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4sv)], %g3 #endif jmpl %g3, %g0 @@ -759,19 +800,20 @@ .globl glColor4ub .type glColor4ub,#function glColor4ub: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4ub), %g2 or %g2, %lo(8 * _gloffset_Color4ub), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4ub)], %g3 #endif jmpl %g3, %g0 @@ -780,19 +822,20 @@ .globl glColor4ubv .type glColor4ubv,#function glColor4ubv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4ubv), %g2 or %g2, %lo(8 * _gloffset_Color4ubv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4ubv)], %g3 #endif jmpl %g3, %g0 @@ -801,19 +844,20 @@ .globl glColor4ui .type glColor4ui,#function glColor4ui: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4ui), %g2 or %g2, %lo(8 * _gloffset_Color4ui), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4ui)], %g3 #endif jmpl %g3, %g0 @@ -822,19 +866,20 @@ .globl glColor4uiv .type glColor4uiv,#function glColor4uiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4uiv), %g2 or %g2, %lo(8 * _gloffset_Color4uiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4uiv)], %g3 #endif jmpl %g3, %g0 @@ -843,19 +888,20 @@ .globl glColor4us .type glColor4us,#function glColor4us: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4us), %g2 or %g2, %lo(8 * _gloffset_Color4us), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4us)], %g3 #endif jmpl %g3, %g0 @@ -864,19 +910,20 @@ .globl glColor4usv .type glColor4usv,#function glColor4usv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Color4usv), %g2 or %g2, %lo(8 * _gloffset_Color4usv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Color4usv)], %g3 #endif jmpl %g3, %g0 @@ -885,19 +932,20 @@ .globl glEdgeFlag .type glEdgeFlag,#function glEdgeFlag: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EdgeFlag), %g2 or %g2, %lo(8 * _gloffset_EdgeFlag), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EdgeFlag)], %g3 #endif jmpl %g3, %g0 @@ -906,19 +954,20 @@ .globl glEdgeFlagv .type glEdgeFlagv,#function glEdgeFlagv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EdgeFlagv), %g2 or %g2, %lo(8 * _gloffset_EdgeFlagv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EdgeFlagv)], %g3 #endif jmpl %g3, %g0 @@ -927,19 +976,20 @@ .globl glEnd .type glEnd,#function glEnd: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_End), %g2 or %g2, %lo(8 * _gloffset_End), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_End)], %g3 #endif jmpl %g3, %g0 @@ -948,19 +998,20 @@ .globl glIndexd .type glIndexd,#function glIndexd: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexd), %g2 or %g2, %lo(8 * _gloffset_Indexd), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexd)], %g3 #endif jmpl %g3, %g0 @@ -969,19 +1020,20 @@ .globl glIndexdv .type glIndexdv,#function glIndexdv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexdv), %g2 or %g2, %lo(8 * _gloffset_Indexdv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexdv)], %g3 #endif jmpl %g3, %g0 @@ -990,19 +1042,20 @@ .globl glIndexf .type glIndexf,#function glIndexf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexf), %g2 or %g2, %lo(8 * _gloffset_Indexf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexf)], %g3 #endif jmpl %g3, %g0 @@ -1011,19 +1064,20 @@ .globl glIndexfv .type glIndexfv,#function glIndexfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexfv), %g2 or %g2, %lo(8 * _gloffset_Indexfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexfv)], %g3 #endif jmpl %g3, %g0 @@ -1032,19 +1086,20 @@ .globl glIndexi .type glIndexi,#function glIndexi: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexi), %g2 or %g2, %lo(8 * _gloffset_Indexi), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexi)], %g3 #endif jmpl %g3, %g0 @@ -1053,19 +1108,20 @@ .globl glIndexiv .type glIndexiv,#function glIndexiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexiv), %g2 or %g2, %lo(8 * _gloffset_Indexiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexiv)], %g3 #endif jmpl %g3, %g0 @@ -1074,19 +1130,20 @@ .globl glIndexs .type glIndexs,#function glIndexs: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexs), %g2 or %g2, %lo(8 * _gloffset_Indexs), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexs)], %g3 #endif jmpl %g3, %g0 @@ -1095,19 +1152,20 @@ .globl glIndexsv .type glIndexsv,#function glIndexsv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexsv), %g2 or %g2, %lo(8 * _gloffset_Indexsv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexsv)], %g3 #endif jmpl %g3, %g0 @@ -1116,19 +1174,20 @@ .globl glNormal3b .type glNormal3b,#function glNormal3b: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3b), %g2 or %g2, %lo(8 * _gloffset_Normal3b), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3b)], %g3 #endif jmpl %g3, %g0 @@ -1137,19 +1196,20 @@ .globl glNormal3bv .type glNormal3bv,#function glNormal3bv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3bv), %g2 or %g2, %lo(8 * _gloffset_Normal3bv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3bv)], %g3 #endif jmpl %g3, %g0 @@ -1158,19 +1218,20 @@ .globl glNormal3d .type glNormal3d,#function glNormal3d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3d), %g2 or %g2, %lo(8 * _gloffset_Normal3d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3d)], %g3 #endif jmpl %g3, %g0 @@ -1179,19 +1240,20 @@ .globl glNormal3dv .type glNormal3dv,#function glNormal3dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3dv), %g2 or %g2, %lo(8 * _gloffset_Normal3dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3dv)], %g3 #endif jmpl %g3, %g0 @@ -1200,19 +1262,20 @@ .globl glNormal3f .type glNormal3f,#function glNormal3f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3f), %g2 or %g2, %lo(8 * _gloffset_Normal3f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3f)], %g3 #endif jmpl %g3, %g0 @@ -1221,19 +1284,20 @@ .globl glNormal3fv .type glNormal3fv,#function glNormal3fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3fv), %g2 or %g2, %lo(8 * _gloffset_Normal3fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3fv)], %g3 #endif jmpl %g3, %g0 @@ -1242,19 +1306,20 @@ .globl glNormal3i .type glNormal3i,#function glNormal3i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3i), %g2 or %g2, %lo(8 * _gloffset_Normal3i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3i)], %g3 #endif jmpl %g3, %g0 @@ -1263,19 +1328,20 @@ .globl glNormal3iv .type glNormal3iv,#function glNormal3iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3iv), %g2 or %g2, %lo(8 * _gloffset_Normal3iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3iv)], %g3 #endif jmpl %g3, %g0 @@ -1284,19 +1350,20 @@ .globl glNormal3s .type glNormal3s,#function glNormal3s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3s), %g2 or %g2, %lo(8 * _gloffset_Normal3s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3s)], %g3 #endif jmpl %g3, %g0 @@ -1305,19 +1372,20 @@ .globl glNormal3sv .type glNormal3sv,#function glNormal3sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Normal3sv), %g2 or %g2, %lo(8 * _gloffset_Normal3sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Normal3sv)], %g3 #endif jmpl %g3, %g0 @@ -1326,19 +1394,20 @@ .globl glRasterPos2d .type glRasterPos2d,#function glRasterPos2d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos2d), %g2 or %g2, %lo(8 * _gloffset_RasterPos2d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos2d)], %g3 #endif jmpl %g3, %g0 @@ -1347,19 +1416,20 @@ .globl glRasterPos2dv .type glRasterPos2dv,#function glRasterPos2dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos2dv), %g2 or %g2, %lo(8 * _gloffset_RasterPos2dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos2dv)], %g3 #endif jmpl %g3, %g0 @@ -1368,19 +1438,20 @@ .globl glRasterPos2f .type glRasterPos2f,#function glRasterPos2f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos2f), %g2 or %g2, %lo(8 * _gloffset_RasterPos2f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos2f)], %g3 #endif jmpl %g3, %g0 @@ -1389,19 +1460,20 @@ .globl glRasterPos2fv .type glRasterPos2fv,#function glRasterPos2fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos2fv), %g2 or %g2, %lo(8 * _gloffset_RasterPos2fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos2fv)], %g3 #endif jmpl %g3, %g0 @@ -1410,19 +1482,20 @@ .globl glRasterPos2i .type glRasterPos2i,#function glRasterPos2i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos2i), %g2 or %g2, %lo(8 * _gloffset_RasterPos2i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos2i)], %g3 #endif jmpl %g3, %g0 @@ -1431,19 +1504,20 @@ .globl glRasterPos2iv .type glRasterPos2iv,#function glRasterPos2iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos2iv), %g2 or %g2, %lo(8 * _gloffset_RasterPos2iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos2iv)], %g3 #endif jmpl %g3, %g0 @@ -1452,19 +1526,20 @@ .globl glRasterPos2s .type glRasterPos2s,#function glRasterPos2s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos2s), %g2 or %g2, %lo(8 * _gloffset_RasterPos2s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos2s)], %g3 #endif jmpl %g3, %g0 @@ -1473,19 +1548,20 @@ .globl glRasterPos2sv .type glRasterPos2sv,#function glRasterPos2sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos2sv), %g2 or %g2, %lo(8 * _gloffset_RasterPos2sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos2sv)], %g3 #endif jmpl %g3, %g0 @@ -1494,19 +1570,20 @@ .globl glRasterPos3d .type glRasterPos3d,#function glRasterPos3d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos3d), %g2 or %g2, %lo(8 * _gloffset_RasterPos3d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos3d)], %g3 #endif jmpl %g3, %g0 @@ -1515,19 +1592,20 @@ .globl glRasterPos3dv .type glRasterPos3dv,#function glRasterPos3dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos3dv), %g2 or %g2, %lo(8 * _gloffset_RasterPos3dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos3dv)], %g3 #endif jmpl %g3, %g0 @@ -1536,19 +1614,20 @@ .globl glRasterPos3f .type glRasterPos3f,#function glRasterPos3f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos3f), %g2 or %g2, %lo(8 * _gloffset_RasterPos3f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos3f)], %g3 #endif jmpl %g3, %g0 @@ -1557,19 +1636,20 @@ .globl glRasterPos3fv .type glRasterPos3fv,#function glRasterPos3fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos3fv), %g2 or %g2, %lo(8 * _gloffset_RasterPos3fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos3fv)], %g3 #endif jmpl %g3, %g0 @@ -1578,19 +1658,20 @@ .globl glRasterPos3i .type glRasterPos3i,#function glRasterPos3i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos3i), %g2 or %g2, %lo(8 * _gloffset_RasterPos3i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos3i)], %g3 #endif jmpl %g3, %g0 @@ -1599,19 +1680,20 @@ .globl glRasterPos3iv .type glRasterPos3iv,#function glRasterPos3iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos3iv), %g2 or %g2, %lo(8 * _gloffset_RasterPos3iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos3iv)], %g3 #endif jmpl %g3, %g0 @@ -1620,19 +1702,20 @@ .globl glRasterPos3s .type glRasterPos3s,#function glRasterPos3s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos3s), %g2 or %g2, %lo(8 * _gloffset_RasterPos3s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos3s)], %g3 #endif jmpl %g3, %g0 @@ -1641,19 +1724,20 @@ .globl glRasterPos3sv .type glRasterPos3sv,#function glRasterPos3sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos3sv), %g2 or %g2, %lo(8 * _gloffset_RasterPos3sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos3sv)], %g3 #endif jmpl %g3, %g0 @@ -1662,19 +1746,20 @@ .globl glRasterPos4d .type glRasterPos4d,#function glRasterPos4d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos4d), %g2 or %g2, %lo(8 * _gloffset_RasterPos4d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos4d)], %g3 #endif jmpl %g3, %g0 @@ -1683,19 +1768,20 @@ .globl glRasterPos4dv .type glRasterPos4dv,#function glRasterPos4dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos4dv), %g2 or %g2, %lo(8 * _gloffset_RasterPos4dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos4dv)], %g3 #endif jmpl %g3, %g0 @@ -1704,19 +1790,20 @@ .globl glRasterPos4f .type glRasterPos4f,#function glRasterPos4f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos4f), %g2 or %g2, %lo(8 * _gloffset_RasterPos4f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos4f)], %g3 #endif jmpl %g3, %g0 @@ -1725,19 +1812,20 @@ .globl glRasterPos4fv .type glRasterPos4fv,#function glRasterPos4fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos4fv), %g2 or %g2, %lo(8 * _gloffset_RasterPos4fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos4fv)], %g3 #endif jmpl %g3, %g0 @@ -1746,19 +1834,20 @@ .globl glRasterPos4i .type glRasterPos4i,#function glRasterPos4i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos4i), %g2 or %g2, %lo(8 * _gloffset_RasterPos4i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos4i)], %g3 #endif jmpl %g3, %g0 @@ -1767,19 +1856,20 @@ .globl glRasterPos4iv .type glRasterPos4iv,#function glRasterPos4iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos4iv), %g2 or %g2, %lo(8 * _gloffset_RasterPos4iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos4iv)], %g3 #endif jmpl %g3, %g0 @@ -1788,19 +1878,20 @@ .globl glRasterPos4s .type glRasterPos4s,#function glRasterPos4s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos4s), %g2 or %g2, %lo(8 * _gloffset_RasterPos4s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos4s)], %g3 #endif jmpl %g3, %g0 @@ -1809,19 +1900,20 @@ .globl glRasterPos4sv .type glRasterPos4sv,#function glRasterPos4sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RasterPos4sv), %g2 or %g2, %lo(8 * _gloffset_RasterPos4sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RasterPos4sv)], %g3 #endif jmpl %g3, %g0 @@ -1830,19 +1922,20 @@ .globl glRectd .type glRectd,#function glRectd: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rectd), %g2 or %g2, %lo(8 * _gloffset_Rectd), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rectd)], %g3 #endif jmpl %g3, %g0 @@ -1851,19 +1944,20 @@ .globl glRectdv .type glRectdv,#function glRectdv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rectdv), %g2 or %g2, %lo(8 * _gloffset_Rectdv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rectdv)], %g3 #endif jmpl %g3, %g0 @@ -1872,19 +1966,20 @@ .globl glRectf .type glRectf,#function glRectf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rectf), %g2 or %g2, %lo(8 * _gloffset_Rectf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rectf)], %g3 #endif jmpl %g3, %g0 @@ -1893,19 +1988,20 @@ .globl glRectfv .type glRectfv,#function glRectfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rectfv), %g2 or %g2, %lo(8 * _gloffset_Rectfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rectfv)], %g3 #endif jmpl %g3, %g0 @@ -1914,19 +2010,20 @@ .globl glRecti .type glRecti,#function glRecti: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Recti), %g2 or %g2, %lo(8 * _gloffset_Recti), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Recti)], %g3 #endif jmpl %g3, %g0 @@ -1935,19 +2032,20 @@ .globl glRectiv .type glRectiv,#function glRectiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rectiv), %g2 or %g2, %lo(8 * _gloffset_Rectiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rectiv)], %g3 #endif jmpl %g3, %g0 @@ -1956,19 +2054,20 @@ .globl glRects .type glRects,#function glRects: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rects), %g2 or %g2, %lo(8 * _gloffset_Rects), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rects)], %g3 #endif jmpl %g3, %g0 @@ -1977,19 +2076,20 @@ .globl glRectsv .type glRectsv,#function glRectsv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rectsv), %g2 or %g2, %lo(8 * _gloffset_Rectsv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rectsv)], %g3 #endif jmpl %g3, %g0 @@ -1998,19 +2098,20 @@ .globl glTexCoord1d .type glTexCoord1d,#function glTexCoord1d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord1d), %g2 or %g2, %lo(8 * _gloffset_TexCoord1d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord1d)], %g3 #endif jmpl %g3, %g0 @@ -2019,19 +2120,20 @@ .globl glTexCoord1dv .type glTexCoord1dv,#function glTexCoord1dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord1dv), %g2 or %g2, %lo(8 * _gloffset_TexCoord1dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord1dv)], %g3 #endif jmpl %g3, %g0 @@ -2040,19 +2142,20 @@ .globl glTexCoord1f .type glTexCoord1f,#function glTexCoord1f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord1f), %g2 or %g2, %lo(8 * _gloffset_TexCoord1f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord1f)], %g3 #endif jmpl %g3, %g0 @@ -2061,19 +2164,20 @@ .globl glTexCoord1fv .type glTexCoord1fv,#function glTexCoord1fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord1fv), %g2 or %g2, %lo(8 * _gloffset_TexCoord1fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord1fv)], %g3 #endif jmpl %g3, %g0 @@ -2082,19 +2186,20 @@ .globl glTexCoord1i .type glTexCoord1i,#function glTexCoord1i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord1i), %g2 or %g2, %lo(8 * _gloffset_TexCoord1i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord1i)], %g3 #endif jmpl %g3, %g0 @@ -2103,19 +2208,20 @@ .globl glTexCoord1iv .type glTexCoord1iv,#function glTexCoord1iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord1iv), %g2 or %g2, %lo(8 * _gloffset_TexCoord1iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord1iv)], %g3 #endif jmpl %g3, %g0 @@ -2124,19 +2230,20 @@ .globl glTexCoord1s .type glTexCoord1s,#function glTexCoord1s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord1s), %g2 or %g2, %lo(8 * _gloffset_TexCoord1s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord1s)], %g3 #endif jmpl %g3, %g0 @@ -2145,19 +2252,20 @@ .globl glTexCoord1sv .type glTexCoord1sv,#function glTexCoord1sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord1sv), %g2 or %g2, %lo(8 * _gloffset_TexCoord1sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord1sv)], %g3 #endif jmpl %g3, %g0 @@ -2166,19 +2274,20 @@ .globl glTexCoord2d .type glTexCoord2d,#function glTexCoord2d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord2d), %g2 or %g2, %lo(8 * _gloffset_TexCoord2d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord2d)], %g3 #endif jmpl %g3, %g0 @@ -2187,19 +2296,20 @@ .globl glTexCoord2dv .type glTexCoord2dv,#function glTexCoord2dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord2dv), %g2 or %g2, %lo(8 * _gloffset_TexCoord2dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord2dv)], %g3 #endif jmpl %g3, %g0 @@ -2208,19 +2318,20 @@ .globl glTexCoord2f .type glTexCoord2f,#function glTexCoord2f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord2f), %g2 or %g2, %lo(8 * _gloffset_TexCoord2f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord2f)], %g3 #endif jmpl %g3, %g0 @@ -2229,19 +2340,20 @@ .globl glTexCoord2fv .type glTexCoord2fv,#function glTexCoord2fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord2fv), %g2 or %g2, %lo(8 * _gloffset_TexCoord2fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord2fv)], %g3 #endif jmpl %g3, %g0 @@ -2250,19 +2362,20 @@ .globl glTexCoord2i .type glTexCoord2i,#function glTexCoord2i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord2i), %g2 or %g2, %lo(8 * _gloffset_TexCoord2i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord2i)], %g3 #endif jmpl %g3, %g0 @@ -2271,19 +2384,20 @@ .globl glTexCoord2iv .type glTexCoord2iv,#function glTexCoord2iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord2iv), %g2 or %g2, %lo(8 * _gloffset_TexCoord2iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord2iv)], %g3 #endif jmpl %g3, %g0 @@ -2292,19 +2406,20 @@ .globl glTexCoord2s .type glTexCoord2s,#function glTexCoord2s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord2s), %g2 or %g2, %lo(8 * _gloffset_TexCoord2s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord2s)], %g3 #endif jmpl %g3, %g0 @@ -2313,19 +2428,20 @@ .globl glTexCoord2sv .type glTexCoord2sv,#function glTexCoord2sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord2sv), %g2 or %g2, %lo(8 * _gloffset_TexCoord2sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord2sv)], %g3 #endif jmpl %g3, %g0 @@ -2334,19 +2450,20 @@ .globl glTexCoord3d .type glTexCoord3d,#function glTexCoord3d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord3d), %g2 or %g2, %lo(8 * _gloffset_TexCoord3d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord3d)], %g3 #endif jmpl %g3, %g0 @@ -2355,19 +2472,20 @@ .globl glTexCoord3dv .type glTexCoord3dv,#function glTexCoord3dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord3dv), %g2 or %g2, %lo(8 * _gloffset_TexCoord3dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord3dv)], %g3 #endif jmpl %g3, %g0 @@ -2376,19 +2494,20 @@ .globl glTexCoord3f .type glTexCoord3f,#function glTexCoord3f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord3f), %g2 or %g2, %lo(8 * _gloffset_TexCoord3f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord3f)], %g3 #endif jmpl %g3, %g0 @@ -2397,19 +2516,20 @@ .globl glTexCoord3fv .type glTexCoord3fv,#function glTexCoord3fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord3fv), %g2 or %g2, %lo(8 * _gloffset_TexCoord3fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord3fv)], %g3 #endif jmpl %g3, %g0 @@ -2418,19 +2538,20 @@ .globl glTexCoord3i .type glTexCoord3i,#function glTexCoord3i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord3i), %g2 or %g2, %lo(8 * _gloffset_TexCoord3i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord3i)], %g3 #endif jmpl %g3, %g0 @@ -2439,19 +2560,20 @@ .globl glTexCoord3iv .type glTexCoord3iv,#function glTexCoord3iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord3iv), %g2 or %g2, %lo(8 * _gloffset_TexCoord3iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord3iv)], %g3 #endif jmpl %g3, %g0 @@ -2460,19 +2582,20 @@ .globl glTexCoord3s .type glTexCoord3s,#function glTexCoord3s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord3s), %g2 or %g2, %lo(8 * _gloffset_TexCoord3s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord3s)], %g3 #endif jmpl %g3, %g0 @@ -2481,19 +2604,20 @@ .globl glTexCoord3sv .type glTexCoord3sv,#function glTexCoord3sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord3sv), %g2 or %g2, %lo(8 * _gloffset_TexCoord3sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord3sv)], %g3 #endif jmpl %g3, %g0 @@ -2502,19 +2626,20 @@ .globl glTexCoord4d .type glTexCoord4d,#function glTexCoord4d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord4d), %g2 or %g2, %lo(8 * _gloffset_TexCoord4d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord4d)], %g3 #endif jmpl %g3, %g0 @@ -2523,19 +2648,20 @@ .globl glTexCoord4dv .type glTexCoord4dv,#function glTexCoord4dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord4dv), %g2 or %g2, %lo(8 * _gloffset_TexCoord4dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord4dv)], %g3 #endif jmpl %g3, %g0 @@ -2544,19 +2670,20 @@ .globl glTexCoord4f .type glTexCoord4f,#function glTexCoord4f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord4f), %g2 or %g2, %lo(8 * _gloffset_TexCoord4f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord4f)], %g3 #endif jmpl %g3, %g0 @@ -2565,19 +2692,20 @@ .globl glTexCoord4fv .type glTexCoord4fv,#function glTexCoord4fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord4fv), %g2 or %g2, %lo(8 * _gloffset_TexCoord4fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord4fv)], %g3 #endif jmpl %g3, %g0 @@ -2586,19 +2714,20 @@ .globl glTexCoord4i .type glTexCoord4i,#function glTexCoord4i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord4i), %g2 or %g2, %lo(8 * _gloffset_TexCoord4i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord4i)], %g3 #endif jmpl %g3, %g0 @@ -2607,19 +2736,20 @@ .globl glTexCoord4iv .type glTexCoord4iv,#function glTexCoord4iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord4iv), %g2 or %g2, %lo(8 * _gloffset_TexCoord4iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord4iv)], %g3 #endif jmpl %g3, %g0 @@ -2628,19 +2758,20 @@ .globl glTexCoord4s .type glTexCoord4s,#function glTexCoord4s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord4s), %g2 or %g2, %lo(8 * _gloffset_TexCoord4s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord4s)], %g3 #endif jmpl %g3, %g0 @@ -2649,19 +2780,20 @@ .globl glTexCoord4sv .type glTexCoord4sv,#function glTexCoord4sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoord4sv), %g2 or %g2, %lo(8 * _gloffset_TexCoord4sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoord4sv)], %g3 #endif jmpl %g3, %g0 @@ -2670,19 +2802,20 @@ .globl glVertex2d .type glVertex2d,#function glVertex2d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex2d), %g2 or %g2, %lo(8 * _gloffset_Vertex2d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex2d)], %g3 #endif jmpl %g3, %g0 @@ -2691,19 +2824,20 @@ .globl glVertex2dv .type glVertex2dv,#function glVertex2dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex2dv), %g2 or %g2, %lo(8 * _gloffset_Vertex2dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex2dv)], %g3 #endif jmpl %g3, %g0 @@ -2712,19 +2846,20 @@ .globl glVertex2f .type glVertex2f,#function glVertex2f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex2f), %g2 or %g2, %lo(8 * _gloffset_Vertex2f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex2f)], %g3 #endif jmpl %g3, %g0 @@ -2733,19 +2868,20 @@ .globl glVertex2fv .type glVertex2fv,#function glVertex2fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex2fv), %g2 or %g2, %lo(8 * _gloffset_Vertex2fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex2fv)], %g3 #endif jmpl %g3, %g0 @@ -2754,19 +2890,20 @@ .globl glVertex2i .type glVertex2i,#function glVertex2i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex2i), %g2 or %g2, %lo(8 * _gloffset_Vertex2i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex2i)], %g3 #endif jmpl %g3, %g0 @@ -2775,19 +2912,20 @@ .globl glVertex2iv .type glVertex2iv,#function glVertex2iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex2iv), %g2 or %g2, %lo(8 * _gloffset_Vertex2iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex2iv)], %g3 #endif jmpl %g3, %g0 @@ -2796,19 +2934,20 @@ .globl glVertex2s .type glVertex2s,#function glVertex2s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex2s), %g2 or %g2, %lo(8 * _gloffset_Vertex2s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex2s)], %g3 #endif jmpl %g3, %g0 @@ -2817,19 +2956,20 @@ .globl glVertex2sv .type glVertex2sv,#function glVertex2sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex2sv), %g2 or %g2, %lo(8 * _gloffset_Vertex2sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex2sv)], %g3 #endif jmpl %g3, %g0 @@ -2838,19 +2978,20 @@ .globl glVertex3d .type glVertex3d,#function glVertex3d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex3d), %g2 or %g2, %lo(8 * _gloffset_Vertex3d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex3d)], %g3 #endif jmpl %g3, %g0 @@ -2859,19 +3000,20 @@ .globl glVertex3dv .type glVertex3dv,#function glVertex3dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex3dv), %g2 or %g2, %lo(8 * _gloffset_Vertex3dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex3dv)], %g3 #endif jmpl %g3, %g0 @@ -2880,19 +3022,20 @@ .globl glVertex3f .type glVertex3f,#function glVertex3f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex3f), %g2 or %g2, %lo(8 * _gloffset_Vertex3f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex3f)], %g3 #endif jmpl %g3, %g0 @@ -2901,19 +3044,20 @@ .globl glVertex3fv .type glVertex3fv,#function glVertex3fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex3fv), %g2 or %g2, %lo(8 * _gloffset_Vertex3fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex3fv)], %g3 #endif jmpl %g3, %g0 @@ -2922,19 +3066,20 @@ .globl glVertex3i .type glVertex3i,#function glVertex3i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex3i), %g2 or %g2, %lo(8 * _gloffset_Vertex3i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex3i)], %g3 #endif jmpl %g3, %g0 @@ -2943,19 +3088,20 @@ .globl glVertex3iv .type glVertex3iv,#function glVertex3iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex3iv), %g2 or %g2, %lo(8 * _gloffset_Vertex3iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex3iv)], %g3 #endif jmpl %g3, %g0 @@ -2964,19 +3110,20 @@ .globl glVertex3s .type glVertex3s,#function glVertex3s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex3s), %g2 or %g2, %lo(8 * _gloffset_Vertex3s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex3s)], %g3 #endif jmpl %g3, %g0 @@ -2985,19 +3132,20 @@ .globl glVertex3sv .type glVertex3sv,#function glVertex3sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex3sv), %g2 or %g2, %lo(8 * _gloffset_Vertex3sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex3sv)], %g3 #endif jmpl %g3, %g0 @@ -3006,19 +3154,20 @@ .globl glVertex4d .type glVertex4d,#function glVertex4d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex4d), %g2 or %g2, %lo(8 * _gloffset_Vertex4d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex4d)], %g3 #endif jmpl %g3, %g0 @@ -3027,19 +3176,20 @@ .globl glVertex4dv .type glVertex4dv,#function glVertex4dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex4dv), %g2 or %g2, %lo(8 * _gloffset_Vertex4dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex4dv)], %g3 #endif jmpl %g3, %g0 @@ -3048,19 +3198,20 @@ .globl glVertex4f .type glVertex4f,#function glVertex4f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex4f), %g2 or %g2, %lo(8 * _gloffset_Vertex4f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex4f)], %g3 #endif jmpl %g3, %g0 @@ -3069,19 +3220,20 @@ .globl glVertex4fv .type glVertex4fv,#function glVertex4fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex4fv), %g2 or %g2, %lo(8 * _gloffset_Vertex4fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex4fv)], %g3 #endif jmpl %g3, %g0 @@ -3090,19 +3242,20 @@ .globl glVertex4i .type glVertex4i,#function glVertex4i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex4i), %g2 or %g2, %lo(8 * _gloffset_Vertex4i), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex4i)], %g3 #endif jmpl %g3, %g0 @@ -3111,19 +3264,20 @@ .globl glVertex4iv .type glVertex4iv,#function glVertex4iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex4iv), %g2 or %g2, %lo(8 * _gloffset_Vertex4iv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex4iv)], %g3 #endif jmpl %g3, %g0 @@ -3132,19 +3286,20 @@ .globl glVertex4s .type glVertex4s,#function glVertex4s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex4s), %g2 or %g2, %lo(8 * _gloffset_Vertex4s), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex4s)], %g3 #endif jmpl %g3, %g0 @@ -3153,19 +3308,20 @@ .globl glVertex4sv .type glVertex4sv,#function glVertex4sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Vertex4sv), %g2 or %g2, %lo(8 * _gloffset_Vertex4sv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Vertex4sv)], %g3 #endif jmpl %g3, %g0 @@ -3174,19 +3330,20 @@ .globl glClipPlane .type glClipPlane,#function glClipPlane: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ClipPlane), %g2 or %g2, %lo(8 * _gloffset_ClipPlane), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ClipPlane)], %g3 #endif jmpl %g3, %g0 @@ -3195,19 +3352,20 @@ .globl glColorMaterial .type glColorMaterial,#function glColorMaterial: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorMaterial), %g2 or %g2, %lo(8 * _gloffset_ColorMaterial), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorMaterial)], %g3 #endif jmpl %g3, %g0 @@ -3216,19 +3374,20 @@ .globl glCullFace .type glCullFace,#function glCullFace: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CullFace), %g2 or %g2, %lo(8 * _gloffset_CullFace), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CullFace)], %g3 #endif jmpl %g3, %g0 @@ -3237,19 +3396,20 @@ .globl glFogf .type glFogf,#function glFogf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Fogf), %g2 or %g2, %lo(8 * _gloffset_Fogf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Fogf)], %g3 #endif jmpl %g3, %g0 @@ -3258,19 +3418,20 @@ .globl glFogfv .type glFogfv,#function glFogfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Fogfv), %g2 or %g2, %lo(8 * _gloffset_Fogfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Fogfv)], %g3 #endif jmpl %g3, %g0 @@ -3279,19 +3440,20 @@ .globl glFogi .type glFogi,#function glFogi: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Fogi), %g2 or %g2, %lo(8 * _gloffset_Fogi), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Fogi)], %g3 #endif jmpl %g3, %g0 @@ -3300,19 +3462,20 @@ .globl glFogiv .type glFogiv,#function glFogiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Fogiv), %g2 or %g2, %lo(8 * _gloffset_Fogiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Fogiv)], %g3 #endif jmpl %g3, %g0 @@ -3321,19 +3484,20 @@ .globl glFrontFace .type glFrontFace,#function glFrontFace: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FrontFace), %g2 or %g2, %lo(8 * _gloffset_FrontFace), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FrontFace)], %g3 #endif jmpl %g3, %g0 @@ -3342,19 +3506,20 @@ .globl glHint .type glHint,#function glHint: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Hint), %g2 or %g2, %lo(8 * _gloffset_Hint), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Hint)], %g3 #endif jmpl %g3, %g0 @@ -3363,19 +3528,20 @@ .globl glLightf .type glLightf,#function glLightf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Lightf), %g2 or %g2, %lo(8 * _gloffset_Lightf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Lightf)], %g3 #endif jmpl %g3, %g0 @@ -3384,19 +3550,20 @@ .globl glLightfv .type glLightfv,#function glLightfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Lightfv), %g2 or %g2, %lo(8 * _gloffset_Lightfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Lightfv)], %g3 #endif jmpl %g3, %g0 @@ -3405,19 +3572,20 @@ .globl glLighti .type glLighti,#function glLighti: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Lighti), %g2 or %g2, %lo(8 * _gloffset_Lighti), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Lighti)], %g3 #endif jmpl %g3, %g0 @@ -3426,19 +3594,20 @@ .globl glLightiv .type glLightiv,#function glLightiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Lightiv), %g2 or %g2, %lo(8 * _gloffset_Lightiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Lightiv)], %g3 #endif jmpl %g3, %g0 @@ -3447,19 +3616,20 @@ .globl glLightModelf .type glLightModelf,#function glLightModelf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LightModelf), %g2 or %g2, %lo(8 * _gloffset_LightModelf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LightModelf)], %g3 #endif jmpl %g3, %g0 @@ -3468,19 +3638,20 @@ .globl glLightModelfv .type glLightModelfv,#function glLightModelfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LightModelfv), %g2 or %g2, %lo(8 * _gloffset_LightModelfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LightModelfv)], %g3 #endif jmpl %g3, %g0 @@ -3489,19 +3660,20 @@ .globl glLightModeli .type glLightModeli,#function glLightModeli: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LightModeli), %g2 or %g2, %lo(8 * _gloffset_LightModeli), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LightModeli)], %g3 #endif jmpl %g3, %g0 @@ -3510,19 +3682,20 @@ .globl glLightModeliv .type glLightModeliv,#function glLightModeliv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LightModeliv), %g2 or %g2, %lo(8 * _gloffset_LightModeliv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LightModeliv)], %g3 #endif jmpl %g3, %g0 @@ -3531,19 +3704,20 @@ .globl glLineStipple .type glLineStipple,#function glLineStipple: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LineStipple), %g2 or %g2, %lo(8 * _gloffset_LineStipple), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LineStipple)], %g3 #endif jmpl %g3, %g0 @@ -3552,19 +3726,20 @@ .globl glLineWidth .type glLineWidth,#function glLineWidth: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LineWidth), %g2 or %g2, %lo(8 * _gloffset_LineWidth), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LineWidth)], %g3 #endif jmpl %g3, %g0 @@ -3573,19 +3748,20 @@ .globl glMaterialf .type glMaterialf,#function glMaterialf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Materialf), %g2 or %g2, %lo(8 * _gloffset_Materialf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Materialf)], %g3 #endif jmpl %g3, %g0 @@ -3594,19 +3770,20 @@ .globl glMaterialfv .type glMaterialfv,#function glMaterialfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Materialfv), %g2 or %g2, %lo(8 * _gloffset_Materialfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Materialfv)], %g3 #endif jmpl %g3, %g0 @@ -3615,19 +3792,20 @@ .globl glMateriali .type glMateriali,#function glMateriali: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Materiali), %g2 or %g2, %lo(8 * _gloffset_Materiali), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Materiali)], %g3 #endif jmpl %g3, %g0 @@ -3636,19 +3814,20 @@ .globl glMaterialiv .type glMaterialiv,#function glMaterialiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Materialiv), %g2 or %g2, %lo(8 * _gloffset_Materialiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Materialiv)], %g3 #endif jmpl %g3, %g0 @@ -3657,19 +3836,20 @@ .globl glPointSize .type glPointSize,#function glPointSize: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointSize), %g2 or %g2, %lo(8 * _gloffset_PointSize), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointSize)], %g3 #endif jmpl %g3, %g0 @@ -3678,19 +3858,20 @@ .globl glPolygonMode .type glPolygonMode,#function glPolygonMode: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PolygonMode), %g2 or %g2, %lo(8 * _gloffset_PolygonMode), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PolygonMode)], %g3 #endif jmpl %g3, %g0 @@ -3699,19 +3880,20 @@ .globl glPolygonStipple .type glPolygonStipple,#function glPolygonStipple: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PolygonStipple), %g2 or %g2, %lo(8 * _gloffset_PolygonStipple), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PolygonStipple)], %g3 #endif jmpl %g3, %g0 @@ -3720,19 +3902,20 @@ .globl glScissor .type glScissor,#function glScissor: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Scissor), %g2 or %g2, %lo(8 * _gloffset_Scissor), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Scissor)], %g3 #endif jmpl %g3, %g0 @@ -3741,19 +3924,20 @@ .globl glShadeModel .type glShadeModel,#function glShadeModel: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ShadeModel), %g2 or %g2, %lo(8 * _gloffset_ShadeModel), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ShadeModel)], %g3 #endif jmpl %g3, %g0 @@ -3762,19 +3946,20 @@ .globl glTexParameterf .type glTexParameterf,#function glTexParameterf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexParameterf), %g2 or %g2, %lo(8 * _gloffset_TexParameterf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexParameterf)], %g3 #endif jmpl %g3, %g0 @@ -3783,19 +3968,20 @@ .globl glTexParameterfv .type glTexParameterfv,#function glTexParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexParameterfv), %g2 or %g2, %lo(8 * _gloffset_TexParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -3804,19 +3990,20 @@ .globl glTexParameteri .type glTexParameteri,#function glTexParameteri: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexParameteri), %g2 or %g2, %lo(8 * _gloffset_TexParameteri), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexParameteri)], %g3 #endif jmpl %g3, %g0 @@ -3825,19 +4012,20 @@ .globl glTexParameteriv .type glTexParameteriv,#function glTexParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexParameteriv), %g2 or %g2, %lo(8 * _gloffset_TexParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -3846,19 +4034,20 @@ .globl glTexImage1D .type glTexImage1D,#function glTexImage1D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexImage1D), %g2 or %g2, %lo(8 * _gloffset_TexImage1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexImage1D)], %g3 #endif jmpl %g3, %g0 @@ -3867,19 +4056,20 @@ .globl glTexImage2D .type glTexImage2D,#function glTexImage2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexImage2D), %g2 or %g2, %lo(8 * _gloffset_TexImage2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexImage2D)], %g3 #endif jmpl %g3, %g0 @@ -3888,19 +4078,20 @@ .globl glTexEnvf .type glTexEnvf,#function glTexEnvf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexEnvf), %g2 or %g2, %lo(8 * _gloffset_TexEnvf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexEnvf)], %g3 #endif jmpl %g3, %g0 @@ -3909,19 +4100,20 @@ .globl glTexEnvfv .type glTexEnvfv,#function glTexEnvfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexEnvfv), %g2 or %g2, %lo(8 * _gloffset_TexEnvfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexEnvfv)], %g3 #endif jmpl %g3, %g0 @@ -3930,19 +4122,20 @@ .globl glTexEnvi .type glTexEnvi,#function glTexEnvi: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexEnvi), %g2 or %g2, %lo(8 * _gloffset_TexEnvi), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexEnvi)], %g3 #endif jmpl %g3, %g0 @@ -3951,19 +4144,20 @@ .globl glTexEnviv .type glTexEnviv,#function glTexEnviv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexEnviv), %g2 or %g2, %lo(8 * _gloffset_TexEnviv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexEnviv)], %g3 #endif jmpl %g3, %g0 @@ -3972,19 +4166,20 @@ .globl glTexGend .type glTexGend,#function glTexGend: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexGend), %g2 or %g2, %lo(8 * _gloffset_TexGend), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexGend)], %g3 #endif jmpl %g3, %g0 @@ -3993,19 +4188,20 @@ .globl glTexGendv .type glTexGendv,#function glTexGendv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexGendv), %g2 or %g2, %lo(8 * _gloffset_TexGendv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexGendv)], %g3 #endif jmpl %g3, %g0 @@ -4014,19 +4210,20 @@ .globl glTexGenf .type glTexGenf,#function glTexGenf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexGenf), %g2 or %g2, %lo(8 * _gloffset_TexGenf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexGenf)], %g3 #endif jmpl %g3, %g0 @@ -4035,19 +4232,20 @@ .globl glTexGenfv .type glTexGenfv,#function glTexGenfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexGenfv), %g2 or %g2, %lo(8 * _gloffset_TexGenfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexGenfv)], %g3 #endif jmpl %g3, %g0 @@ -4056,19 +4254,20 @@ .globl glTexGeni .type glTexGeni,#function glTexGeni: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexGeni), %g2 or %g2, %lo(8 * _gloffset_TexGeni), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexGeni)], %g3 #endif jmpl %g3, %g0 @@ -4077,19 +4276,20 @@ .globl glTexGeniv .type glTexGeniv,#function glTexGeniv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexGeniv), %g2 or %g2, %lo(8 * _gloffset_TexGeniv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexGeniv)], %g3 #endif jmpl %g3, %g0 @@ -4098,19 +4298,20 @@ .globl glFeedbackBuffer .type glFeedbackBuffer,#function glFeedbackBuffer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FeedbackBuffer), %g2 or %g2, %lo(8 * _gloffset_FeedbackBuffer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FeedbackBuffer)], %g3 #endif jmpl %g3, %g0 @@ -4119,19 +4320,20 @@ .globl glSelectBuffer .type glSelectBuffer,#function glSelectBuffer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SelectBuffer), %g2 or %g2, %lo(8 * _gloffset_SelectBuffer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SelectBuffer)], %g3 #endif jmpl %g3, %g0 @@ -4140,19 +4342,20 @@ .globl glRenderMode .type glRenderMode,#function glRenderMode: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RenderMode), %g2 or %g2, %lo(8 * _gloffset_RenderMode), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RenderMode)], %g3 #endif jmpl %g3, %g0 @@ -4161,19 +4364,20 @@ .globl glInitNames .type glInitNames,#function glInitNames: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_InitNames), %g2 or %g2, %lo(8 * _gloffset_InitNames), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_InitNames)], %g3 #endif jmpl %g3, %g0 @@ -4182,19 +4386,20 @@ .globl glLoadName .type glLoadName,#function glLoadName: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadName), %g2 or %g2, %lo(8 * _gloffset_LoadName), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadName)], %g3 #endif jmpl %g3, %g0 @@ -4203,19 +4408,20 @@ .globl glPassThrough .type glPassThrough,#function glPassThrough: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PassThrough), %g2 or %g2, %lo(8 * _gloffset_PassThrough), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PassThrough)], %g3 #endif jmpl %g3, %g0 @@ -4224,19 +4430,20 @@ .globl glPopName .type glPopName,#function glPopName: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PopName), %g2 or %g2, %lo(8 * _gloffset_PopName), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PopName)], %g3 #endif jmpl %g3, %g0 @@ -4245,19 +4452,20 @@ .globl glPushName .type glPushName,#function glPushName: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PushName), %g2 or %g2, %lo(8 * _gloffset_PushName), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PushName)], %g3 #endif jmpl %g3, %g0 @@ -4266,19 +4474,20 @@ .globl glDrawBuffer .type glDrawBuffer,#function glDrawBuffer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DrawBuffer), %g2 or %g2, %lo(8 * _gloffset_DrawBuffer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DrawBuffer)], %g3 #endif jmpl %g3, %g0 @@ -4287,19 +4496,20 @@ .globl glClear .type glClear,#function glClear: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Clear), %g2 or %g2, %lo(8 * _gloffset_Clear), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Clear)], %g3 #endif jmpl %g3, %g0 @@ -4308,19 +4518,20 @@ .globl glClearAccum .type glClearAccum,#function glClearAccum: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ClearAccum), %g2 or %g2, %lo(8 * _gloffset_ClearAccum), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ClearAccum)], %g3 #endif jmpl %g3, %g0 @@ -4329,19 +4540,20 @@ .globl glClearIndex .type glClearIndex,#function glClearIndex: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ClearIndex), %g2 or %g2, %lo(8 * _gloffset_ClearIndex), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ClearIndex)], %g3 #endif jmpl %g3, %g0 @@ -4350,19 +4562,20 @@ .globl glClearColor .type glClearColor,#function glClearColor: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ClearColor), %g2 or %g2, %lo(8 * _gloffset_ClearColor), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ClearColor)], %g3 #endif jmpl %g3, %g0 @@ -4371,19 +4584,20 @@ .globl glClearStencil .type glClearStencil,#function glClearStencil: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ClearStencil), %g2 or %g2, %lo(8 * _gloffset_ClearStencil), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ClearStencil)], %g3 #endif jmpl %g3, %g0 @@ -4392,19 +4606,20 @@ .globl glClearDepth .type glClearDepth,#function glClearDepth: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ClearDepth), %g2 or %g2, %lo(8 * _gloffset_ClearDepth), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ClearDepth)], %g3 #endif jmpl %g3, %g0 @@ -4413,19 +4628,20 @@ .globl glStencilMask .type glStencilMask,#function glStencilMask: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_StencilMask), %g2 or %g2, %lo(8 * _gloffset_StencilMask), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_StencilMask)], %g3 #endif jmpl %g3, %g0 @@ -4434,19 +4650,20 @@ .globl glColorMask .type glColorMask,#function glColorMask: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorMask), %g2 or %g2, %lo(8 * _gloffset_ColorMask), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorMask)], %g3 #endif jmpl %g3, %g0 @@ -4455,19 +4672,20 @@ .globl glDepthMask .type glDepthMask,#function glDepthMask: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DepthMask), %g2 or %g2, %lo(8 * _gloffset_DepthMask), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DepthMask)], %g3 #endif jmpl %g3, %g0 @@ -4476,19 +4694,20 @@ .globl glIndexMask .type glIndexMask,#function glIndexMask: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IndexMask), %g2 or %g2, %lo(8 * _gloffset_IndexMask), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IndexMask)], %g3 #endif jmpl %g3, %g0 @@ -4497,19 +4716,20 @@ .globl glAccum .type glAccum,#function glAccum: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Accum), %g2 or %g2, %lo(8 * _gloffset_Accum), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Accum)], %g3 #endif jmpl %g3, %g0 @@ -4518,19 +4738,20 @@ .globl glDisable .type glDisable,#function glDisable: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Disable), %g2 or %g2, %lo(8 * _gloffset_Disable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Disable)], %g3 #endif jmpl %g3, %g0 @@ -4539,19 +4760,20 @@ .globl glEnable .type glEnable,#function glEnable: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Enable), %g2 or %g2, %lo(8 * _gloffset_Enable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Enable)], %g3 #endif jmpl %g3, %g0 @@ -4560,19 +4782,20 @@ .globl glFinish .type glFinish,#function glFinish: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Finish), %g2 or %g2, %lo(8 * _gloffset_Finish), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Finish)], %g3 #endif jmpl %g3, %g0 @@ -4581,19 +4804,20 @@ .globl glFlush .type glFlush,#function glFlush: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Flush), %g2 or %g2, %lo(8 * _gloffset_Flush), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Flush)], %g3 #endif jmpl %g3, %g0 @@ -4602,19 +4826,20 @@ .globl glPopAttrib .type glPopAttrib,#function glPopAttrib: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PopAttrib), %g2 or %g2, %lo(8 * _gloffset_PopAttrib), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PopAttrib)], %g3 #endif jmpl %g3, %g0 @@ -4623,19 +4848,20 @@ .globl glPushAttrib .type glPushAttrib,#function glPushAttrib: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PushAttrib), %g2 or %g2, %lo(8 * _gloffset_PushAttrib), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PushAttrib)], %g3 #endif jmpl %g3, %g0 @@ -4644,19 +4870,20 @@ .globl glMap1d .type glMap1d,#function glMap1d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Map1d), %g2 or %g2, %lo(8 * _gloffset_Map1d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Map1d)], %g3 #endif jmpl %g3, %g0 @@ -4665,19 +4892,20 @@ .globl glMap1f .type glMap1f,#function glMap1f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Map1f), %g2 or %g2, %lo(8 * _gloffset_Map1f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Map1f)], %g3 #endif jmpl %g3, %g0 @@ -4686,19 +4914,20 @@ .globl glMap2d .type glMap2d,#function glMap2d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Map2d), %g2 or %g2, %lo(8 * _gloffset_Map2d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Map2d)], %g3 #endif jmpl %g3, %g0 @@ -4707,19 +4936,20 @@ .globl glMap2f .type glMap2f,#function glMap2f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Map2f), %g2 or %g2, %lo(8 * _gloffset_Map2f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Map2f)], %g3 #endif jmpl %g3, %g0 @@ -4728,19 +4958,20 @@ .globl glMapGrid1d .type glMapGrid1d,#function glMapGrid1d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MapGrid1d), %g2 or %g2, %lo(8 * _gloffset_MapGrid1d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MapGrid1d)], %g3 #endif jmpl %g3, %g0 @@ -4749,19 +4980,20 @@ .globl glMapGrid1f .type glMapGrid1f,#function glMapGrid1f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MapGrid1f), %g2 or %g2, %lo(8 * _gloffset_MapGrid1f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MapGrid1f)], %g3 #endif jmpl %g3, %g0 @@ -4770,19 +5002,20 @@ .globl glMapGrid2d .type glMapGrid2d,#function glMapGrid2d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MapGrid2d), %g2 or %g2, %lo(8 * _gloffset_MapGrid2d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MapGrid2d)], %g3 #endif jmpl %g3, %g0 @@ -4791,19 +5024,20 @@ .globl glMapGrid2f .type glMapGrid2f,#function glMapGrid2f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MapGrid2f), %g2 or %g2, %lo(8 * _gloffset_MapGrid2f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MapGrid2f)], %g3 #endif jmpl %g3, %g0 @@ -4812,19 +5046,20 @@ .globl glEvalCoord1d .type glEvalCoord1d,#function glEvalCoord1d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalCoord1d), %g2 or %g2, %lo(8 * _gloffset_EvalCoord1d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalCoord1d)], %g3 #endif jmpl %g3, %g0 @@ -4833,19 +5068,20 @@ .globl glEvalCoord1dv .type glEvalCoord1dv,#function glEvalCoord1dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalCoord1dv), %g2 or %g2, %lo(8 * _gloffset_EvalCoord1dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalCoord1dv)], %g3 #endif jmpl %g3, %g0 @@ -4854,19 +5090,20 @@ .globl glEvalCoord1f .type glEvalCoord1f,#function glEvalCoord1f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalCoord1f), %g2 or %g2, %lo(8 * _gloffset_EvalCoord1f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalCoord1f)], %g3 #endif jmpl %g3, %g0 @@ -4875,19 +5112,20 @@ .globl glEvalCoord1fv .type glEvalCoord1fv,#function glEvalCoord1fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalCoord1fv), %g2 or %g2, %lo(8 * _gloffset_EvalCoord1fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalCoord1fv)], %g3 #endif jmpl %g3, %g0 @@ -4896,19 +5134,20 @@ .globl glEvalCoord2d .type glEvalCoord2d,#function glEvalCoord2d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalCoord2d), %g2 or %g2, %lo(8 * _gloffset_EvalCoord2d), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalCoord2d)], %g3 #endif jmpl %g3, %g0 @@ -4917,19 +5156,20 @@ .globl glEvalCoord2dv .type glEvalCoord2dv,#function glEvalCoord2dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalCoord2dv), %g2 or %g2, %lo(8 * _gloffset_EvalCoord2dv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalCoord2dv)], %g3 #endif jmpl %g3, %g0 @@ -4938,19 +5178,20 @@ .globl glEvalCoord2f .type glEvalCoord2f,#function glEvalCoord2f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalCoord2f), %g2 or %g2, %lo(8 * _gloffset_EvalCoord2f), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalCoord2f)], %g3 #endif jmpl %g3, %g0 @@ -4959,19 +5200,20 @@ .globl glEvalCoord2fv .type glEvalCoord2fv,#function glEvalCoord2fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalCoord2fv), %g2 or %g2, %lo(8 * _gloffset_EvalCoord2fv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalCoord2fv)], %g3 #endif jmpl %g3, %g0 @@ -4980,19 +5222,20 @@ .globl glEvalMesh1 .type glEvalMesh1,#function glEvalMesh1: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalMesh1), %g2 or %g2, %lo(8 * _gloffset_EvalMesh1), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalMesh1)], %g3 #endif jmpl %g3, %g0 @@ -5001,19 +5244,20 @@ .globl glEvalPoint1 .type glEvalPoint1,#function glEvalPoint1: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalPoint1), %g2 or %g2, %lo(8 * _gloffset_EvalPoint1), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalPoint1)], %g3 #endif jmpl %g3, %g0 @@ -5022,19 +5266,20 @@ .globl glEvalMesh2 .type glEvalMesh2,#function glEvalMesh2: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalMesh2), %g2 or %g2, %lo(8 * _gloffset_EvalMesh2), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalMesh2)], %g3 #endif jmpl %g3, %g0 @@ -5043,19 +5288,20 @@ .globl glEvalPoint2 .type glEvalPoint2,#function glEvalPoint2: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EvalPoint2), %g2 or %g2, %lo(8 * _gloffset_EvalPoint2), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EvalPoint2)], %g3 #endif jmpl %g3, %g0 @@ -5064,19 +5310,20 @@ .globl glAlphaFunc .type glAlphaFunc,#function glAlphaFunc: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_AlphaFunc), %g2 or %g2, %lo(8 * _gloffset_AlphaFunc), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_AlphaFunc)], %g3 #endif jmpl %g3, %g0 @@ -5085,19 +5332,20 @@ .globl glBlendFunc .type glBlendFunc,#function glBlendFunc: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendFunc), %g2 or %g2, %lo(8 * _gloffset_BlendFunc), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendFunc)], %g3 #endif jmpl %g3, %g0 @@ -5106,19 +5354,20 @@ .globl glLogicOp .type glLogicOp,#function glLogicOp: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LogicOp), %g2 or %g2, %lo(8 * _gloffset_LogicOp), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LogicOp)], %g3 #endif jmpl %g3, %g0 @@ -5127,19 +5376,20 @@ .globl glStencilFunc .type glStencilFunc,#function glStencilFunc: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_StencilFunc), %g2 or %g2, %lo(8 * _gloffset_StencilFunc), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_StencilFunc)], %g3 #endif jmpl %g3, %g0 @@ -5148,19 +5398,20 @@ .globl glStencilOp .type glStencilOp,#function glStencilOp: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_StencilOp), %g2 or %g2, %lo(8 * _gloffset_StencilOp), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_StencilOp)], %g3 #endif jmpl %g3, %g0 @@ -5169,19 +5420,20 @@ .globl glDepthFunc .type glDepthFunc,#function glDepthFunc: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DepthFunc), %g2 or %g2, %lo(8 * _gloffset_DepthFunc), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DepthFunc)], %g3 #endif jmpl %g3, %g0 @@ -5190,19 +5442,20 @@ .globl glPixelZoom .type glPixelZoom,#function glPixelZoom: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelZoom), %g2 or %g2, %lo(8 * _gloffset_PixelZoom), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelZoom)], %g3 #endif jmpl %g3, %g0 @@ -5211,19 +5464,20 @@ .globl glPixelTransferf .type glPixelTransferf,#function glPixelTransferf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelTransferf), %g2 or %g2, %lo(8 * _gloffset_PixelTransferf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelTransferf)], %g3 #endif jmpl %g3, %g0 @@ -5232,19 +5486,20 @@ .globl glPixelTransferi .type glPixelTransferi,#function glPixelTransferi: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelTransferi), %g2 or %g2, %lo(8 * _gloffset_PixelTransferi), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelTransferi)], %g3 #endif jmpl %g3, %g0 @@ -5253,19 +5508,20 @@ .globl glPixelStoref .type glPixelStoref,#function glPixelStoref: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelStoref), %g2 or %g2, %lo(8 * _gloffset_PixelStoref), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelStoref)], %g3 #endif jmpl %g3, %g0 @@ -5274,19 +5530,20 @@ .globl glPixelStorei .type glPixelStorei,#function glPixelStorei: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelStorei), %g2 or %g2, %lo(8 * _gloffset_PixelStorei), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelStorei)], %g3 #endif jmpl %g3, %g0 @@ -5295,19 +5552,20 @@ .globl glPixelMapfv .type glPixelMapfv,#function glPixelMapfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelMapfv), %g2 or %g2, %lo(8 * _gloffset_PixelMapfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelMapfv)], %g3 #endif jmpl %g3, %g0 @@ -5316,19 +5574,20 @@ .globl glPixelMapuiv .type glPixelMapuiv,#function glPixelMapuiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelMapuiv), %g2 or %g2, %lo(8 * _gloffset_PixelMapuiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelMapuiv)], %g3 #endif jmpl %g3, %g0 @@ -5337,19 +5596,20 @@ .globl glPixelMapusv .type glPixelMapusv,#function glPixelMapusv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelMapusv), %g2 or %g2, %lo(8 * _gloffset_PixelMapusv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelMapusv)], %g3 #endif jmpl %g3, %g0 @@ -5358,19 +5618,20 @@ .globl glReadBuffer .type glReadBuffer,#function glReadBuffer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ReadBuffer), %g2 or %g2, %lo(8 * _gloffset_ReadBuffer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ReadBuffer)], %g3 #endif jmpl %g3, %g0 @@ -5379,19 +5640,20 @@ .globl glCopyPixels .type glCopyPixels,#function glCopyPixels: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyPixels), %g2 or %g2, %lo(8 * _gloffset_CopyPixels), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyPixels)], %g3 #endif jmpl %g3, %g0 @@ -5400,19 +5662,20 @@ .globl glReadPixels .type glReadPixels,#function glReadPixels: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ReadPixels), %g2 or %g2, %lo(8 * _gloffset_ReadPixels), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ReadPixels)], %g3 #endif jmpl %g3, %g0 @@ -5421,19 +5684,20 @@ .globl glDrawPixels .type glDrawPixels,#function glDrawPixels: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DrawPixels), %g2 or %g2, %lo(8 * _gloffset_DrawPixels), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DrawPixels)], %g3 #endif jmpl %g3, %g0 @@ -5442,19 +5706,20 @@ .globl glGetBooleanv .type glGetBooleanv,#function glGetBooleanv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetBooleanv), %g2 or %g2, %lo(8 * _gloffset_GetBooleanv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetBooleanv)], %g3 #endif jmpl %g3, %g0 @@ -5463,19 +5728,20 @@ .globl glGetClipPlane .type glGetClipPlane,#function glGetClipPlane: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetClipPlane), %g2 or %g2, %lo(8 * _gloffset_GetClipPlane), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetClipPlane)], %g3 #endif jmpl %g3, %g0 @@ -5484,19 +5750,20 @@ .globl glGetDoublev .type glGetDoublev,#function glGetDoublev: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetDoublev), %g2 or %g2, %lo(8 * _gloffset_GetDoublev), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetDoublev)], %g3 #endif jmpl %g3, %g0 @@ -5505,19 +5772,20 @@ .globl glGetError .type glGetError,#function glGetError: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetError), %g2 or %g2, %lo(8 * _gloffset_GetError), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetError)], %g3 #endif jmpl %g3, %g0 @@ -5526,19 +5794,20 @@ .globl glGetFloatv .type glGetFloatv,#function glGetFloatv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetFloatv), %g2 or %g2, %lo(8 * _gloffset_GetFloatv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetFloatv)], %g3 #endif jmpl %g3, %g0 @@ -5547,19 +5816,20 @@ .globl glGetIntegerv .type glGetIntegerv,#function glGetIntegerv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetIntegerv), %g2 or %g2, %lo(8 * _gloffset_GetIntegerv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetIntegerv)], %g3 #endif jmpl %g3, %g0 @@ -5568,19 +5838,20 @@ .globl glGetLightfv .type glGetLightfv,#function glGetLightfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetLightfv), %g2 or %g2, %lo(8 * _gloffset_GetLightfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetLightfv)], %g3 #endif jmpl %g3, %g0 @@ -5589,19 +5860,20 @@ .globl glGetLightiv .type glGetLightiv,#function glGetLightiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetLightiv), %g2 or %g2, %lo(8 * _gloffset_GetLightiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetLightiv)], %g3 #endif jmpl %g3, %g0 @@ -5610,19 +5882,20 @@ .globl glGetMapdv .type glGetMapdv,#function glGetMapdv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMapdv), %g2 or %g2, %lo(8 * _gloffset_GetMapdv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMapdv)], %g3 #endif jmpl %g3, %g0 @@ -5631,19 +5904,20 @@ .globl glGetMapfv .type glGetMapfv,#function glGetMapfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMapfv), %g2 or %g2, %lo(8 * _gloffset_GetMapfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMapfv)], %g3 #endif jmpl %g3, %g0 @@ -5652,19 +5926,20 @@ .globl glGetMapiv .type glGetMapiv,#function glGetMapiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMapiv), %g2 or %g2, %lo(8 * _gloffset_GetMapiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMapiv)], %g3 #endif jmpl %g3, %g0 @@ -5673,19 +5948,20 @@ .globl glGetMaterialfv .type glGetMaterialfv,#function glGetMaterialfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMaterialfv), %g2 or %g2, %lo(8 * _gloffset_GetMaterialfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMaterialfv)], %g3 #endif jmpl %g3, %g0 @@ -5694,19 +5970,20 @@ .globl glGetMaterialiv .type glGetMaterialiv,#function glGetMaterialiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMaterialiv), %g2 or %g2, %lo(8 * _gloffset_GetMaterialiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMaterialiv)], %g3 #endif jmpl %g3, %g0 @@ -5715,19 +5992,20 @@ .globl glGetPixelMapfv .type glGetPixelMapfv,#function glGetPixelMapfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetPixelMapfv), %g2 or %g2, %lo(8 * _gloffset_GetPixelMapfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetPixelMapfv)], %g3 #endif jmpl %g3, %g0 @@ -5736,19 +6014,20 @@ .globl glGetPixelMapuiv .type glGetPixelMapuiv,#function glGetPixelMapuiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetPixelMapuiv), %g2 or %g2, %lo(8 * _gloffset_GetPixelMapuiv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetPixelMapuiv)], %g3 #endif jmpl %g3, %g0 @@ -5757,19 +6036,20 @@ .globl glGetPixelMapusv .type glGetPixelMapusv,#function glGetPixelMapusv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetPixelMapusv), %g2 or %g2, %lo(8 * _gloffset_GetPixelMapusv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetPixelMapusv)], %g3 #endif jmpl %g3, %g0 @@ -5778,19 +6058,20 @@ .globl glGetPolygonStipple .type glGetPolygonStipple,#function glGetPolygonStipple: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetPolygonStipple), %g2 or %g2, %lo(8 * _gloffset_GetPolygonStipple), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetPolygonStipple)], %g3 #endif jmpl %g3, %g0 @@ -5799,19 +6080,20 @@ .globl glGetString .type glGetString,#function glGetString: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetString), %g2 or %g2, %lo(8 * _gloffset_GetString), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetString)], %g3 #endif jmpl %g3, %g0 @@ -5820,19 +6102,20 @@ .globl glGetTexEnvfv .type glGetTexEnvfv,#function glGetTexEnvfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexEnvfv), %g2 or %g2, %lo(8 * _gloffset_GetTexEnvfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexEnvfv)], %g3 #endif jmpl %g3, %g0 @@ -5841,19 +6124,20 @@ .globl glGetTexEnviv .type glGetTexEnviv,#function glGetTexEnviv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexEnviv), %g2 or %g2, %lo(8 * _gloffset_GetTexEnviv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexEnviv)], %g3 #endif jmpl %g3, %g0 @@ -5862,19 +6146,20 @@ .globl glGetTexGendv .type glGetTexGendv,#function glGetTexGendv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexGendv), %g2 or %g2, %lo(8 * _gloffset_GetTexGendv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexGendv)], %g3 #endif jmpl %g3, %g0 @@ -5883,19 +6168,20 @@ .globl glGetTexGenfv .type glGetTexGenfv,#function glGetTexGenfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexGenfv), %g2 or %g2, %lo(8 * _gloffset_GetTexGenfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexGenfv)], %g3 #endif jmpl %g3, %g0 @@ -5904,19 +6190,20 @@ .globl glGetTexGeniv .type glGetTexGeniv,#function glGetTexGeniv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexGeniv), %g2 or %g2, %lo(8 * _gloffset_GetTexGeniv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexGeniv)], %g3 #endif jmpl %g3, %g0 @@ -5925,19 +6212,20 @@ .globl glGetTexImage .type glGetTexImage,#function glGetTexImage: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexImage), %g2 or %g2, %lo(8 * _gloffset_GetTexImage), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexImage)], %g3 #endif jmpl %g3, %g0 @@ -5946,19 +6234,20 @@ .globl glGetTexParameterfv .type glGetTexParameterfv,#function glGetTexParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexParameterfv), %g2 or %g2, %lo(8 * _gloffset_GetTexParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -5967,19 +6256,20 @@ .globl glGetTexParameteriv .type glGetTexParameteriv,#function glGetTexParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexParameteriv), %g2 or %g2, %lo(8 * _gloffset_GetTexParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -5988,19 +6278,20 @@ .globl glGetTexLevelParameterfv .type glGetTexLevelParameterfv,#function glGetTexLevelParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexLevelParameterfv), %g2 or %g2, %lo(8 * _gloffset_GetTexLevelParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexLevelParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -6009,19 +6300,20 @@ .globl glGetTexLevelParameteriv .type glGetTexLevelParameteriv,#function glGetTexLevelParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexLevelParameteriv), %g2 or %g2, %lo(8 * _gloffset_GetTexLevelParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexLevelParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -6030,19 +6322,20 @@ .globl glIsEnabled .type glIsEnabled,#function glIsEnabled: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsEnabled), %g2 or %g2, %lo(8 * _gloffset_IsEnabled), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsEnabled)], %g3 #endif jmpl %g3, %g0 @@ -6051,19 +6344,20 @@ .globl glIsList .type glIsList,#function glIsList: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsList), %g2 or %g2, %lo(8 * _gloffset_IsList), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsList)], %g3 #endif jmpl %g3, %g0 @@ -6072,19 +6366,20 @@ .globl glDepthRange .type glDepthRange,#function glDepthRange: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DepthRange), %g2 or %g2, %lo(8 * _gloffset_DepthRange), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DepthRange)], %g3 #endif jmpl %g3, %g0 @@ -6093,19 +6388,20 @@ .globl glFrustum .type glFrustum,#function glFrustum: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Frustum), %g2 or %g2, %lo(8 * _gloffset_Frustum), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Frustum)], %g3 #endif jmpl %g3, %g0 @@ -6114,19 +6410,20 @@ .globl glLoadIdentity .type glLoadIdentity,#function glLoadIdentity: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadIdentity), %g2 or %g2, %lo(8 * _gloffset_LoadIdentity), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadIdentity)], %g3 #endif jmpl %g3, %g0 @@ -6135,19 +6432,20 @@ .globl glLoadMatrixf .type glLoadMatrixf,#function glLoadMatrixf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadMatrixf), %g2 or %g2, %lo(8 * _gloffset_LoadMatrixf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadMatrixf)], %g3 #endif jmpl %g3, %g0 @@ -6156,19 +6454,20 @@ .globl glLoadMatrixd .type glLoadMatrixd,#function glLoadMatrixd: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadMatrixd), %g2 or %g2, %lo(8 * _gloffset_LoadMatrixd), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadMatrixd)], %g3 #endif jmpl %g3, %g0 @@ -6177,19 +6476,20 @@ .globl glMatrixMode .type glMatrixMode,#function glMatrixMode: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MatrixMode), %g2 or %g2, %lo(8 * _gloffset_MatrixMode), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MatrixMode)], %g3 #endif jmpl %g3, %g0 @@ -6198,19 +6498,20 @@ .globl glMultMatrixf .type glMultMatrixf,#function glMultMatrixf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultMatrixf), %g2 or %g2, %lo(8 * _gloffset_MultMatrixf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultMatrixf)], %g3 #endif jmpl %g3, %g0 @@ -6219,19 +6520,20 @@ .globl glMultMatrixd .type glMultMatrixd,#function glMultMatrixd: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultMatrixd), %g2 or %g2, %lo(8 * _gloffset_MultMatrixd), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultMatrixd)], %g3 #endif jmpl %g3, %g0 @@ -6240,19 +6542,20 @@ .globl glOrtho .type glOrtho,#function glOrtho: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Ortho), %g2 or %g2, %lo(8 * _gloffset_Ortho), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Ortho)], %g3 #endif jmpl %g3, %g0 @@ -6261,19 +6564,20 @@ .globl glPopMatrix .type glPopMatrix,#function glPopMatrix: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PopMatrix), %g2 or %g2, %lo(8 * _gloffset_PopMatrix), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PopMatrix)], %g3 #endif jmpl %g3, %g0 @@ -6282,19 +6586,20 @@ .globl glPushMatrix .type glPushMatrix,#function glPushMatrix: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PushMatrix), %g2 or %g2, %lo(8 * _gloffset_PushMatrix), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PushMatrix)], %g3 #endif jmpl %g3, %g0 @@ -6303,19 +6608,20 @@ .globl glRotated .type glRotated,#function glRotated: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rotated), %g2 or %g2, %lo(8 * _gloffset_Rotated), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rotated)], %g3 #endif jmpl %g3, %g0 @@ -6324,19 +6630,20 @@ .globl glRotatef .type glRotatef,#function glRotatef: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Rotatef), %g2 or %g2, %lo(8 * _gloffset_Rotatef), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Rotatef)], %g3 #endif jmpl %g3, %g0 @@ -6345,19 +6652,20 @@ .globl glScaled .type glScaled,#function glScaled: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Scaled), %g2 or %g2, %lo(8 * _gloffset_Scaled), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Scaled)], %g3 #endif jmpl %g3, %g0 @@ -6366,19 +6674,20 @@ .globl glScalef .type glScalef,#function glScalef: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Scalef), %g2 or %g2, %lo(8 * _gloffset_Scalef), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Scalef)], %g3 #endif jmpl %g3, %g0 @@ -6387,19 +6696,20 @@ .globl glTranslated .type glTranslated,#function glTranslated: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Translated), %g2 or %g2, %lo(8 * _gloffset_Translated), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Translated)], %g3 #endif jmpl %g3, %g0 @@ -6408,19 +6718,20 @@ .globl glTranslatef .type glTranslatef,#function glTranslatef: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Translatef), %g2 or %g2, %lo(8 * _gloffset_Translatef), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Translatef)], %g3 #endif jmpl %g3, %g0 @@ -6429,19 +6740,20 @@ .globl glViewport .type glViewport,#function glViewport: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Viewport), %g2 or %g2, %lo(8 * _gloffset_Viewport), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Viewport)], %g3 #endif jmpl %g3, %g0 @@ -6450,19 +6762,20 @@ .globl glArrayElement .type glArrayElement,#function glArrayElement: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ArrayElement), %g2 or %g2, %lo(8 * _gloffset_ArrayElement), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ArrayElement)], %g3 #endif jmpl %g3, %g0 @@ -6471,19 +6784,20 @@ .globl glColorPointer .type glColorPointer,#function glColorPointer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorPointer), %g2 or %g2, %lo(8 * _gloffset_ColorPointer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorPointer)], %g3 #endif jmpl %g3, %g0 @@ -6492,19 +6806,20 @@ .globl glDisableClientState .type glDisableClientState,#function glDisableClientState: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DisableClientState), %g2 or %g2, %lo(8 * _gloffset_DisableClientState), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DisableClientState)], %g3 #endif jmpl %g3, %g0 @@ -6513,19 +6828,20 @@ .globl glDrawArrays .type glDrawArrays,#function glDrawArrays: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DrawArrays), %g2 or %g2, %lo(8 * _gloffset_DrawArrays), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DrawArrays)], %g3 #endif jmpl %g3, %g0 @@ -6534,19 +6850,20 @@ .globl glDrawElements .type glDrawElements,#function glDrawElements: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DrawElements), %g2 or %g2, %lo(8 * _gloffset_DrawElements), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DrawElements)], %g3 #endif jmpl %g3, %g0 @@ -6555,19 +6872,20 @@ .globl glEdgeFlagPointer .type glEdgeFlagPointer,#function glEdgeFlagPointer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EdgeFlagPointer), %g2 or %g2, %lo(8 * _gloffset_EdgeFlagPointer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EdgeFlagPointer)], %g3 #endif jmpl %g3, %g0 @@ -6576,19 +6894,20 @@ .globl glEnableClientState .type glEnableClientState,#function glEnableClientState: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EnableClientState), %g2 or %g2, %lo(8 * _gloffset_EnableClientState), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EnableClientState)], %g3 #endif jmpl %g3, %g0 @@ -6597,19 +6916,20 @@ .globl glGetPointerv .type glGetPointerv,#function glGetPointerv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetPointerv), %g2 or %g2, %lo(8 * _gloffset_GetPointerv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetPointerv)], %g3 #endif jmpl %g3, %g0 @@ -6618,19 +6938,20 @@ .globl glIndexPointer .type glIndexPointer,#function glIndexPointer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IndexPointer), %g2 or %g2, %lo(8 * _gloffset_IndexPointer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IndexPointer)], %g3 #endif jmpl %g3, %g0 @@ -6639,19 +6960,20 @@ .globl glInterleavedArrays .type glInterleavedArrays,#function glInterleavedArrays: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_InterleavedArrays), %g2 or %g2, %lo(8 * _gloffset_InterleavedArrays), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_InterleavedArrays)], %g3 #endif jmpl %g3, %g0 @@ -6660,19 +6982,20 @@ .globl glNormalPointer .type glNormalPointer,#function glNormalPointer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_NormalPointer), %g2 or %g2, %lo(8 * _gloffset_NormalPointer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_NormalPointer)], %g3 #endif jmpl %g3, %g0 @@ -6681,19 +7004,20 @@ .globl glTexCoordPointer .type glTexCoordPointer,#function glTexCoordPointer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoordPointer), %g2 or %g2, %lo(8 * _gloffset_TexCoordPointer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoordPointer)], %g3 #endif jmpl %g3, %g0 @@ -6702,19 +7026,20 @@ .globl glVertexPointer .type glVertexPointer,#function glVertexPointer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexPointer), %g2 or %g2, %lo(8 * _gloffset_VertexPointer), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexPointer)], %g3 #endif jmpl %g3, %g0 @@ -6723,19 +7048,20 @@ .globl glPolygonOffset .type glPolygonOffset,#function glPolygonOffset: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PolygonOffset), %g2 or %g2, %lo(8 * _gloffset_PolygonOffset), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PolygonOffset)], %g3 #endif jmpl %g3, %g0 @@ -6744,19 +7070,20 @@ .globl glCopyTexImage1D .type glCopyTexImage1D,#function glCopyTexImage1D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexImage1D), %g2 or %g2, %lo(8 * _gloffset_CopyTexImage1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexImage1D)], %g3 #endif jmpl %g3, %g0 @@ -6765,19 +7092,20 @@ .globl glCopyTexImage2D .type glCopyTexImage2D,#function glCopyTexImage2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexImage2D), %g2 or %g2, %lo(8 * _gloffset_CopyTexImage2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexImage2D)], %g3 #endif jmpl %g3, %g0 @@ -6786,19 +7114,20 @@ .globl glCopyTexSubImage1D .type glCopyTexSubImage1D,#function glCopyTexSubImage1D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexSubImage1D), %g2 or %g2, %lo(8 * _gloffset_CopyTexSubImage1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexSubImage1D)], %g3 #endif jmpl %g3, %g0 @@ -6807,19 +7136,20 @@ .globl glCopyTexSubImage2D .type glCopyTexSubImage2D,#function glCopyTexSubImage2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexSubImage2D), %g2 or %g2, %lo(8 * _gloffset_CopyTexSubImage2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexSubImage2D)], %g3 #endif jmpl %g3, %g0 @@ -6828,19 +7158,20 @@ .globl glTexSubImage1D .type glTexSubImage1D,#function glTexSubImage1D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexSubImage1D), %g2 or %g2, %lo(8 * _gloffset_TexSubImage1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexSubImage1D)], %g3 #endif jmpl %g3, %g0 @@ -6849,19 +7180,20 @@ .globl glTexSubImage2D .type glTexSubImage2D,#function glTexSubImage2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexSubImage2D), %g2 or %g2, %lo(8 * _gloffset_TexSubImage2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexSubImage2D)], %g3 #endif jmpl %g3, %g0 @@ -6870,19 +7202,20 @@ .globl glAreTexturesResident .type glAreTexturesResident,#function glAreTexturesResident: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_AreTexturesResident), %g2 or %g2, %lo(8 * _gloffset_AreTexturesResident), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_AreTexturesResident)], %g3 #endif jmpl %g3, %g0 @@ -6891,19 +7224,20 @@ .globl glBindTexture .type glBindTexture,#function glBindTexture: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BindTexture), %g2 or %g2, %lo(8 * _gloffset_BindTexture), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BindTexture)], %g3 #endif jmpl %g3, %g0 @@ -6912,19 +7246,20 @@ .globl glDeleteTextures .type glDeleteTextures,#function glDeleteTextures: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteTextures), %g2 or %g2, %lo(8 * _gloffset_DeleteTextures), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteTextures)], %g3 #endif jmpl %g3, %g0 @@ -6933,19 +7268,20 @@ .globl glGenTextures .type glGenTextures,#function glGenTextures: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenTextures), %g2 or %g2, %lo(8 * _gloffset_GenTextures), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenTextures)], %g3 #endif jmpl %g3, %g0 @@ -6954,19 +7290,20 @@ .globl glIsTexture .type glIsTexture,#function glIsTexture: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsTexture), %g2 or %g2, %lo(8 * _gloffset_IsTexture), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsTexture)], %g3 #endif jmpl %g3, %g0 @@ -6975,19 +7312,20 @@ .globl glPrioritizeTextures .type glPrioritizeTextures,#function glPrioritizeTextures: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PrioritizeTextures), %g2 or %g2, %lo(8 * _gloffset_PrioritizeTextures), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PrioritizeTextures)], %g3 #endif jmpl %g3, %g0 @@ -6996,19 +7334,20 @@ .globl glIndexub .type glIndexub,#function glIndexub: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexub), %g2 or %g2, %lo(8 * _gloffset_Indexub), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexub)], %g3 #endif jmpl %g3, %g0 @@ -7017,19 +7356,20 @@ .globl glIndexubv .type glIndexubv,#function glIndexubv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Indexubv), %g2 or %g2, %lo(8 * _gloffset_Indexubv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Indexubv)], %g3 #endif jmpl %g3, %g0 @@ -7038,19 +7378,20 @@ .globl glPopClientAttrib .type glPopClientAttrib,#function glPopClientAttrib: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PopClientAttrib), %g2 or %g2, %lo(8 * _gloffset_PopClientAttrib), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PopClientAttrib)], %g3 #endif jmpl %g3, %g0 @@ -7059,19 +7400,20 @@ .globl glPushClientAttrib .type glPushClientAttrib,#function glPushClientAttrib: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PushClientAttrib), %g2 or %g2, %lo(8 * _gloffset_PushClientAttrib), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PushClientAttrib)], %g3 #endif jmpl %g3, %g0 @@ -7080,19 +7422,20 @@ .globl glBlendColor .type glBlendColor,#function glBlendColor: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendColor), %g2 or %g2, %lo(8 * _gloffset_BlendColor), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendColor)], %g3 #endif jmpl %g3, %g0 @@ -7101,19 +7444,20 @@ .globl glBlendEquation .type glBlendEquation,#function glBlendEquation: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendEquation), %g2 or %g2, %lo(8 * _gloffset_BlendEquation), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendEquation)], %g3 #endif jmpl %g3, %g0 @@ -7122,19 +7466,20 @@ .globl glDrawRangeElements .type glDrawRangeElements,#function glDrawRangeElements: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DrawRangeElements), %g2 or %g2, %lo(8 * _gloffset_DrawRangeElements), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DrawRangeElements)], %g3 #endif jmpl %g3, %g0 @@ -7143,19 +7488,20 @@ .globl glColorTable .type glColorTable,#function glColorTable: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorTable), %g2 or %g2, %lo(8 * _gloffset_ColorTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorTable)], %g3 #endif jmpl %g3, %g0 @@ -7164,19 +7510,20 @@ .globl glColorTableParameterfv .type glColorTableParameterfv,#function glColorTableParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorTableParameterfv), %g2 or %g2, %lo(8 * _gloffset_ColorTableParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorTableParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -7185,19 +7532,20 @@ .globl glColorTableParameteriv .type glColorTableParameteriv,#function glColorTableParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorTableParameteriv), %g2 or %g2, %lo(8 * _gloffset_ColorTableParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorTableParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -7206,19 +7554,20 @@ .globl glCopyColorTable .type glCopyColorTable,#function glCopyColorTable: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyColorTable), %g2 or %g2, %lo(8 * _gloffset_CopyColorTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyColorTable)], %g3 #endif jmpl %g3, %g0 @@ -7227,19 +7576,20 @@ .globl glGetColorTable .type glGetColorTable,#function glGetColorTable: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTable), %g2 or %g2, %lo(8 * _gloffset_GetColorTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTable)], %g3 #endif jmpl %g3, %g0 @@ -7248,19 +7598,20 @@ .globl glGetColorTableParameterfv .type glGetColorTableParameterfv,#function glGetColorTableParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTableParameterfv), %g2 or %g2, %lo(8 * _gloffset_GetColorTableParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTableParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -7269,19 +7620,20 @@ .globl glGetColorTableParameteriv .type glGetColorTableParameteriv,#function glGetColorTableParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTableParameteriv), %g2 or %g2, %lo(8 * _gloffset_GetColorTableParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTableParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -7290,19 +7642,20 @@ .globl glColorSubTable .type glColorSubTable,#function glColorSubTable: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorSubTable), %g2 or %g2, %lo(8 * _gloffset_ColorSubTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorSubTable)], %g3 #endif jmpl %g3, %g0 @@ -7311,19 +7664,20 @@ .globl glCopyColorSubTable .type glCopyColorSubTable,#function glCopyColorSubTable: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyColorSubTable), %g2 or %g2, %lo(8 * _gloffset_CopyColorSubTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyColorSubTable)], %g3 #endif jmpl %g3, %g0 @@ -7332,19 +7686,20 @@ .globl glConvolutionFilter1D .type glConvolutionFilter1D,#function glConvolutionFilter1D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionFilter1D), %g2 or %g2, %lo(8 * _gloffset_ConvolutionFilter1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionFilter1D)], %g3 #endif jmpl %g3, %g0 @@ -7353,19 +7708,20 @@ .globl glConvolutionFilter2D .type glConvolutionFilter2D,#function glConvolutionFilter2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionFilter2D), %g2 or %g2, %lo(8 * _gloffset_ConvolutionFilter2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionFilter2D)], %g3 #endif jmpl %g3, %g0 @@ -7374,19 +7730,20 @@ .globl glConvolutionParameterf .type glConvolutionParameterf,#function glConvolutionParameterf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionParameterf), %g2 or %g2, %lo(8 * _gloffset_ConvolutionParameterf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionParameterf)], %g3 #endif jmpl %g3, %g0 @@ -7395,19 +7752,20 @@ .globl glConvolutionParameterfv .type glConvolutionParameterfv,#function glConvolutionParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionParameterfv), %g2 or %g2, %lo(8 * _gloffset_ConvolutionParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -7416,19 +7774,20 @@ .globl glConvolutionParameteri .type glConvolutionParameteri,#function glConvolutionParameteri: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionParameteri), %g2 or %g2, %lo(8 * _gloffset_ConvolutionParameteri), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionParameteri)], %g3 #endif jmpl %g3, %g0 @@ -7437,19 +7796,20 @@ .globl glConvolutionParameteriv .type glConvolutionParameteriv,#function glConvolutionParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionParameteriv), %g2 or %g2, %lo(8 * _gloffset_ConvolutionParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -7458,19 +7818,20 @@ .globl glCopyConvolutionFilter1D .type glCopyConvolutionFilter1D,#function glCopyConvolutionFilter1D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyConvolutionFilter1D), %g2 or %g2, %lo(8 * _gloffset_CopyConvolutionFilter1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyConvolutionFilter1D)], %g3 #endif jmpl %g3, %g0 @@ -7479,19 +7840,20 @@ .globl glCopyConvolutionFilter2D .type glCopyConvolutionFilter2D,#function glCopyConvolutionFilter2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyConvolutionFilter2D), %g2 or %g2, %lo(8 * _gloffset_CopyConvolutionFilter2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyConvolutionFilter2D)], %g3 #endif jmpl %g3, %g0 @@ -7500,19 +7862,20 @@ .globl glGetConvolutionFilter .type glGetConvolutionFilter,#function glGetConvolutionFilter: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetConvolutionFilter), %g2 or %g2, %lo(8 * _gloffset_GetConvolutionFilter), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetConvolutionFilter)], %g3 #endif jmpl %g3, %g0 @@ -7521,19 +7884,20 @@ .globl glGetConvolutionParameterfv .type glGetConvolutionParameterfv,#function glGetConvolutionParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetConvolutionParameterfv), %g2 or %g2, %lo(8 * _gloffset_GetConvolutionParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetConvolutionParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -7542,19 +7906,20 @@ .globl glGetConvolutionParameteriv .type glGetConvolutionParameteriv,#function glGetConvolutionParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetConvolutionParameteriv), %g2 or %g2, %lo(8 * _gloffset_GetConvolutionParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetConvolutionParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -7563,19 +7928,20 @@ .globl glGetSeparableFilter .type glGetSeparableFilter,#function glGetSeparableFilter: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetSeparableFilter), %g2 or %g2, %lo(8 * _gloffset_GetSeparableFilter), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetSeparableFilter)], %g3 #endif jmpl %g3, %g0 @@ -7584,19 +7950,20 @@ .globl glSeparableFilter2D .type glSeparableFilter2D,#function glSeparableFilter2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SeparableFilter2D), %g2 or %g2, %lo(8 * _gloffset_SeparableFilter2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SeparableFilter2D)], %g3 #endif jmpl %g3, %g0 @@ -7605,19 +7972,20 @@ .globl glGetHistogram .type glGetHistogram,#function glGetHistogram: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetHistogram), %g2 or %g2, %lo(8 * _gloffset_GetHistogram), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetHistogram)], %g3 #endif jmpl %g3, %g0 @@ -7626,19 +7994,20 @@ .globl glGetHistogramParameterfv .type glGetHistogramParameterfv,#function glGetHistogramParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetHistogramParameterfv), %g2 or %g2, %lo(8 * _gloffset_GetHistogramParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetHistogramParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -7647,19 +8016,20 @@ .globl glGetHistogramParameteriv .type glGetHistogramParameteriv,#function glGetHistogramParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetHistogramParameteriv), %g2 or %g2, %lo(8 * _gloffset_GetHistogramParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetHistogramParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -7668,19 +8038,20 @@ .globl glGetMinmax .type glGetMinmax,#function glGetMinmax: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMinmax), %g2 or %g2, %lo(8 * _gloffset_GetMinmax), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMinmax)], %g3 #endif jmpl %g3, %g0 @@ -7689,19 +8060,20 @@ .globl glGetMinmaxParameterfv .type glGetMinmaxParameterfv,#function glGetMinmaxParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMinmaxParameterfv), %g2 or %g2, %lo(8 * _gloffset_GetMinmaxParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMinmaxParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -7710,19 +8082,20 @@ .globl glGetMinmaxParameteriv .type glGetMinmaxParameteriv,#function glGetMinmaxParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMinmaxParameteriv), %g2 or %g2, %lo(8 * _gloffset_GetMinmaxParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMinmaxParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -7731,19 +8104,20 @@ .globl glHistogram .type glHistogram,#function glHistogram: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Histogram), %g2 or %g2, %lo(8 * _gloffset_Histogram), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Histogram)], %g3 #endif jmpl %g3, %g0 @@ -7752,19 +8126,20 @@ .globl glMinmax .type glMinmax,#function glMinmax: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Minmax), %g2 or %g2, %lo(8 * _gloffset_Minmax), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Minmax)], %g3 #endif jmpl %g3, %g0 @@ -7773,19 +8148,20 @@ .globl glResetHistogram .type glResetHistogram,#function glResetHistogram: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ResetHistogram), %g2 or %g2, %lo(8 * _gloffset_ResetHistogram), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ResetHistogram)], %g3 #endif jmpl %g3, %g0 @@ -7794,19 +8170,20 @@ .globl glResetMinmax .type glResetMinmax,#function glResetMinmax: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ResetMinmax), %g2 or %g2, %lo(8 * _gloffset_ResetMinmax), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ResetMinmax)], %g3 #endif jmpl %g3, %g0 @@ -7815,19 +8192,20 @@ .globl glTexImage3D .type glTexImage3D,#function glTexImage3D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexImage3D), %g2 or %g2, %lo(8 * _gloffset_TexImage3D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexImage3D)], %g3 #endif jmpl %g3, %g0 @@ -7836,19 +8214,20 @@ .globl glTexSubImage3D .type glTexSubImage3D,#function glTexSubImage3D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexSubImage3D), %g2 or %g2, %lo(8 * _gloffset_TexSubImage3D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexSubImage3D)], %g3 #endif jmpl %g3, %g0 @@ -7857,19 +8236,20 @@ .globl glCopyTexSubImage3D .type glCopyTexSubImage3D,#function glCopyTexSubImage3D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexSubImage3D), %g2 or %g2, %lo(8 * _gloffset_CopyTexSubImage3D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexSubImage3D)], %g3 #endif jmpl %g3, %g0 @@ -7878,19 +8258,20 @@ .globl glActiveTextureARB .type glActiveTextureARB,#function glActiveTextureARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ActiveTextureARB), %g2 or %g2, %lo(8 * _gloffset_ActiveTextureARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ActiveTextureARB)], %g3 #endif jmpl %g3, %g0 @@ -7899,19 +8280,20 @@ .globl glClientActiveTextureARB .type glClientActiveTextureARB,#function glClientActiveTextureARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ClientActiveTextureARB), %g2 or %g2, %lo(8 * _gloffset_ClientActiveTextureARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ClientActiveTextureARB)], %g3 #endif jmpl %g3, %g0 @@ -7920,19 +8302,20 @@ .globl glMultiTexCoord1dARB .type glMultiTexCoord1dARB,#function glMultiTexCoord1dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1dARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1dARB)], %g3 #endif jmpl %g3, %g0 @@ -7941,19 +8324,20 @@ .globl glMultiTexCoord1dvARB .type glMultiTexCoord1dvARB,#function glMultiTexCoord1dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1dvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1dvARB)], %g3 #endif jmpl %g3, %g0 @@ -7962,19 +8346,20 @@ .globl glMultiTexCoord1fARB .type glMultiTexCoord1fARB,#function glMultiTexCoord1fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1fARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1fARB)], %g3 #endif jmpl %g3, %g0 @@ -7983,19 +8368,20 @@ .globl glMultiTexCoord1fvARB .type glMultiTexCoord1fvARB,#function glMultiTexCoord1fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1fvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1fvARB)], %g3 #endif jmpl %g3, %g0 @@ -8004,19 +8390,20 @@ .globl glMultiTexCoord1iARB .type glMultiTexCoord1iARB,#function glMultiTexCoord1iARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1iARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1iARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1iARB)], %g3 #endif jmpl %g3, %g0 @@ -8025,19 +8412,20 @@ .globl glMultiTexCoord1ivARB .type glMultiTexCoord1ivARB,#function glMultiTexCoord1ivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1ivARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1ivARB)], %g3 #endif jmpl %g3, %g0 @@ -8046,19 +8434,20 @@ .globl glMultiTexCoord1sARB .type glMultiTexCoord1sARB,#function glMultiTexCoord1sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1sARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1sARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1sARB)], %g3 #endif jmpl %g3, %g0 @@ -8067,19 +8456,20 @@ .globl glMultiTexCoord1svARB .type glMultiTexCoord1svARB,#function glMultiTexCoord1svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1svARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1svARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1svARB)], %g3 #endif jmpl %g3, %g0 @@ -8088,19 +8478,20 @@ .globl glMultiTexCoord2dARB .type glMultiTexCoord2dARB,#function glMultiTexCoord2dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2dARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2dARB)], %g3 #endif jmpl %g3, %g0 @@ -8109,19 +8500,20 @@ .globl glMultiTexCoord2dvARB .type glMultiTexCoord2dvARB,#function glMultiTexCoord2dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2dvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2dvARB)], %g3 #endif jmpl %g3, %g0 @@ -8130,19 +8522,20 @@ .globl glMultiTexCoord2fARB .type glMultiTexCoord2fARB,#function glMultiTexCoord2fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2fARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2fARB)], %g3 #endif jmpl %g3, %g0 @@ -8151,19 +8544,20 @@ .globl glMultiTexCoord2fvARB .type glMultiTexCoord2fvARB,#function glMultiTexCoord2fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2fvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2fvARB)], %g3 #endif jmpl %g3, %g0 @@ -8172,19 +8566,20 @@ .globl glMultiTexCoord2iARB .type glMultiTexCoord2iARB,#function glMultiTexCoord2iARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2iARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2iARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2iARB)], %g3 #endif jmpl %g3, %g0 @@ -8193,19 +8588,20 @@ .globl glMultiTexCoord2ivARB .type glMultiTexCoord2ivARB,#function glMultiTexCoord2ivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2ivARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2ivARB)], %g3 #endif jmpl %g3, %g0 @@ -8214,19 +8610,20 @@ .globl glMultiTexCoord2sARB .type glMultiTexCoord2sARB,#function glMultiTexCoord2sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2sARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2sARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2sARB)], %g3 #endif jmpl %g3, %g0 @@ -8235,19 +8632,20 @@ .globl glMultiTexCoord2svARB .type glMultiTexCoord2svARB,#function glMultiTexCoord2svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2svARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2svARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2svARB)], %g3 #endif jmpl %g3, %g0 @@ -8256,19 +8654,20 @@ .globl glMultiTexCoord3dARB .type glMultiTexCoord3dARB,#function glMultiTexCoord3dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3dARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3dARB)], %g3 #endif jmpl %g3, %g0 @@ -8277,19 +8676,20 @@ .globl glMultiTexCoord3dvARB .type glMultiTexCoord3dvARB,#function glMultiTexCoord3dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3dvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3dvARB)], %g3 #endif jmpl %g3, %g0 @@ -8298,19 +8698,20 @@ .globl glMultiTexCoord3fARB .type glMultiTexCoord3fARB,#function glMultiTexCoord3fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3fARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3fARB)], %g3 #endif jmpl %g3, %g0 @@ -8319,19 +8720,20 @@ .globl glMultiTexCoord3fvARB .type glMultiTexCoord3fvARB,#function glMultiTexCoord3fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3fvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3fvARB)], %g3 #endif jmpl %g3, %g0 @@ -8340,19 +8742,20 @@ .globl glMultiTexCoord3iARB .type glMultiTexCoord3iARB,#function glMultiTexCoord3iARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3iARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3iARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3iARB)], %g3 #endif jmpl %g3, %g0 @@ -8361,19 +8764,20 @@ .globl glMultiTexCoord3ivARB .type glMultiTexCoord3ivARB,#function glMultiTexCoord3ivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3ivARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3ivARB)], %g3 #endif jmpl %g3, %g0 @@ -8382,19 +8786,20 @@ .globl glMultiTexCoord3sARB .type glMultiTexCoord3sARB,#function glMultiTexCoord3sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3sARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3sARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3sARB)], %g3 #endif jmpl %g3, %g0 @@ -8403,19 +8808,20 @@ .globl glMultiTexCoord3svARB .type glMultiTexCoord3svARB,#function glMultiTexCoord3svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3svARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3svARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3svARB)], %g3 #endif jmpl %g3, %g0 @@ -8424,19 +8830,20 @@ .globl glMultiTexCoord4dARB .type glMultiTexCoord4dARB,#function glMultiTexCoord4dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4dARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4dARB)], %g3 #endif jmpl %g3, %g0 @@ -8445,19 +8852,20 @@ .globl glMultiTexCoord4dvARB .type glMultiTexCoord4dvARB,#function glMultiTexCoord4dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4dvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4dvARB)], %g3 #endif jmpl %g3, %g0 @@ -8466,19 +8874,20 @@ .globl glMultiTexCoord4fARB .type glMultiTexCoord4fARB,#function glMultiTexCoord4fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4fARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4fARB)], %g3 #endif jmpl %g3, %g0 @@ -8487,19 +8896,20 @@ .globl glMultiTexCoord4fvARB .type glMultiTexCoord4fvARB,#function glMultiTexCoord4fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4fvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4fvARB)], %g3 #endif jmpl %g3, %g0 @@ -8508,19 +8918,20 @@ .globl glMultiTexCoord4iARB .type glMultiTexCoord4iARB,#function glMultiTexCoord4iARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4iARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4iARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4iARB)], %g3 #endif jmpl %g3, %g0 @@ -8529,19 +8940,20 @@ .globl glMultiTexCoord4ivARB .type glMultiTexCoord4ivARB,#function glMultiTexCoord4ivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4ivARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4ivARB)], %g3 #endif jmpl %g3, %g0 @@ -8550,19 +8962,20 @@ .globl glMultiTexCoord4sARB .type glMultiTexCoord4sARB,#function glMultiTexCoord4sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4sARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4sARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4sARB)], %g3 #endif jmpl %g3, %g0 @@ -8571,19 +8984,20 @@ .globl glMultiTexCoord4svARB .type glMultiTexCoord4svARB,#function glMultiTexCoord4svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4svARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4svARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4svARB)], %g3 #endif jmpl %g3, %g0 @@ -8592,19 +9006,20 @@ .globl glLoadTransposeMatrixfARB .type glLoadTransposeMatrixfARB,#function glLoadTransposeMatrixfARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadTransposeMatrixfARB), %g2 or %g2, %lo(8 * _gloffset_LoadTransposeMatrixfARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadTransposeMatrixfARB)], %g3 #endif jmpl %g3, %g0 @@ -8613,19 +9028,20 @@ .globl glLoadTransposeMatrixdARB .type glLoadTransposeMatrixdARB,#function glLoadTransposeMatrixdARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadTransposeMatrixdARB), %g2 or %g2, %lo(8 * _gloffset_LoadTransposeMatrixdARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadTransposeMatrixdARB)], %g3 #endif jmpl %g3, %g0 @@ -8634,19 +9050,20 @@ .globl glMultTransposeMatrixfARB .type glMultTransposeMatrixfARB,#function glMultTransposeMatrixfARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultTransposeMatrixfARB), %g2 or %g2, %lo(8 * _gloffset_MultTransposeMatrixfARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultTransposeMatrixfARB)], %g3 #endif jmpl %g3, %g0 @@ -8655,19 +9072,20 @@ .globl glMultTransposeMatrixdARB .type glMultTransposeMatrixdARB,#function glMultTransposeMatrixdARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultTransposeMatrixdARB), %g2 or %g2, %lo(8 * _gloffset_MultTransposeMatrixdARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultTransposeMatrixdARB)], %g3 #endif jmpl %g3, %g0 @@ -8676,19 +9094,20 @@ .globl glSampleCoverageARB .type glSampleCoverageARB,#function glSampleCoverageARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SampleCoverageARB), %g2 or %g2, %lo(8 * _gloffset_SampleCoverageARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SampleCoverageARB)], %g3 #endif jmpl %g3, %g0 @@ -8697,19 +9116,20 @@ .globl gl__unused413 .type gl__unused413,#function gl__unused413: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset___unused413), %g2 or %g2, %lo(8 * _gloffset___unused413), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset___unused413)], %g3 #endif jmpl %g3, %g0 @@ -8718,19 +9138,20 @@ .globl glCompressedTexImage3DARB .type glCompressedTexImage3DARB,#function glCompressedTexImage3DARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexImage3DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexImage3DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexImage3DARB)], %g3 #endif jmpl %g3, %g0 @@ -8739,19 +9160,20 @@ .globl glCompressedTexImage2DARB .type glCompressedTexImage2DARB,#function glCompressedTexImage2DARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexImage2DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexImage2DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexImage2DARB)], %g3 #endif jmpl %g3, %g0 @@ -8760,19 +9182,20 @@ .globl glCompressedTexImage1DARB .type glCompressedTexImage1DARB,#function glCompressedTexImage1DARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexImage1DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexImage1DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexImage1DARB)], %g3 #endif jmpl %g3, %g0 @@ -8781,19 +9204,20 @@ .globl glCompressedTexSubImage3DARB .type glCompressedTexSubImage3DARB,#function glCompressedTexSubImage3DARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexSubImage3DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexSubImage3DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexSubImage3DARB)], %g3 #endif jmpl %g3, %g0 @@ -8802,19 +9226,20 @@ .globl glCompressedTexSubImage2DARB .type glCompressedTexSubImage2DARB,#function glCompressedTexSubImage2DARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexSubImage2DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexSubImage2DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexSubImage2DARB)], %g3 #endif jmpl %g3, %g0 @@ -8823,19 +9248,20 @@ .globl glCompressedTexSubImage1DARB .type glCompressedTexSubImage1DARB,#function glCompressedTexSubImage1DARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexSubImage1DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexSubImage1DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexSubImage1DARB)], %g3 #endif jmpl %g3, %g0 @@ -8844,19 +9270,20 @@ .globl glGetCompressedTexImageARB .type glGetCompressedTexImageARB,#function glGetCompressedTexImageARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetCompressedTexImageARB), %g2 or %g2, %lo(8 * _gloffset_GetCompressedTexImageARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetCompressedTexImageARB)], %g3 #endif jmpl %g3, %g0 @@ -8865,19 +9292,20 @@ .globl glActiveTexture .type glActiveTexture,#function glActiveTexture: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ActiveTextureARB), %g2 or %g2, %lo(8 * _gloffset_ActiveTextureARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ActiveTextureARB)], %g3 #endif jmpl %g3, %g0 @@ -8886,19 +9314,20 @@ .globl glClientActiveTexture .type glClientActiveTexture,#function glClientActiveTexture: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ClientActiveTextureARB), %g2 or %g2, %lo(8 * _gloffset_ClientActiveTextureARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ClientActiveTextureARB)], %g3 #endif jmpl %g3, %g0 @@ -8907,19 +9336,20 @@ .globl glMultiTexCoord1d .type glMultiTexCoord1d,#function glMultiTexCoord1d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1dARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1dARB)], %g3 #endif jmpl %g3, %g0 @@ -8928,19 +9358,20 @@ .globl glMultiTexCoord1dv .type glMultiTexCoord1dv,#function glMultiTexCoord1dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1dvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1dvARB)], %g3 #endif jmpl %g3, %g0 @@ -8949,19 +9380,20 @@ .globl glMultiTexCoord1f .type glMultiTexCoord1f,#function glMultiTexCoord1f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1fARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1fARB)], %g3 #endif jmpl %g3, %g0 @@ -8970,19 +9402,20 @@ .globl glMultiTexCoord1fv .type glMultiTexCoord1fv,#function glMultiTexCoord1fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1fvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1fvARB)], %g3 #endif jmpl %g3, %g0 @@ -8991,19 +9424,20 @@ .globl glMultiTexCoord1i .type glMultiTexCoord1i,#function glMultiTexCoord1i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1iARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1iARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1iARB)], %g3 #endif jmpl %g3, %g0 @@ -9012,19 +9446,20 @@ .globl glMultiTexCoord1iv .type glMultiTexCoord1iv,#function glMultiTexCoord1iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1ivARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1ivARB)], %g3 #endif jmpl %g3, %g0 @@ -9033,19 +9468,20 @@ .globl glMultiTexCoord1s .type glMultiTexCoord1s,#function glMultiTexCoord1s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1sARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1sARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1sARB)], %g3 #endif jmpl %g3, %g0 @@ -9054,19 +9490,20 @@ .globl glMultiTexCoord1sv .type glMultiTexCoord1sv,#function glMultiTexCoord1sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord1svARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord1svARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord1svARB)], %g3 #endif jmpl %g3, %g0 @@ -9075,19 +9512,20 @@ .globl glMultiTexCoord2d .type glMultiTexCoord2d,#function glMultiTexCoord2d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2dARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2dARB)], %g3 #endif jmpl %g3, %g0 @@ -9096,19 +9534,20 @@ .globl glMultiTexCoord2dv .type glMultiTexCoord2dv,#function glMultiTexCoord2dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2dvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2dvARB)], %g3 #endif jmpl %g3, %g0 @@ -9117,19 +9556,20 @@ .globl glMultiTexCoord2f .type glMultiTexCoord2f,#function glMultiTexCoord2f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2fARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2fARB)], %g3 #endif jmpl %g3, %g0 @@ -9138,19 +9578,20 @@ .globl glMultiTexCoord2fv .type glMultiTexCoord2fv,#function glMultiTexCoord2fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2fvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2fvARB)], %g3 #endif jmpl %g3, %g0 @@ -9159,19 +9600,20 @@ .globl glMultiTexCoord2i .type glMultiTexCoord2i,#function glMultiTexCoord2i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2iARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2iARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2iARB)], %g3 #endif jmpl %g3, %g0 @@ -9180,19 +9622,20 @@ .globl glMultiTexCoord2iv .type glMultiTexCoord2iv,#function glMultiTexCoord2iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2ivARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2ivARB)], %g3 #endif jmpl %g3, %g0 @@ -9201,19 +9644,20 @@ .globl glMultiTexCoord2s .type glMultiTexCoord2s,#function glMultiTexCoord2s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2sARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2sARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2sARB)], %g3 #endif jmpl %g3, %g0 @@ -9222,19 +9666,20 @@ .globl glMultiTexCoord2sv .type glMultiTexCoord2sv,#function glMultiTexCoord2sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord2svARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord2svARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord2svARB)], %g3 #endif jmpl %g3, %g0 @@ -9243,19 +9688,20 @@ .globl glMultiTexCoord3d .type glMultiTexCoord3d,#function glMultiTexCoord3d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3dARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3dARB)], %g3 #endif jmpl %g3, %g0 @@ -9264,19 +9710,20 @@ .globl glMultiTexCoord3dv .type glMultiTexCoord3dv,#function glMultiTexCoord3dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3dvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3dvARB)], %g3 #endif jmpl %g3, %g0 @@ -9285,19 +9732,20 @@ .globl glMultiTexCoord3f .type glMultiTexCoord3f,#function glMultiTexCoord3f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3fARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3fARB)], %g3 #endif jmpl %g3, %g0 @@ -9306,19 +9754,20 @@ .globl glMultiTexCoord3fv .type glMultiTexCoord3fv,#function glMultiTexCoord3fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3fvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3fvARB)], %g3 #endif jmpl %g3, %g0 @@ -9327,19 +9776,20 @@ .globl glMultiTexCoord3i .type glMultiTexCoord3i,#function glMultiTexCoord3i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3iARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3iARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3iARB)], %g3 #endif jmpl %g3, %g0 @@ -9348,19 +9798,20 @@ .globl glMultiTexCoord3iv .type glMultiTexCoord3iv,#function glMultiTexCoord3iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3ivARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3ivARB)], %g3 #endif jmpl %g3, %g0 @@ -9369,19 +9820,20 @@ .globl glMultiTexCoord3s .type glMultiTexCoord3s,#function glMultiTexCoord3s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3sARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3sARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3sARB)], %g3 #endif jmpl %g3, %g0 @@ -9390,19 +9842,20 @@ .globl glMultiTexCoord3sv .type glMultiTexCoord3sv,#function glMultiTexCoord3sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord3svARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord3svARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord3svARB)], %g3 #endif jmpl %g3, %g0 @@ -9411,19 +9864,20 @@ .globl glMultiTexCoord4d .type glMultiTexCoord4d,#function glMultiTexCoord4d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4dARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4dARB)], %g3 #endif jmpl %g3, %g0 @@ -9432,19 +9886,20 @@ .globl glMultiTexCoord4dv .type glMultiTexCoord4dv,#function glMultiTexCoord4dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4dvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4dvARB)], %g3 #endif jmpl %g3, %g0 @@ -9453,19 +9908,20 @@ .globl glMultiTexCoord4f .type glMultiTexCoord4f,#function glMultiTexCoord4f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4fARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4fARB)], %g3 #endif jmpl %g3, %g0 @@ -9474,19 +9930,20 @@ .globl glMultiTexCoord4fv .type glMultiTexCoord4fv,#function glMultiTexCoord4fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4fvARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4fvARB)], %g3 #endif jmpl %g3, %g0 @@ -9495,19 +9952,20 @@ .globl glMultiTexCoord4i .type glMultiTexCoord4i,#function glMultiTexCoord4i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4iARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4iARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4iARB)], %g3 #endif jmpl %g3, %g0 @@ -9516,19 +9974,20 @@ .globl glMultiTexCoord4iv .type glMultiTexCoord4iv,#function glMultiTexCoord4iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4ivARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4ivARB)], %g3 #endif jmpl %g3, %g0 @@ -9537,19 +9996,20 @@ .globl glMultiTexCoord4s .type glMultiTexCoord4s,#function glMultiTexCoord4s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4sARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4sARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4sARB)], %g3 #endif jmpl %g3, %g0 @@ -9558,19 +10018,20 @@ .globl glMultiTexCoord4sv .type glMultiTexCoord4sv,#function glMultiTexCoord4sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiTexCoord4svARB), %g2 or %g2, %lo(8 * _gloffset_MultiTexCoord4svARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiTexCoord4svARB)], %g3 #endif jmpl %g3, %g0 @@ -9579,19 +10040,20 @@ .globl glLoadTransposeMatrixf .type glLoadTransposeMatrixf,#function glLoadTransposeMatrixf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadTransposeMatrixfARB), %g2 or %g2, %lo(8 * _gloffset_LoadTransposeMatrixfARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadTransposeMatrixfARB)], %g3 #endif jmpl %g3, %g0 @@ -9600,19 +10062,20 @@ .globl glLoadTransposeMatrixd .type glLoadTransposeMatrixd,#function glLoadTransposeMatrixd: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadTransposeMatrixdARB), %g2 or %g2, %lo(8 * _gloffset_LoadTransposeMatrixdARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadTransposeMatrixdARB)], %g3 #endif jmpl %g3, %g0 @@ -9621,19 +10084,20 @@ .globl glMultTransposeMatrixf .type glMultTransposeMatrixf,#function glMultTransposeMatrixf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultTransposeMatrixfARB), %g2 or %g2, %lo(8 * _gloffset_MultTransposeMatrixfARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultTransposeMatrixfARB)], %g3 #endif jmpl %g3, %g0 @@ -9642,19 +10106,20 @@ .globl glMultTransposeMatrixd .type glMultTransposeMatrixd,#function glMultTransposeMatrixd: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultTransposeMatrixdARB), %g2 or %g2, %lo(8 * _gloffset_MultTransposeMatrixdARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultTransposeMatrixdARB)], %g3 #endif jmpl %g3, %g0 @@ -9663,19 +10128,20 @@ .globl glSampleCoverage .type glSampleCoverage,#function glSampleCoverage: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SampleCoverageARB), %g2 or %g2, %lo(8 * _gloffset_SampleCoverageARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SampleCoverageARB)], %g3 #endif jmpl %g3, %g0 @@ -9684,19 +10150,20 @@ .globl glCompressedTexImage3D .type glCompressedTexImage3D,#function glCompressedTexImage3D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexImage3DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexImage3DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexImage3DARB)], %g3 #endif jmpl %g3, %g0 @@ -9705,19 +10172,20 @@ .globl glCompressedTexImage2D .type glCompressedTexImage2D,#function glCompressedTexImage2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexImage2DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexImage2DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexImage2DARB)], %g3 #endif jmpl %g3, %g0 @@ -9726,19 +10194,20 @@ .globl glCompressedTexImage1D .type glCompressedTexImage1D,#function glCompressedTexImage1D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexImage1DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexImage1DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexImage1DARB)], %g3 #endif jmpl %g3, %g0 @@ -9747,19 +10216,20 @@ .globl glCompressedTexSubImage3D .type glCompressedTexSubImage3D,#function glCompressedTexSubImage3D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexSubImage3DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexSubImage3DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexSubImage3DARB)], %g3 #endif jmpl %g3, %g0 @@ -9768,19 +10238,20 @@ .globl glCompressedTexSubImage2D .type glCompressedTexSubImage2D,#function glCompressedTexSubImage2D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexSubImage2DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexSubImage2DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexSubImage2DARB)], %g3 #endif jmpl %g3, %g0 @@ -9789,19 +10260,20 @@ .globl glCompressedTexSubImage1D .type glCompressedTexSubImage1D,#function glCompressedTexSubImage1D: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CompressedTexSubImage1DARB), %g2 or %g2, %lo(8 * _gloffset_CompressedTexSubImage1DARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CompressedTexSubImage1DARB)], %g3 #endif jmpl %g3, %g0 @@ -9810,19 +10282,20 @@ .globl glGetCompressedTexImage .type glGetCompressedTexImage,#function glGetCompressedTexImage: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetCompressedTexImageARB), %g2 or %g2, %lo(8 * _gloffset_GetCompressedTexImageARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetCompressedTexImageARB)], %g3 #endif jmpl %g3, %g0 @@ -9831,19 +10304,20 @@ .globl glBlendColorEXT .type glBlendColorEXT,#function glBlendColorEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendColor), %g2 or %g2, %lo(8 * _gloffset_BlendColor), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendColor)], %g3 #endif jmpl %g3, %g0 @@ -9852,19 +10326,20 @@ .globl glPolygonOffsetEXT .type glPolygonOffsetEXT,#function glPolygonOffsetEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PolygonOffsetEXT), %g2 or %g2, %lo(8 * _gloffset_PolygonOffsetEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PolygonOffsetEXT)], %g3 #endif jmpl %g3, %g0 @@ -9873,19 +10348,20 @@ .globl glTexImage3DEXT .type glTexImage3DEXT,#function glTexImage3DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexImage3D), %g2 or %g2, %lo(8 * _gloffset_TexImage3D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexImage3D)], %g3 #endif jmpl %g3, %g0 @@ -9894,19 +10370,20 @@ .globl glTexSubImage3DEXT .type glTexSubImage3DEXT,#function glTexSubImage3DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexSubImage3D), %g2 or %g2, %lo(8 * _gloffset_TexSubImage3D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexSubImage3D)], %g3 #endif jmpl %g3, %g0 @@ -9915,19 +10392,20 @@ .globl glGetTexFilterFuncSGIS .type glGetTexFilterFuncSGIS,#function glGetTexFilterFuncSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTexFilterFuncSGIS), %g2 or %g2, %lo(8 * _gloffset_GetTexFilterFuncSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTexFilterFuncSGIS)], %g3 #endif jmpl %g3, %g0 @@ -9936,19 +10414,20 @@ .globl glTexFilterFuncSGIS .type glTexFilterFuncSGIS,#function glTexFilterFuncSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexFilterFuncSGIS), %g2 or %g2, %lo(8 * _gloffset_TexFilterFuncSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexFilterFuncSGIS)], %g3 #endif jmpl %g3, %g0 @@ -9957,19 +10436,20 @@ .globl glTexSubImage1DEXT .type glTexSubImage1DEXT,#function glTexSubImage1DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexSubImage1D), %g2 or %g2, %lo(8 * _gloffset_TexSubImage1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexSubImage1D)], %g3 #endif jmpl %g3, %g0 @@ -9978,19 +10458,20 @@ .globl glTexSubImage2DEXT .type glTexSubImage2DEXT,#function glTexSubImage2DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexSubImage2D), %g2 or %g2, %lo(8 * _gloffset_TexSubImage2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexSubImage2D)], %g3 #endif jmpl %g3, %g0 @@ -9999,19 +10480,20 @@ .globl glCopyTexImage1DEXT .type glCopyTexImage1DEXT,#function glCopyTexImage1DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexImage1D), %g2 or %g2, %lo(8 * _gloffset_CopyTexImage1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexImage1D)], %g3 #endif jmpl %g3, %g0 @@ -10020,19 +10502,20 @@ .globl glCopyTexImage2DEXT .type glCopyTexImage2DEXT,#function glCopyTexImage2DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexImage2D), %g2 or %g2, %lo(8 * _gloffset_CopyTexImage2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexImage2D)], %g3 #endif jmpl %g3, %g0 @@ -10041,19 +10524,20 @@ .globl glCopyTexSubImage1DEXT .type glCopyTexSubImage1DEXT,#function glCopyTexSubImage1DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexSubImage1D), %g2 or %g2, %lo(8 * _gloffset_CopyTexSubImage1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexSubImage1D)], %g3 #endif jmpl %g3, %g0 @@ -10062,19 +10546,20 @@ .globl glCopyTexSubImage2DEXT .type glCopyTexSubImage2DEXT,#function glCopyTexSubImage2DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexSubImage2D), %g2 or %g2, %lo(8 * _gloffset_CopyTexSubImage2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexSubImage2D)], %g3 #endif jmpl %g3, %g0 @@ -10083,19 +10568,20 @@ .globl glCopyTexSubImage3DEXT .type glCopyTexSubImage3DEXT,#function glCopyTexSubImage3DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyTexSubImage3D), %g2 or %g2, %lo(8 * _gloffset_CopyTexSubImage3D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyTexSubImage3D)], %g3 #endif jmpl %g3, %g0 @@ -10104,19 +10590,20 @@ .globl glGetHistogramEXT .type glGetHistogramEXT,#function glGetHistogramEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetHistogramEXT), %g2 or %g2, %lo(8 * _gloffset_GetHistogramEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetHistogramEXT)], %g3 #endif jmpl %g3, %g0 @@ -10125,19 +10612,20 @@ .globl glGetHistogramParameterfvEXT .type glGetHistogramParameterfvEXT,#function glGetHistogramParameterfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetHistogramParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_GetHistogramParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetHistogramParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -10146,19 +10634,20 @@ .globl glGetHistogramParameterivEXT .type glGetHistogramParameterivEXT,#function glGetHistogramParameterivEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetHistogramParameterivEXT), %g2 or %g2, %lo(8 * _gloffset_GetHistogramParameterivEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetHistogramParameterivEXT)], %g3 #endif jmpl %g3, %g0 @@ -10167,19 +10656,20 @@ .globl glGetMinmaxEXT .type glGetMinmaxEXT,#function glGetMinmaxEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMinmaxEXT), %g2 or %g2, %lo(8 * _gloffset_GetMinmaxEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMinmaxEXT)], %g3 #endif jmpl %g3, %g0 @@ -10188,19 +10678,20 @@ .globl glGetMinmaxParameterfvEXT .type glGetMinmaxParameterfvEXT,#function glGetMinmaxParameterfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMinmaxParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_GetMinmaxParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMinmaxParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -10209,19 +10700,20 @@ .globl glGetMinmaxParameterivEXT .type glGetMinmaxParameterivEXT,#function glGetMinmaxParameterivEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetMinmaxParameterivEXT), %g2 or %g2, %lo(8 * _gloffset_GetMinmaxParameterivEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetMinmaxParameterivEXT)], %g3 #endif jmpl %g3, %g0 @@ -10230,19 +10722,20 @@ .globl glHistogramEXT .type glHistogramEXT,#function glHistogramEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Histogram), %g2 or %g2, %lo(8 * _gloffset_Histogram), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Histogram)], %g3 #endif jmpl %g3, %g0 @@ -10251,19 +10744,20 @@ .globl glMinmaxEXT .type glMinmaxEXT,#function glMinmaxEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_Minmax), %g2 or %g2, %lo(8 * _gloffset_Minmax), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_Minmax)], %g3 #endif jmpl %g3, %g0 @@ -10272,19 +10766,20 @@ .globl glResetHistogramEXT .type glResetHistogramEXT,#function glResetHistogramEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ResetHistogram), %g2 or %g2, %lo(8 * _gloffset_ResetHistogram), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ResetHistogram)], %g3 #endif jmpl %g3, %g0 @@ -10293,19 +10788,20 @@ .globl glResetMinmaxEXT .type glResetMinmaxEXT,#function glResetMinmaxEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ResetMinmax), %g2 or %g2, %lo(8 * _gloffset_ResetMinmax), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ResetMinmax)], %g3 #endif jmpl %g3, %g0 @@ -10314,19 +10810,20 @@ .globl glConvolutionFilter1DEXT .type glConvolutionFilter1DEXT,#function glConvolutionFilter1DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionFilter1D), %g2 or %g2, %lo(8 * _gloffset_ConvolutionFilter1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionFilter1D)], %g3 #endif jmpl %g3, %g0 @@ -10335,19 +10832,20 @@ .globl glConvolutionFilter2DEXT .type glConvolutionFilter2DEXT,#function glConvolutionFilter2DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionFilter2D), %g2 or %g2, %lo(8 * _gloffset_ConvolutionFilter2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionFilter2D)], %g3 #endif jmpl %g3, %g0 @@ -10356,19 +10854,20 @@ .globl glConvolutionParameterfEXT .type glConvolutionParameterfEXT,#function glConvolutionParameterfEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionParameterf), %g2 or %g2, %lo(8 * _gloffset_ConvolutionParameterf), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionParameterf)], %g3 #endif jmpl %g3, %g0 @@ -10377,19 +10876,20 @@ .globl glConvolutionParameterfvEXT .type glConvolutionParameterfvEXT,#function glConvolutionParameterfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionParameterfv), %g2 or %g2, %lo(8 * _gloffset_ConvolutionParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -10398,19 +10898,20 @@ .globl glConvolutionParameteriEXT .type glConvolutionParameteriEXT,#function glConvolutionParameteriEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionParameteri), %g2 or %g2, %lo(8 * _gloffset_ConvolutionParameteri), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionParameteri)], %g3 #endif jmpl %g3, %g0 @@ -10419,19 +10920,20 @@ .globl glConvolutionParameterivEXT .type glConvolutionParameterivEXT,#function glConvolutionParameterivEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ConvolutionParameteriv), %g2 or %g2, %lo(8 * _gloffset_ConvolutionParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ConvolutionParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -10440,19 +10942,20 @@ .globl glCopyConvolutionFilter1DEXT .type glCopyConvolutionFilter1DEXT,#function glCopyConvolutionFilter1DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyConvolutionFilter1D), %g2 or %g2, %lo(8 * _gloffset_CopyConvolutionFilter1D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyConvolutionFilter1D)], %g3 #endif jmpl %g3, %g0 @@ -10461,19 +10964,20 @@ .globl glCopyConvolutionFilter2DEXT .type glCopyConvolutionFilter2DEXT,#function glCopyConvolutionFilter2DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyConvolutionFilter2D), %g2 or %g2, %lo(8 * _gloffset_CopyConvolutionFilter2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyConvolutionFilter2D)], %g3 #endif jmpl %g3, %g0 @@ -10482,19 +10986,20 @@ .globl glGetConvolutionFilterEXT .type glGetConvolutionFilterEXT,#function glGetConvolutionFilterEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetConvolutionFilterEXT), %g2 or %g2, %lo(8 * _gloffset_GetConvolutionFilterEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetConvolutionFilterEXT)], %g3 #endif jmpl %g3, %g0 @@ -10503,19 +11008,20 @@ .globl glGetConvolutionParameterfvEXT .type glGetConvolutionParameterfvEXT,#function glGetConvolutionParameterfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetConvolutionParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_GetConvolutionParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetConvolutionParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -10524,19 +11030,20 @@ .globl glGetConvolutionParameterivEXT .type glGetConvolutionParameterivEXT,#function glGetConvolutionParameterivEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetConvolutionParameterivEXT), %g2 or %g2, %lo(8 * _gloffset_GetConvolutionParameterivEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetConvolutionParameterivEXT)], %g3 #endif jmpl %g3, %g0 @@ -10545,19 +11052,20 @@ .globl glGetSeparableFilterEXT .type glGetSeparableFilterEXT,#function glGetSeparableFilterEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetSeparableFilterEXT), %g2 or %g2, %lo(8 * _gloffset_GetSeparableFilterEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetSeparableFilterEXT)], %g3 #endif jmpl %g3, %g0 @@ -10566,19 +11074,20 @@ .globl glSeparableFilter2DEXT .type glSeparableFilter2DEXT,#function glSeparableFilter2DEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SeparableFilter2D), %g2 or %g2, %lo(8 * _gloffset_SeparableFilter2D), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SeparableFilter2D)], %g3 #endif jmpl %g3, %g0 @@ -10587,19 +11096,20 @@ .globl glColorTableSGI .type glColorTableSGI,#function glColorTableSGI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorTable), %g2 or %g2, %lo(8 * _gloffset_ColorTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorTable)], %g3 #endif jmpl %g3, %g0 @@ -10608,19 +11118,20 @@ .globl glColorTableParameterfvSGI .type glColorTableParameterfvSGI,#function glColorTableParameterfvSGI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorTableParameterfv), %g2 or %g2, %lo(8 * _gloffset_ColorTableParameterfv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorTableParameterfv)], %g3 #endif jmpl %g3, %g0 @@ -10629,19 +11140,20 @@ .globl glColorTableParameterivSGI .type glColorTableParameterivSGI,#function glColorTableParameterivSGI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorTableParameteriv), %g2 or %g2, %lo(8 * _gloffset_ColorTableParameteriv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorTableParameteriv)], %g3 #endif jmpl %g3, %g0 @@ -10650,19 +11162,20 @@ .globl glCopyColorTableSGI .type glCopyColorTableSGI,#function glCopyColorTableSGI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyColorTable), %g2 or %g2, %lo(8 * _gloffset_CopyColorTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyColorTable)], %g3 #endif jmpl %g3, %g0 @@ -10671,19 +11184,20 @@ .globl glGetColorTableSGI .type glGetColorTableSGI,#function glGetColorTableSGI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTableSGI), %g2 or %g2, %lo(8 * _gloffset_GetColorTableSGI), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTableSGI)], %g3 #endif jmpl %g3, %g0 @@ -10692,19 +11206,20 @@ .globl glGetColorTableParameterfvSGI .type glGetColorTableParameterfvSGI,#function glGetColorTableParameterfvSGI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTableParameterfvSGI), %g2 or %g2, %lo(8 * _gloffset_GetColorTableParameterfvSGI), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTableParameterfvSGI)], %g3 #endif jmpl %g3, %g0 @@ -10713,19 +11228,20 @@ .globl glGetColorTableParameterivSGI .type glGetColorTableParameterivSGI,#function glGetColorTableParameterivSGI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTableParameterivSGI), %g2 or %g2, %lo(8 * _gloffset_GetColorTableParameterivSGI), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTableParameterivSGI)], %g3 #endif jmpl %g3, %g0 @@ -10734,19 +11250,20 @@ .globl glPixelTexGenSGIX .type glPixelTexGenSGIX,#function glPixelTexGenSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelTexGenSGIX), %g2 or %g2, %lo(8 * _gloffset_PixelTexGenSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelTexGenSGIX)], %g3 #endif jmpl %g3, %g0 @@ -10755,19 +11272,20 @@ .globl glPixelTexGenParameteriSGIS .type glPixelTexGenParameteriSGIS,#function glPixelTexGenParameteriSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelTexGenParameteriSGIS), %g2 or %g2, %lo(8 * _gloffset_PixelTexGenParameteriSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelTexGenParameteriSGIS)], %g3 #endif jmpl %g3, %g0 @@ -10776,19 +11294,20 @@ .globl glPixelTexGenParameterivSGIS .type glPixelTexGenParameterivSGIS,#function glPixelTexGenParameterivSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelTexGenParameterivSGIS), %g2 or %g2, %lo(8 * _gloffset_PixelTexGenParameterivSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelTexGenParameterivSGIS)], %g3 #endif jmpl %g3, %g0 @@ -10797,19 +11316,20 @@ .globl glPixelTexGenParameterfSGIS .type glPixelTexGenParameterfSGIS,#function glPixelTexGenParameterfSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelTexGenParameterfSGIS), %g2 or %g2, %lo(8 * _gloffset_PixelTexGenParameterfSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelTexGenParameterfSGIS)], %g3 #endif jmpl %g3, %g0 @@ -10818,19 +11338,20 @@ .globl glPixelTexGenParameterfvSGIS .type glPixelTexGenParameterfvSGIS,#function glPixelTexGenParameterfvSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PixelTexGenParameterfvSGIS), %g2 or %g2, %lo(8 * _gloffset_PixelTexGenParameterfvSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PixelTexGenParameterfvSGIS)], %g3 #endif jmpl %g3, %g0 @@ -10839,19 +11360,20 @@ .globl glGetPixelTexGenParameterivSGIS .type glGetPixelTexGenParameterivSGIS,#function glGetPixelTexGenParameterivSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetPixelTexGenParameterivSGIS), %g2 or %g2, %lo(8 * _gloffset_GetPixelTexGenParameterivSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetPixelTexGenParameterivSGIS)], %g3 #endif jmpl %g3, %g0 @@ -10860,19 +11382,20 @@ .globl glGetPixelTexGenParameterfvSGIS .type glGetPixelTexGenParameterfvSGIS,#function glGetPixelTexGenParameterfvSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetPixelTexGenParameterfvSGIS), %g2 or %g2, %lo(8 * _gloffset_GetPixelTexGenParameterfvSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetPixelTexGenParameterfvSGIS)], %g3 #endif jmpl %g3, %g0 @@ -10881,19 +11404,20 @@ .globl glTexImage4DSGIS .type glTexImage4DSGIS,#function glTexImage4DSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexImage4DSGIS), %g2 or %g2, %lo(8 * _gloffset_TexImage4DSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexImage4DSGIS)], %g3 #endif jmpl %g3, %g0 @@ -10902,19 +11426,20 @@ .globl glTexSubImage4DSGIS .type glTexSubImage4DSGIS,#function glTexSubImage4DSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexSubImage4DSGIS), %g2 or %g2, %lo(8 * _gloffset_TexSubImage4DSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexSubImage4DSGIS)], %g3 #endif jmpl %g3, %g0 @@ -10923,19 +11448,20 @@ .globl glAreTexturesResidentEXT .type glAreTexturesResidentEXT,#function glAreTexturesResidentEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_AreTexturesResidentEXT), %g2 or %g2, %lo(8 * _gloffset_AreTexturesResidentEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_AreTexturesResidentEXT)], %g3 #endif jmpl %g3, %g0 @@ -10944,19 +11470,20 @@ .globl glBindTextureEXT .type glBindTextureEXT,#function glBindTextureEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BindTexture), %g2 or %g2, %lo(8 * _gloffset_BindTexture), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BindTexture)], %g3 #endif jmpl %g3, %g0 @@ -10965,19 +11492,20 @@ .globl glDeleteTexturesEXT .type glDeleteTexturesEXT,#function glDeleteTexturesEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteTextures), %g2 or %g2, %lo(8 * _gloffset_DeleteTextures), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteTextures)], %g3 #endif jmpl %g3, %g0 @@ -10986,19 +11514,20 @@ .globl glGenTexturesEXT .type glGenTexturesEXT,#function glGenTexturesEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenTexturesEXT), %g2 or %g2, %lo(8 * _gloffset_GenTexturesEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenTexturesEXT)], %g3 #endif jmpl %g3, %g0 @@ -11007,19 +11536,20 @@ .globl glIsTextureEXT .type glIsTextureEXT,#function glIsTextureEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsTextureEXT), %g2 or %g2, %lo(8 * _gloffset_IsTextureEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsTextureEXT)], %g3 #endif jmpl %g3, %g0 @@ -11028,19 +11558,20 @@ .globl glPrioritizeTexturesEXT .type glPrioritizeTexturesEXT,#function glPrioritizeTexturesEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PrioritizeTextures), %g2 or %g2, %lo(8 * _gloffset_PrioritizeTextures), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PrioritizeTextures)], %g3 #endif jmpl %g3, %g0 @@ -11049,19 +11580,20 @@ .globl glDetailTexFuncSGIS .type glDetailTexFuncSGIS,#function glDetailTexFuncSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DetailTexFuncSGIS), %g2 or %g2, %lo(8 * _gloffset_DetailTexFuncSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DetailTexFuncSGIS)], %g3 #endif jmpl %g3, %g0 @@ -11070,19 +11602,20 @@ .globl glGetDetailTexFuncSGIS .type glGetDetailTexFuncSGIS,#function glGetDetailTexFuncSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetDetailTexFuncSGIS), %g2 or %g2, %lo(8 * _gloffset_GetDetailTexFuncSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetDetailTexFuncSGIS)], %g3 #endif jmpl %g3, %g0 @@ -11091,19 +11624,20 @@ .globl glSharpenTexFuncSGIS .type glSharpenTexFuncSGIS,#function glSharpenTexFuncSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SharpenTexFuncSGIS), %g2 or %g2, %lo(8 * _gloffset_SharpenTexFuncSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SharpenTexFuncSGIS)], %g3 #endif jmpl %g3, %g0 @@ -11112,19 +11646,20 @@ .globl glGetSharpenTexFuncSGIS .type glGetSharpenTexFuncSGIS,#function glGetSharpenTexFuncSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetSharpenTexFuncSGIS), %g2 or %g2, %lo(8 * _gloffset_GetSharpenTexFuncSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetSharpenTexFuncSGIS)], %g3 #endif jmpl %g3, %g0 @@ -11133,19 +11668,20 @@ .globl glSampleMaskSGIS .type glSampleMaskSGIS,#function glSampleMaskSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SampleMaskSGIS), %g2 or %g2, %lo(8 * _gloffset_SampleMaskSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SampleMaskSGIS)], %g3 #endif jmpl %g3, %g0 @@ -11154,19 +11690,20 @@ .globl glSamplePatternSGIS .type glSamplePatternSGIS,#function glSamplePatternSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SamplePatternSGIS), %g2 or %g2, %lo(8 * _gloffset_SamplePatternSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SamplePatternSGIS)], %g3 #endif jmpl %g3, %g0 @@ -11175,19 +11712,20 @@ .globl glArrayElementEXT .type glArrayElementEXT,#function glArrayElementEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ArrayElement), %g2 or %g2, %lo(8 * _gloffset_ArrayElement), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ArrayElement)], %g3 #endif jmpl %g3, %g0 @@ -11196,19 +11734,20 @@ .globl glColorPointerEXT .type glColorPointerEXT,#function glColorPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorPointerEXT), %g2 or %g2, %lo(8 * _gloffset_ColorPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -11217,19 +11756,20 @@ .globl glDrawArraysEXT .type glDrawArraysEXT,#function glDrawArraysEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DrawArrays), %g2 or %g2, %lo(8 * _gloffset_DrawArrays), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DrawArrays)], %g3 #endif jmpl %g3, %g0 @@ -11238,19 +11778,20 @@ .globl glEdgeFlagPointerEXT .type glEdgeFlagPointerEXT,#function glEdgeFlagPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EdgeFlagPointerEXT), %g2 or %g2, %lo(8 * _gloffset_EdgeFlagPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EdgeFlagPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -11259,19 +11800,20 @@ .globl glGetPointervEXT .type glGetPointervEXT,#function glGetPointervEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetPointerv), %g2 or %g2, %lo(8 * _gloffset_GetPointerv), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetPointerv)], %g3 #endif jmpl %g3, %g0 @@ -11280,19 +11822,20 @@ .globl glIndexPointerEXT .type glIndexPointerEXT,#function glIndexPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IndexPointerEXT), %g2 or %g2, %lo(8 * _gloffset_IndexPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IndexPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -11301,19 +11844,20 @@ .globl glNormalPointerEXT .type glNormalPointerEXT,#function glNormalPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_NormalPointerEXT), %g2 or %g2, %lo(8 * _gloffset_NormalPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_NormalPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -11322,19 +11866,20 @@ .globl glTexCoordPointerEXT .type glTexCoordPointerEXT,#function glTexCoordPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TexCoordPointerEXT), %g2 or %g2, %lo(8 * _gloffset_TexCoordPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TexCoordPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -11343,19 +11888,20 @@ .globl glVertexPointerEXT .type glVertexPointerEXT,#function glVertexPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexPointerEXT), %g2 or %g2, %lo(8 * _gloffset_VertexPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -11364,19 +11910,20 @@ .globl glBlendEquationEXT .type glBlendEquationEXT,#function glBlendEquationEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendEquation), %g2 or %g2, %lo(8 * _gloffset_BlendEquation), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendEquation)], %g3 #endif jmpl %g3, %g0 @@ -11385,19 +11932,20 @@ .globl glSpriteParameterfSGIX .type glSpriteParameterfSGIX,#function glSpriteParameterfSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SpriteParameterfSGIX), %g2 or %g2, %lo(8 * _gloffset_SpriteParameterfSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SpriteParameterfSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11406,19 +11954,20 @@ .globl glSpriteParameterfvSGIX .type glSpriteParameterfvSGIX,#function glSpriteParameterfvSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SpriteParameterfvSGIX), %g2 or %g2, %lo(8 * _gloffset_SpriteParameterfvSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SpriteParameterfvSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11427,19 +11976,20 @@ .globl glSpriteParameteriSGIX .type glSpriteParameteriSGIX,#function glSpriteParameteriSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SpriteParameteriSGIX), %g2 or %g2, %lo(8 * _gloffset_SpriteParameteriSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SpriteParameteriSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11448,19 +11998,20 @@ .globl glSpriteParameterivSGIX .type glSpriteParameterivSGIX,#function glSpriteParameterivSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SpriteParameterivSGIX), %g2 or %g2, %lo(8 * _gloffset_SpriteParameterivSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SpriteParameterivSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11469,19 +12020,20 @@ .globl glPointParameterfEXT .type glPointParameterfEXT,#function glPointParameterfEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterfEXT), %g2 or %g2, %lo(8 * _gloffset_PointParameterfEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterfEXT)], %g3 #endif jmpl %g3, %g0 @@ -11490,19 +12042,20 @@ .globl glPointParameterfvEXT .type glPointParameterfvEXT,#function glPointParameterfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_PointParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -11511,19 +12064,20 @@ .globl glPointParameterfARB .type glPointParameterfARB,#function glPointParameterfARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterfEXT), %g2 or %g2, %lo(8 * _gloffset_PointParameterfEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterfEXT)], %g3 #endif jmpl %g3, %g0 @@ -11532,19 +12086,20 @@ .globl glPointParameterfvARB .type glPointParameterfvARB,#function glPointParameterfvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_PointParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -11553,19 +12108,20 @@ .globl glPointParameterfSGIS .type glPointParameterfSGIS,#function glPointParameterfSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterfEXT), %g2 or %g2, %lo(8 * _gloffset_PointParameterfEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterfEXT)], %g3 #endif jmpl %g3, %g0 @@ -11574,19 +12130,20 @@ .globl glPointParameterfvSGIS .type glPointParameterfvSGIS,#function glPointParameterfvSGIS: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_PointParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -11595,19 +12152,20 @@ .globl glGetInstrumentsSGIX .type glGetInstrumentsSGIX,#function glGetInstrumentsSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetInstrumentsSGIX), %g2 or %g2, %lo(8 * _gloffset_GetInstrumentsSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetInstrumentsSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11616,19 +12174,20 @@ .globl glInstrumentsBufferSGIX .type glInstrumentsBufferSGIX,#function glInstrumentsBufferSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_InstrumentsBufferSGIX), %g2 or %g2, %lo(8 * _gloffset_InstrumentsBufferSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_InstrumentsBufferSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11637,19 +12196,20 @@ .globl glPollInstrumentsSGIX .type glPollInstrumentsSGIX,#function glPollInstrumentsSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PollInstrumentsSGIX), %g2 or %g2, %lo(8 * _gloffset_PollInstrumentsSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PollInstrumentsSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11658,19 +12218,20 @@ .globl glReadInstrumentsSGIX .type glReadInstrumentsSGIX,#function glReadInstrumentsSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ReadInstrumentsSGIX), %g2 or %g2, %lo(8 * _gloffset_ReadInstrumentsSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ReadInstrumentsSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11679,19 +12240,20 @@ .globl glStartInstrumentsSGIX .type glStartInstrumentsSGIX,#function glStartInstrumentsSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_StartInstrumentsSGIX), %g2 or %g2, %lo(8 * _gloffset_StartInstrumentsSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_StartInstrumentsSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11700,19 +12262,20 @@ .globl glStopInstrumentsSGIX .type glStopInstrumentsSGIX,#function glStopInstrumentsSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_StopInstrumentsSGIX), %g2 or %g2, %lo(8 * _gloffset_StopInstrumentsSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_StopInstrumentsSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11721,19 +12284,20 @@ .globl glFrameZoomSGIX .type glFrameZoomSGIX,#function glFrameZoomSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FrameZoomSGIX), %g2 or %g2, %lo(8 * _gloffset_FrameZoomSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FrameZoomSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11742,19 +12306,20 @@ .globl glTagSampleBufferSGIX .type glTagSampleBufferSGIX,#function glTagSampleBufferSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TagSampleBufferSGIX), %g2 or %g2, %lo(8 * _gloffset_TagSampleBufferSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TagSampleBufferSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11763,19 +12328,20 @@ .globl glReferencePlaneSGIX .type glReferencePlaneSGIX,#function glReferencePlaneSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ReferencePlaneSGIX), %g2 or %g2, %lo(8 * _gloffset_ReferencePlaneSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ReferencePlaneSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11784,19 +12350,20 @@ .globl glFlushRasterSGIX .type glFlushRasterSGIX,#function glFlushRasterSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FlushRasterSGIX), %g2 or %g2, %lo(8 * _gloffset_FlushRasterSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FlushRasterSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11805,19 +12372,20 @@ .globl glColorSubTableEXT .type glColorSubTableEXT,#function glColorSubTableEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorSubTable), %g2 or %g2, %lo(8 * _gloffset_ColorSubTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorSubTable)], %g3 #endif jmpl %g3, %g0 @@ -11826,19 +12394,20 @@ .globl glCopyColorSubTableEXT .type glCopyColorSubTableEXT,#function glCopyColorSubTableEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CopyColorSubTable), %g2 or %g2, %lo(8 * _gloffset_CopyColorSubTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CopyColorSubTable)], %g3 #endif jmpl %g3, %g0 @@ -11847,19 +12416,20 @@ .globl glHintPGI .type glHintPGI,#function glHintPGI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_HintPGI), %g2 or %g2, %lo(8 * _gloffset_HintPGI), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_HintPGI)], %g3 #endif jmpl %g3, %g0 @@ -11868,19 +12438,20 @@ .globl glColorTableEXT .type glColorTableEXT,#function glColorTableEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ColorTable), %g2 or %g2, %lo(8 * _gloffset_ColorTable), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ColorTable)], %g3 #endif jmpl %g3, %g0 @@ -11889,19 +12460,20 @@ .globl glGetColorTableEXT .type glGetColorTableEXT,#function glGetColorTableEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTableEXT), %g2 or %g2, %lo(8 * _gloffset_GetColorTableEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTableEXT)], %g3 #endif jmpl %g3, %g0 @@ -11910,19 +12482,20 @@ .globl glGetColorTableParameterivEXT .type glGetColorTableParameterivEXT,#function glGetColorTableParameterivEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTableParameterivEXT), %g2 or %g2, %lo(8 * _gloffset_GetColorTableParameterivEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTableParameterivEXT)], %g3 #endif jmpl %g3, %g0 @@ -11931,19 +12504,20 @@ .globl glGetColorTableParameterfvEXT .type glGetColorTableParameterfvEXT,#function glGetColorTableParameterfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetColorTableParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_GetColorTableParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetColorTableParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -11952,19 +12526,20 @@ .globl glGetListParameterfvSGIX .type glGetListParameterfvSGIX,#function glGetListParameterfvSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetListParameterfvSGIX), %g2 or %g2, %lo(8 * _gloffset_GetListParameterfvSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetListParameterfvSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11973,19 +12548,20 @@ .globl glGetListParameterivSGIX .type glGetListParameterivSGIX,#function glGetListParameterivSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetListParameterivSGIX), %g2 or %g2, %lo(8 * _gloffset_GetListParameterivSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetListParameterivSGIX)], %g3 #endif jmpl %g3, %g0 @@ -11994,19 +12570,20 @@ .globl glListParameterfSGIX .type glListParameterfSGIX,#function glListParameterfSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ListParameterfSGIX), %g2 or %g2, %lo(8 * _gloffset_ListParameterfSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ListParameterfSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12015,19 +12592,20 @@ .globl glListParameterfvSGIX .type glListParameterfvSGIX,#function glListParameterfvSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ListParameterfvSGIX), %g2 or %g2, %lo(8 * _gloffset_ListParameterfvSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ListParameterfvSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12036,19 +12614,20 @@ .globl glListParameteriSGIX .type glListParameteriSGIX,#function glListParameteriSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ListParameteriSGIX), %g2 or %g2, %lo(8 * _gloffset_ListParameteriSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ListParameteriSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12057,19 +12636,20 @@ .globl glListParameterivSGIX .type glListParameterivSGIX,#function glListParameterivSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ListParameterivSGIX), %g2 or %g2, %lo(8 * _gloffset_ListParameterivSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ListParameterivSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12078,19 +12658,20 @@ .globl glIndexMaterialEXT .type glIndexMaterialEXT,#function glIndexMaterialEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IndexMaterialEXT), %g2 or %g2, %lo(8 * _gloffset_IndexMaterialEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IndexMaterialEXT)], %g3 #endif jmpl %g3, %g0 @@ -12099,19 +12680,20 @@ .globl glIndexFuncEXT .type glIndexFuncEXT,#function glIndexFuncEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IndexFuncEXT), %g2 or %g2, %lo(8 * _gloffset_IndexFuncEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IndexFuncEXT)], %g3 #endif jmpl %g3, %g0 @@ -12120,19 +12702,20 @@ .globl glLockArraysEXT .type glLockArraysEXT,#function glLockArraysEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LockArraysEXT), %g2 or %g2, %lo(8 * _gloffset_LockArraysEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LockArraysEXT)], %g3 #endif jmpl %g3, %g0 @@ -12141,19 +12724,20 @@ .globl glUnlockArraysEXT .type glUnlockArraysEXT,#function glUnlockArraysEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_UnlockArraysEXT), %g2 or %g2, %lo(8 * _gloffset_UnlockArraysEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_UnlockArraysEXT)], %g3 #endif jmpl %g3, %g0 @@ -12162,19 +12746,20 @@ .globl glCullParameterdvEXT .type glCullParameterdvEXT,#function glCullParameterdvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CullParameterdvEXT), %g2 or %g2, %lo(8 * _gloffset_CullParameterdvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CullParameterdvEXT)], %g3 #endif jmpl %g3, %g0 @@ -12183,19 +12768,20 @@ .globl glCullParameterfvEXT .type glCullParameterfvEXT,#function glCullParameterfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CullParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_CullParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CullParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -12204,19 +12790,20 @@ .globl glFragmentColorMaterialSGIX .type glFragmentColorMaterialSGIX,#function glFragmentColorMaterialSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentColorMaterialSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentColorMaterialSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentColorMaterialSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12225,19 +12812,20 @@ .globl glFragmentLightfSGIX .type glFragmentLightfSGIX,#function glFragmentLightfSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentLightfSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentLightfSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentLightfSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12246,19 +12834,20 @@ .globl glFragmentLightfvSGIX .type glFragmentLightfvSGIX,#function glFragmentLightfvSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentLightfvSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentLightfvSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentLightfvSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12267,19 +12856,20 @@ .globl glFragmentLightiSGIX .type glFragmentLightiSGIX,#function glFragmentLightiSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentLightiSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentLightiSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentLightiSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12288,19 +12878,20 @@ .globl glFragmentLightivSGIX .type glFragmentLightivSGIX,#function glFragmentLightivSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentLightivSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentLightivSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentLightivSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12309,19 +12900,20 @@ .globl glFragmentLightModelfSGIX .type glFragmentLightModelfSGIX,#function glFragmentLightModelfSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentLightModelfSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentLightModelfSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentLightModelfSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12330,19 +12922,20 @@ .globl glFragmentLightModelfvSGIX .type glFragmentLightModelfvSGIX,#function glFragmentLightModelfvSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentLightModelfvSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentLightModelfvSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentLightModelfvSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12351,19 +12944,20 @@ .globl glFragmentLightModeliSGIX .type glFragmentLightModeliSGIX,#function glFragmentLightModeliSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentLightModeliSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentLightModeliSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentLightModeliSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12372,19 +12966,20 @@ .globl glFragmentLightModelivSGIX .type glFragmentLightModelivSGIX,#function glFragmentLightModelivSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentLightModelivSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentLightModelivSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentLightModelivSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12393,19 +12988,20 @@ .globl glFragmentMaterialfSGIX .type glFragmentMaterialfSGIX,#function glFragmentMaterialfSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentMaterialfSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentMaterialfSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentMaterialfSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12414,19 +13010,20 @@ .globl glFragmentMaterialfvSGIX .type glFragmentMaterialfvSGIX,#function glFragmentMaterialfvSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentMaterialfvSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentMaterialfvSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentMaterialfvSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12435,19 +13032,20 @@ .globl glFragmentMaterialiSGIX .type glFragmentMaterialiSGIX,#function glFragmentMaterialiSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentMaterialiSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentMaterialiSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentMaterialiSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12456,19 +13054,20 @@ .globl glFragmentMaterialivSGIX .type glFragmentMaterialivSGIX,#function glFragmentMaterialivSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FragmentMaterialivSGIX), %g2 or %g2, %lo(8 * _gloffset_FragmentMaterialivSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FragmentMaterialivSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12477,19 +13076,20 @@ .globl glGetFragmentLightfvSGIX .type glGetFragmentLightfvSGIX,#function glGetFragmentLightfvSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetFragmentLightfvSGIX), %g2 or %g2, %lo(8 * _gloffset_GetFragmentLightfvSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetFragmentLightfvSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12498,19 +13098,20 @@ .globl glGetFragmentLightivSGIX .type glGetFragmentLightivSGIX,#function glGetFragmentLightivSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetFragmentLightivSGIX), %g2 or %g2, %lo(8 * _gloffset_GetFragmentLightivSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetFragmentLightivSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12519,19 +13120,20 @@ .globl glGetFragmentMaterialfvSGIX .type glGetFragmentMaterialfvSGIX,#function glGetFragmentMaterialfvSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetFragmentMaterialfvSGIX), %g2 or %g2, %lo(8 * _gloffset_GetFragmentMaterialfvSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetFragmentMaterialfvSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12540,19 +13142,20 @@ .globl glGetFragmentMaterialivSGIX .type glGetFragmentMaterialivSGIX,#function glGetFragmentMaterialivSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetFragmentMaterialivSGIX), %g2 or %g2, %lo(8 * _gloffset_GetFragmentMaterialivSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetFragmentMaterialivSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12561,19 +13164,20 @@ .globl glLightEnviSGIX .type glLightEnviSGIX,#function glLightEnviSGIX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LightEnviSGIX), %g2 or %g2, %lo(8 * _gloffset_LightEnviSGIX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LightEnviSGIX)], %g3 #endif jmpl %g3, %g0 @@ -12582,19 +13186,20 @@ .globl glDrawRangeElementsEXT .type glDrawRangeElementsEXT,#function glDrawRangeElementsEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DrawRangeElements), %g2 or %g2, %lo(8 * _gloffset_DrawRangeElements), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DrawRangeElements)], %g3 #endif jmpl %g3, %g0 @@ -12603,19 +13208,20 @@ .globl glSecondaryColor3bEXT .type glSecondaryColor3bEXT,#function glSecondaryColor3bEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3bEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3bEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3bEXT)], %g3 #endif jmpl %g3, %g0 @@ -12624,19 +13230,20 @@ .globl glSecondaryColor3bvEXT .type glSecondaryColor3bvEXT,#function glSecondaryColor3bvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3bvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3bvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3bvEXT)], %g3 #endif jmpl %g3, %g0 @@ -12645,19 +13252,20 @@ .globl glSecondaryColor3dEXT .type glSecondaryColor3dEXT,#function glSecondaryColor3dEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3dEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3dEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3dEXT)], %g3 #endif jmpl %g3, %g0 @@ -12666,19 +13274,20 @@ .globl glSecondaryColor3dvEXT .type glSecondaryColor3dvEXT,#function glSecondaryColor3dvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3dvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3dvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3dvEXT)], %g3 #endif jmpl %g3, %g0 @@ -12687,19 +13296,20 @@ .globl glSecondaryColor3fEXT .type glSecondaryColor3fEXT,#function glSecondaryColor3fEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3fEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3fEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3fEXT)], %g3 #endif jmpl %g3, %g0 @@ -12708,19 +13318,20 @@ .globl glSecondaryColor3fvEXT .type glSecondaryColor3fvEXT,#function glSecondaryColor3fvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3fvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3fvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3fvEXT)], %g3 #endif jmpl %g3, %g0 @@ -12729,19 +13340,20 @@ .globl glSecondaryColor3iEXT .type glSecondaryColor3iEXT,#function glSecondaryColor3iEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3iEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3iEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3iEXT)], %g3 #endif jmpl %g3, %g0 @@ -12750,19 +13362,20 @@ .globl glSecondaryColor3ivEXT .type glSecondaryColor3ivEXT,#function glSecondaryColor3ivEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3ivEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3ivEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3ivEXT)], %g3 #endif jmpl %g3, %g0 @@ -12771,19 +13384,20 @@ .globl glSecondaryColor3sEXT .type glSecondaryColor3sEXT,#function glSecondaryColor3sEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3sEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3sEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3sEXT)], %g3 #endif jmpl %g3, %g0 @@ -12792,19 +13406,20 @@ .globl glSecondaryColor3svEXT .type glSecondaryColor3svEXT,#function glSecondaryColor3svEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3svEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3svEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3svEXT)], %g3 #endif jmpl %g3, %g0 @@ -12813,19 +13428,20 @@ .globl glSecondaryColor3ubEXT .type glSecondaryColor3ubEXT,#function glSecondaryColor3ubEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3ubEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3ubEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3ubEXT)], %g3 #endif jmpl %g3, %g0 @@ -12834,19 +13450,20 @@ .globl glSecondaryColor3ubvEXT .type glSecondaryColor3ubvEXT,#function glSecondaryColor3ubvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3ubvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3ubvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3ubvEXT)], %g3 #endif jmpl %g3, %g0 @@ -12855,19 +13472,20 @@ .globl glSecondaryColor3uiEXT .type glSecondaryColor3uiEXT,#function glSecondaryColor3uiEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3uiEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3uiEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3uiEXT)], %g3 #endif jmpl %g3, %g0 @@ -12876,19 +13494,20 @@ .globl glSecondaryColor3uivEXT .type glSecondaryColor3uivEXT,#function glSecondaryColor3uivEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3uivEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3uivEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3uivEXT)], %g3 #endif jmpl %g3, %g0 @@ -12897,19 +13516,20 @@ .globl glSecondaryColor3usEXT .type glSecondaryColor3usEXT,#function glSecondaryColor3usEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3usEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3usEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3usEXT)], %g3 #endif jmpl %g3, %g0 @@ -12918,19 +13538,20 @@ .globl glSecondaryColor3usvEXT .type glSecondaryColor3usvEXT,#function glSecondaryColor3usvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3usvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3usvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3usvEXT)], %g3 #endif jmpl %g3, %g0 @@ -12939,19 +13560,20 @@ .globl glSecondaryColorPointerEXT .type glSecondaryColorPointerEXT,#function glSecondaryColorPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColorPointerEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColorPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColorPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -12960,19 +13582,20 @@ .globl glMultiDrawArraysEXT .type glMultiDrawArraysEXT,#function glMultiDrawArraysEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiDrawArraysEXT), %g2 or %g2, %lo(8 * _gloffset_MultiDrawArraysEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiDrawArraysEXT)], %g3 #endif jmpl %g3, %g0 @@ -12981,19 +13604,20 @@ .globl glMultiDrawElementsEXT .type glMultiDrawElementsEXT,#function glMultiDrawElementsEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiDrawElementsEXT), %g2 or %g2, %lo(8 * _gloffset_MultiDrawElementsEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiDrawElementsEXT)], %g3 #endif jmpl %g3, %g0 @@ -13002,19 +13626,20 @@ .globl glFogCoordfEXT .type glFogCoordfEXT,#function glFogCoordfEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoordfEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoordfEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoordfEXT)], %g3 #endif jmpl %g3, %g0 @@ -13023,19 +13648,20 @@ .globl glFogCoordfvEXT .type glFogCoordfvEXT,#function glFogCoordfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoordfvEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoordfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoordfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -13044,19 +13670,20 @@ .globl glFogCoorddEXT .type glFogCoorddEXT,#function glFogCoorddEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoorddEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoorddEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoorddEXT)], %g3 #endif jmpl %g3, %g0 @@ -13065,19 +13692,20 @@ .globl glFogCoorddvEXT .type glFogCoorddvEXT,#function glFogCoorddvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoorddvEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoorddvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoorddvEXT)], %g3 #endif jmpl %g3, %g0 @@ -13086,19 +13714,20 @@ .globl glFogCoordPointerEXT .type glFogCoordPointerEXT,#function glFogCoordPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoordPointerEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoordPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoordPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -13107,19 +13736,20 @@ .globl glBlendFuncSeparateEXT .type glBlendFuncSeparateEXT,#function glBlendFuncSeparateEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendFuncSeparateEXT), %g2 or %g2, %lo(8 * _gloffset_BlendFuncSeparateEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendFuncSeparateEXT)], %g3 #endif jmpl %g3, %g0 @@ -13128,19 +13758,20 @@ .globl glBlendFuncSeparateINGR .type glBlendFuncSeparateINGR,#function glBlendFuncSeparateINGR: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendFuncSeparateEXT), %g2 or %g2, %lo(8 * _gloffset_BlendFuncSeparateEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendFuncSeparateEXT)], %g3 #endif jmpl %g3, %g0 @@ -13149,19 +13780,20 @@ .globl glVertexWeightfEXT .type glVertexWeightfEXT,#function glVertexWeightfEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexWeightfEXT), %g2 or %g2, %lo(8 * _gloffset_VertexWeightfEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexWeightfEXT)], %g3 #endif jmpl %g3, %g0 @@ -13170,19 +13802,20 @@ .globl glVertexWeightfvEXT .type glVertexWeightfvEXT,#function glVertexWeightfvEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexWeightfvEXT), %g2 or %g2, %lo(8 * _gloffset_VertexWeightfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexWeightfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -13191,19 +13824,20 @@ .globl glVertexWeightPointerEXT .type glVertexWeightPointerEXT,#function glVertexWeightPointerEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexWeightPointerEXT), %g2 or %g2, %lo(8 * _gloffset_VertexWeightPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexWeightPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -13212,19 +13846,20 @@ .globl glFlushVertexArrayRangeNV .type glFlushVertexArrayRangeNV,#function glFlushVertexArrayRangeNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FlushVertexArrayRangeNV), %g2 or %g2, %lo(8 * _gloffset_FlushVertexArrayRangeNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FlushVertexArrayRangeNV)], %g3 #endif jmpl %g3, %g0 @@ -13233,19 +13868,20 @@ .globl glVertexArrayRangeNV .type glVertexArrayRangeNV,#function glVertexArrayRangeNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexArrayRangeNV), %g2 or %g2, %lo(8 * _gloffset_VertexArrayRangeNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexArrayRangeNV)], %g3 #endif jmpl %g3, %g0 @@ -13254,19 +13890,20 @@ .globl glCombinerParameterfvNV .type glCombinerParameterfvNV,#function glCombinerParameterfvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CombinerParameterfvNV), %g2 or %g2, %lo(8 * _gloffset_CombinerParameterfvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CombinerParameterfvNV)], %g3 #endif jmpl %g3, %g0 @@ -13275,19 +13912,20 @@ .globl glCombinerParameterfNV .type glCombinerParameterfNV,#function glCombinerParameterfNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CombinerParameterfNV), %g2 or %g2, %lo(8 * _gloffset_CombinerParameterfNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CombinerParameterfNV)], %g3 #endif jmpl %g3, %g0 @@ -13296,19 +13934,20 @@ .globl glCombinerParameterivNV .type glCombinerParameterivNV,#function glCombinerParameterivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CombinerParameterivNV), %g2 or %g2, %lo(8 * _gloffset_CombinerParameterivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CombinerParameterivNV)], %g3 #endif jmpl %g3, %g0 @@ -13317,19 +13956,20 @@ .globl glCombinerParameteriNV .type glCombinerParameteriNV,#function glCombinerParameteriNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CombinerParameteriNV), %g2 or %g2, %lo(8 * _gloffset_CombinerParameteriNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CombinerParameteriNV)], %g3 #endif jmpl %g3, %g0 @@ -13338,19 +13978,20 @@ .globl glCombinerInputNV .type glCombinerInputNV,#function glCombinerInputNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CombinerInputNV), %g2 or %g2, %lo(8 * _gloffset_CombinerInputNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CombinerInputNV)], %g3 #endif jmpl %g3, %g0 @@ -13359,19 +14000,20 @@ .globl glCombinerOutputNV .type glCombinerOutputNV,#function glCombinerOutputNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_CombinerOutputNV), %g2 or %g2, %lo(8 * _gloffset_CombinerOutputNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_CombinerOutputNV)], %g3 #endif jmpl %g3, %g0 @@ -13380,19 +14022,20 @@ .globl glFinalCombinerInputNV .type glFinalCombinerInputNV,#function glFinalCombinerInputNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FinalCombinerInputNV), %g2 or %g2, %lo(8 * _gloffset_FinalCombinerInputNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FinalCombinerInputNV)], %g3 #endif jmpl %g3, %g0 @@ -13401,19 +14044,20 @@ .globl glGetCombinerInputParameterfvNV .type glGetCombinerInputParameterfvNV,#function glGetCombinerInputParameterfvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetCombinerInputParameterfvNV), %g2 or %g2, %lo(8 * _gloffset_GetCombinerInputParameterfvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetCombinerInputParameterfvNV)], %g3 #endif jmpl %g3, %g0 @@ -13422,19 +14066,20 @@ .globl glGetCombinerInputParameterivNV .type glGetCombinerInputParameterivNV,#function glGetCombinerInputParameterivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetCombinerInputParameterivNV), %g2 or %g2, %lo(8 * _gloffset_GetCombinerInputParameterivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetCombinerInputParameterivNV)], %g3 #endif jmpl %g3, %g0 @@ -13443,19 +14088,20 @@ .globl glGetCombinerOutputParameterfvNV .type glGetCombinerOutputParameterfvNV,#function glGetCombinerOutputParameterfvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetCombinerOutputParameterfvNV), %g2 or %g2, %lo(8 * _gloffset_GetCombinerOutputParameterfvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetCombinerOutputParameterfvNV)], %g3 #endif jmpl %g3, %g0 @@ -13464,19 +14110,20 @@ .globl glGetCombinerOutputParameterivNV .type glGetCombinerOutputParameterivNV,#function glGetCombinerOutputParameterivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetCombinerOutputParameterivNV), %g2 or %g2, %lo(8 * _gloffset_GetCombinerOutputParameterivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetCombinerOutputParameterivNV)], %g3 #endif jmpl %g3, %g0 @@ -13485,19 +14132,20 @@ .globl glGetFinalCombinerInputParameterfvNV .type glGetFinalCombinerInputParameterfvNV,#function glGetFinalCombinerInputParameterfvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetFinalCombinerInputParameterfvNV), %g2 or %g2, %lo(8 * _gloffset_GetFinalCombinerInputParameterfvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetFinalCombinerInputParameterfvNV)], %g3 #endif jmpl %g3, %g0 @@ -13506,19 +14154,20 @@ .globl glGetFinalCombinerInputParameterivNV .type glGetFinalCombinerInputParameterivNV,#function glGetFinalCombinerInputParameterivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetFinalCombinerInputParameterivNV), %g2 or %g2, %lo(8 * _gloffset_GetFinalCombinerInputParameterivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetFinalCombinerInputParameterivNV)], %g3 #endif jmpl %g3, %g0 @@ -13527,19 +14176,20 @@ .globl glResizeBuffersMESA .type glResizeBuffersMESA,#function glResizeBuffersMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ResizeBuffersMESA), %g2 or %g2, %lo(8 * _gloffset_ResizeBuffersMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ResizeBuffersMESA)], %g3 #endif jmpl %g3, %g0 @@ -13548,19 +14198,20 @@ .globl glWindowPos2dMESA .type glWindowPos2dMESA,#function glWindowPos2dMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2dMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2dMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2dMESA)], %g3 #endif jmpl %g3, %g0 @@ -13569,19 +14220,20 @@ .globl glWindowPos2dvMESA .type glWindowPos2dvMESA,#function glWindowPos2dvMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2dvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2dvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2dvMESA)], %g3 #endif jmpl %g3, %g0 @@ -13590,19 +14242,20 @@ .globl glWindowPos2fMESA .type glWindowPos2fMESA,#function glWindowPos2fMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2fMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2fMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2fMESA)], %g3 #endif jmpl %g3, %g0 @@ -13611,19 +14264,20 @@ .globl glWindowPos2fvMESA .type glWindowPos2fvMESA,#function glWindowPos2fvMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2fvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2fvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2fvMESA)], %g3 #endif jmpl %g3, %g0 @@ -13632,19 +14286,20 @@ .globl glWindowPos2iMESA .type glWindowPos2iMESA,#function glWindowPos2iMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2iMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2iMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2iMESA)], %g3 #endif jmpl %g3, %g0 @@ -13653,19 +14308,20 @@ .globl glWindowPos2ivMESA .type glWindowPos2ivMESA,#function glWindowPos2ivMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2ivMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2ivMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2ivMESA)], %g3 #endif jmpl %g3, %g0 @@ -13674,19 +14330,20 @@ .globl glWindowPos2sMESA .type glWindowPos2sMESA,#function glWindowPos2sMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2sMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2sMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2sMESA)], %g3 #endif jmpl %g3, %g0 @@ -13695,19 +14352,20 @@ .globl glWindowPos2svMESA .type glWindowPos2svMESA,#function glWindowPos2svMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2svMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2svMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2svMESA)], %g3 #endif jmpl %g3, %g0 @@ -13716,19 +14374,20 @@ .globl glWindowPos3dMESA .type glWindowPos3dMESA,#function glWindowPos3dMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3dMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3dMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3dMESA)], %g3 #endif jmpl %g3, %g0 @@ -13737,19 +14396,20 @@ .globl glWindowPos3dvMESA .type glWindowPos3dvMESA,#function glWindowPos3dvMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3dvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3dvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3dvMESA)], %g3 #endif jmpl %g3, %g0 @@ -13758,19 +14418,20 @@ .globl glWindowPos3fMESA .type glWindowPos3fMESA,#function glWindowPos3fMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3fMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3fMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3fMESA)], %g3 #endif jmpl %g3, %g0 @@ -13779,19 +14440,20 @@ .globl glWindowPos3fvMESA .type glWindowPos3fvMESA,#function glWindowPos3fvMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3fvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3fvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3fvMESA)], %g3 #endif jmpl %g3, %g0 @@ -13800,19 +14462,20 @@ .globl glWindowPos3iMESA .type glWindowPos3iMESA,#function glWindowPos3iMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3iMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3iMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3iMESA)], %g3 #endif jmpl %g3, %g0 @@ -13821,19 +14484,20 @@ .globl glWindowPos3ivMESA .type glWindowPos3ivMESA,#function glWindowPos3ivMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3ivMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3ivMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3ivMESA)], %g3 #endif jmpl %g3, %g0 @@ -13842,19 +14506,20 @@ .globl glWindowPos3sMESA .type glWindowPos3sMESA,#function glWindowPos3sMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3sMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3sMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3sMESA)], %g3 #endif jmpl %g3, %g0 @@ -13863,19 +14528,20 @@ .globl glWindowPos3svMESA .type glWindowPos3svMESA,#function glWindowPos3svMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3svMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3svMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3svMESA)], %g3 #endif jmpl %g3, %g0 @@ -13884,19 +14550,20 @@ .globl glWindowPos4dMESA .type glWindowPos4dMESA,#function glWindowPos4dMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos4dMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos4dMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos4dMESA)], %g3 #endif jmpl %g3, %g0 @@ -13905,19 +14572,20 @@ .globl glWindowPos4dvMESA .type glWindowPos4dvMESA,#function glWindowPos4dvMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos4dvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos4dvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos4dvMESA)], %g3 #endif jmpl %g3, %g0 @@ -13926,19 +14594,20 @@ .globl glWindowPos4fMESA .type glWindowPos4fMESA,#function glWindowPos4fMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos4fMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos4fMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos4fMESA)], %g3 #endif jmpl %g3, %g0 @@ -13947,19 +14616,20 @@ .globl glWindowPos4fvMESA .type glWindowPos4fvMESA,#function glWindowPos4fvMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos4fvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos4fvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos4fvMESA)], %g3 #endif jmpl %g3, %g0 @@ -13968,19 +14638,20 @@ .globl glWindowPos4iMESA .type glWindowPos4iMESA,#function glWindowPos4iMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos4iMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos4iMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos4iMESA)], %g3 #endif jmpl %g3, %g0 @@ -13989,19 +14660,20 @@ .globl glWindowPos4ivMESA .type glWindowPos4ivMESA,#function glWindowPos4ivMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos4ivMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos4ivMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos4ivMESA)], %g3 #endif jmpl %g3, %g0 @@ -14010,19 +14682,20 @@ .globl glWindowPos4sMESA .type glWindowPos4sMESA,#function glWindowPos4sMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos4sMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos4sMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos4sMESA)], %g3 #endif jmpl %g3, %g0 @@ -14031,19 +14704,20 @@ .globl glWindowPos4svMESA .type glWindowPos4svMESA,#function glWindowPos4svMESA: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos4svMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos4svMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos4svMESA)], %g3 #endif jmpl %g3, %g0 @@ -14052,19 +14726,20 @@ .globl glMultiModeDrawArraysIBM .type glMultiModeDrawArraysIBM,#function glMultiModeDrawArraysIBM: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiModeDrawArraysIBM), %g2 or %g2, %lo(8 * _gloffset_MultiModeDrawArraysIBM), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiModeDrawArraysIBM)], %g3 #endif jmpl %g3, %g0 @@ -14073,19 +14748,20 @@ .globl glMultiModeDrawElementsIBM .type glMultiModeDrawElementsIBM,#function glMultiModeDrawElementsIBM: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiModeDrawElementsIBM), %g2 or %g2, %lo(8 * _gloffset_MultiModeDrawElementsIBM), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiModeDrawElementsIBM)], %g3 #endif jmpl %g3, %g0 @@ -14094,19 +14770,20 @@ .globl glTbufferMask3DFX .type glTbufferMask3DFX,#function glTbufferMask3DFX: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TbufferMask3DFX), %g2 or %g2, %lo(8 * _gloffset_TbufferMask3DFX), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TbufferMask3DFX)], %g3 #endif jmpl %g3, %g0 @@ -14115,19 +14792,20 @@ .globl glSampleMaskEXT .type glSampleMaskEXT,#function glSampleMaskEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SampleMaskSGIS), %g2 or %g2, %lo(8 * _gloffset_SampleMaskSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SampleMaskSGIS)], %g3 #endif jmpl %g3, %g0 @@ -14136,19 +14814,20 @@ .globl glSamplePatternEXT .type glSamplePatternEXT,#function glSamplePatternEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SamplePatternSGIS), %g2 or %g2, %lo(8 * _gloffset_SamplePatternSGIS), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SamplePatternSGIS)], %g3 #endif jmpl %g3, %g0 @@ -14157,19 +14836,20 @@ .globl glWindowPos2dARB .type glWindowPos2dARB,#function glWindowPos2dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2dMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2dMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2dMESA)], %g3 #endif jmpl %g3, %g0 @@ -14178,19 +14858,20 @@ .globl glWindowPos2fARB .type glWindowPos2fARB,#function glWindowPos2fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2fMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2fMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2fMESA)], %g3 #endif jmpl %g3, %g0 @@ -14199,19 +14880,20 @@ .globl glWindowPos2iARB .type glWindowPos2iARB,#function glWindowPos2iARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2iMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2iMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2iMESA)], %g3 #endif jmpl %g3, %g0 @@ -14220,19 +14902,20 @@ .globl glWindowPos2sARB .type glWindowPos2sARB,#function glWindowPos2sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2sMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2sMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2sMESA)], %g3 #endif jmpl %g3, %g0 @@ -14241,19 +14924,20 @@ .globl glWindowPos2dvARB .type glWindowPos2dvARB,#function glWindowPos2dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2dvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2dvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2dvMESA)], %g3 #endif jmpl %g3, %g0 @@ -14262,19 +14946,20 @@ .globl glWindowPos2fvARB .type glWindowPos2fvARB,#function glWindowPos2fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2fvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2fvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2fvMESA)], %g3 #endif jmpl %g3, %g0 @@ -14283,19 +14968,20 @@ .globl glWindowPos2ivARB .type glWindowPos2ivARB,#function glWindowPos2ivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2ivMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2ivMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2ivMESA)], %g3 #endif jmpl %g3, %g0 @@ -14304,19 +14990,20 @@ .globl glWindowPos2svARB .type glWindowPos2svARB,#function glWindowPos2svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2svMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2svMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2svMESA)], %g3 #endif jmpl %g3, %g0 @@ -14325,19 +15012,20 @@ .globl glWindowPos3dARB .type glWindowPos3dARB,#function glWindowPos3dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3dMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3dMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3dMESA)], %g3 #endif jmpl %g3, %g0 @@ -14346,19 +15034,20 @@ .globl glWindowPos3fARB .type glWindowPos3fARB,#function glWindowPos3fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3fMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3fMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3fMESA)], %g3 #endif jmpl %g3, %g0 @@ -14367,19 +15056,20 @@ .globl glWindowPos3iARB .type glWindowPos3iARB,#function glWindowPos3iARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3iMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3iMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3iMESA)], %g3 #endif jmpl %g3, %g0 @@ -14388,19 +15078,20 @@ .globl glWindowPos3sARB .type glWindowPos3sARB,#function glWindowPos3sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3sMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3sMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3sMESA)], %g3 #endif jmpl %g3, %g0 @@ -14409,19 +15100,20 @@ .globl glWindowPos3dvARB .type glWindowPos3dvARB,#function glWindowPos3dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3dvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3dvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3dvMESA)], %g3 #endif jmpl %g3, %g0 @@ -14430,19 +15122,20 @@ .globl glWindowPos3fvARB .type glWindowPos3fvARB,#function glWindowPos3fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3fvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3fvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3fvMESA)], %g3 #endif jmpl %g3, %g0 @@ -14451,19 +15144,20 @@ .globl glWindowPos3ivARB .type glWindowPos3ivARB,#function glWindowPos3ivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3ivMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3ivMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3ivMESA)], %g3 #endif jmpl %g3, %g0 @@ -14472,19 +15166,20 @@ .globl glWindowPos3svARB .type glWindowPos3svARB,#function glWindowPos3svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3svMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3svMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3svMESA)], %g3 #endif jmpl %g3, %g0 @@ -14493,19 +15188,20 @@ .globl glAreProgramsResidentNV .type glAreProgramsResidentNV,#function glAreProgramsResidentNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_AreProgramsResidentNV), %g2 or %g2, %lo(8 * _gloffset_AreProgramsResidentNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_AreProgramsResidentNV)], %g3 #endif jmpl %g3, %g0 @@ -14514,19 +15210,20 @@ .globl glBindProgramNV .type glBindProgramNV,#function glBindProgramNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BindProgramNV), %g2 or %g2, %lo(8 * _gloffset_BindProgramNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BindProgramNV)], %g3 #endif jmpl %g3, %g0 @@ -14535,19 +15232,20 @@ .globl glDeleteProgramsNV .type glDeleteProgramsNV,#function glDeleteProgramsNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteProgramsNV), %g2 or %g2, %lo(8 * _gloffset_DeleteProgramsNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteProgramsNV)], %g3 #endif jmpl %g3, %g0 @@ -14556,19 +15254,20 @@ .globl glExecuteProgramNV .type glExecuteProgramNV,#function glExecuteProgramNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ExecuteProgramNV), %g2 or %g2, %lo(8 * _gloffset_ExecuteProgramNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ExecuteProgramNV)], %g3 #endif jmpl %g3, %g0 @@ -14577,19 +15276,20 @@ .globl glGenProgramsNV .type glGenProgramsNV,#function glGenProgramsNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenProgramsNV), %g2 or %g2, %lo(8 * _gloffset_GenProgramsNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenProgramsNV)], %g3 #endif jmpl %g3, %g0 @@ -14598,19 +15298,20 @@ .globl glGetProgramParameterdvNV .type glGetProgramParameterdvNV,#function glGetProgramParameterdvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramParameterdvNV), %g2 or %g2, %lo(8 * _gloffset_GetProgramParameterdvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramParameterdvNV)], %g3 #endif jmpl %g3, %g0 @@ -14619,19 +15320,20 @@ .globl glGetProgramParameterfvNV .type glGetProgramParameterfvNV,#function glGetProgramParameterfvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramParameterfvNV), %g2 or %g2, %lo(8 * _gloffset_GetProgramParameterfvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramParameterfvNV)], %g3 #endif jmpl %g3, %g0 @@ -14640,19 +15342,20 @@ .globl glGetProgramivNV .type glGetProgramivNV,#function glGetProgramivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramivNV), %g2 or %g2, %lo(8 * _gloffset_GetProgramivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramivNV)], %g3 #endif jmpl %g3, %g0 @@ -14661,19 +15364,20 @@ .globl glGetProgramStringNV .type glGetProgramStringNV,#function glGetProgramStringNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramStringNV), %g2 or %g2, %lo(8 * _gloffset_GetProgramStringNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramStringNV)], %g3 #endif jmpl %g3, %g0 @@ -14682,19 +15386,20 @@ .globl glGetTrackMatrixivNV .type glGetTrackMatrixivNV,#function glGetTrackMatrixivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetTrackMatrixivNV), %g2 or %g2, %lo(8 * _gloffset_GetTrackMatrixivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetTrackMatrixivNV)], %g3 #endif jmpl %g3, %g0 @@ -14703,19 +15408,20 @@ .globl glGetVertexAttribdvNV .type glGetVertexAttribdvNV,#function glGetVertexAttribdvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetVertexAttribdvNV), %g2 or %g2, %lo(8 * _gloffset_GetVertexAttribdvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetVertexAttribdvNV)], %g3 #endif jmpl %g3, %g0 @@ -14724,19 +15430,20 @@ .globl glGetVertexAttribfvNV .type glGetVertexAttribfvNV,#function glGetVertexAttribfvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetVertexAttribfvNV), %g2 or %g2, %lo(8 * _gloffset_GetVertexAttribfvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetVertexAttribfvNV)], %g3 #endif jmpl %g3, %g0 @@ -14745,19 +15452,20 @@ .globl glGetVertexAttribivNV .type glGetVertexAttribivNV,#function glGetVertexAttribivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetVertexAttribivNV), %g2 or %g2, %lo(8 * _gloffset_GetVertexAttribivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetVertexAttribivNV)], %g3 #endif jmpl %g3, %g0 @@ -14766,19 +15474,20 @@ .globl glGetVertexAttribPointervNV .type glGetVertexAttribPointervNV,#function glGetVertexAttribPointervNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetVertexAttribPointervNV), %g2 or %g2, %lo(8 * _gloffset_GetVertexAttribPointervNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetVertexAttribPointervNV)], %g3 #endif jmpl %g3, %g0 @@ -14787,19 +15496,20 @@ .globl glIsProgramNV .type glIsProgramNV,#function glIsProgramNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsProgramNV), %g2 or %g2, %lo(8 * _gloffset_IsProgramNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsProgramNV)], %g3 #endif jmpl %g3, %g0 @@ -14808,19 +15518,20 @@ .globl glLoadProgramNV .type glLoadProgramNV,#function glLoadProgramNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_LoadProgramNV), %g2 or %g2, %lo(8 * _gloffset_LoadProgramNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_LoadProgramNV)], %g3 #endif jmpl %g3, %g0 @@ -14829,19 +15540,20 @@ .globl glProgramParameter4dNV .type glProgramParameter4dNV,#function glProgramParameter4dNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramParameter4dNV), %g2 or %g2, %lo(8 * _gloffset_ProgramParameter4dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramParameter4dNV)], %g3 #endif jmpl %g3, %g0 @@ -14850,19 +15562,20 @@ .globl glProgramParameter4dvNV .type glProgramParameter4dvNV,#function glProgramParameter4dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramParameter4dvNV), %g2 or %g2, %lo(8 * _gloffset_ProgramParameter4dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramParameter4dvNV)], %g3 #endif jmpl %g3, %g0 @@ -14871,19 +15584,20 @@ .globl glProgramParameter4fNV .type glProgramParameter4fNV,#function glProgramParameter4fNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramParameter4fNV), %g2 or %g2, %lo(8 * _gloffset_ProgramParameter4fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramParameter4fNV)], %g3 #endif jmpl %g3, %g0 @@ -14892,19 +15606,20 @@ .globl glProgramParameter4fvNV .type glProgramParameter4fvNV,#function glProgramParameter4fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramParameter4fvNV), %g2 or %g2, %lo(8 * _gloffset_ProgramParameter4fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramParameter4fvNV)], %g3 #endif jmpl %g3, %g0 @@ -14913,19 +15628,20 @@ .globl glProgramParameters4dvNV .type glProgramParameters4dvNV,#function glProgramParameters4dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramParameters4dvNV), %g2 or %g2, %lo(8 * _gloffset_ProgramParameters4dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramParameters4dvNV)], %g3 #endif jmpl %g3, %g0 @@ -14934,19 +15650,20 @@ .globl glProgramParameters4fvNV .type glProgramParameters4fvNV,#function glProgramParameters4fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramParameters4fvNV), %g2 or %g2, %lo(8 * _gloffset_ProgramParameters4fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramParameters4fvNV)], %g3 #endif jmpl %g3, %g0 @@ -14955,19 +15672,20 @@ .globl glRequestResidentProgramsNV .type glRequestResidentProgramsNV,#function glRequestResidentProgramsNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_RequestResidentProgramsNV), %g2 or %g2, %lo(8 * _gloffset_RequestResidentProgramsNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_RequestResidentProgramsNV)], %g3 #endif jmpl %g3, %g0 @@ -14976,19 +15694,20 @@ .globl glTrackMatrixNV .type glTrackMatrixNV,#function glTrackMatrixNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TrackMatrixNV), %g2 or %g2, %lo(8 * _gloffset_TrackMatrixNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TrackMatrixNV)], %g3 #endif jmpl %g3, %g0 @@ -14997,19 +15716,20 @@ .globl glVertexAttribPointerNV .type glVertexAttribPointerNV,#function glVertexAttribPointerNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribPointerNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribPointerNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribPointerNV)], %g3 #endif jmpl %g3, %g0 @@ -15018,19 +15738,20 @@ .globl glVertexAttrib1dNV .type glVertexAttrib1dNV,#function glVertexAttrib1dNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1dNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1dNV)], %g3 #endif jmpl %g3, %g0 @@ -15039,19 +15760,20 @@ .globl glVertexAttrib1dvNV .type glVertexAttrib1dvNV,#function glVertexAttrib1dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1dvNV)], %g3 #endif jmpl %g3, %g0 @@ -15060,19 +15782,20 @@ .globl glVertexAttrib1fNV .type glVertexAttrib1fNV,#function glVertexAttrib1fNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1fNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1fNV)], %g3 #endif jmpl %g3, %g0 @@ -15081,19 +15804,20 @@ .globl glVertexAttrib1fvNV .type glVertexAttrib1fvNV,#function glVertexAttrib1fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1fvNV)], %g3 #endif jmpl %g3, %g0 @@ -15102,19 +15826,20 @@ .globl glVertexAttrib1sNV .type glVertexAttrib1sNV,#function glVertexAttrib1sNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1sNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1sNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1sNV)], %g3 #endif jmpl %g3, %g0 @@ -15123,19 +15848,20 @@ .globl glVertexAttrib1svNV .type glVertexAttrib1svNV,#function glVertexAttrib1svNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1svNV)], %g3 #endif jmpl %g3, %g0 @@ -15144,19 +15870,20 @@ .globl glVertexAttrib2dNV .type glVertexAttrib2dNV,#function glVertexAttrib2dNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2dNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2dNV)], %g3 #endif jmpl %g3, %g0 @@ -15165,19 +15892,20 @@ .globl glVertexAttrib2dvNV .type glVertexAttrib2dvNV,#function glVertexAttrib2dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2dvNV)], %g3 #endif jmpl %g3, %g0 @@ -15186,19 +15914,20 @@ .globl glVertexAttrib2fNV .type glVertexAttrib2fNV,#function glVertexAttrib2fNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2fNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2fNV)], %g3 #endif jmpl %g3, %g0 @@ -15207,19 +15936,20 @@ .globl glVertexAttrib2fvNV .type glVertexAttrib2fvNV,#function glVertexAttrib2fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2fvNV)], %g3 #endif jmpl %g3, %g0 @@ -15228,19 +15958,20 @@ .globl glVertexAttrib2sNV .type glVertexAttrib2sNV,#function glVertexAttrib2sNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2sNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2sNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2sNV)], %g3 #endif jmpl %g3, %g0 @@ -15249,19 +15980,20 @@ .globl glVertexAttrib2svNV .type glVertexAttrib2svNV,#function glVertexAttrib2svNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2svNV)], %g3 #endif jmpl %g3, %g0 @@ -15270,19 +16002,20 @@ .globl glVertexAttrib3dNV .type glVertexAttrib3dNV,#function glVertexAttrib3dNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3dNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3dNV)], %g3 #endif jmpl %g3, %g0 @@ -15291,19 +16024,20 @@ .globl glVertexAttrib3dvNV .type glVertexAttrib3dvNV,#function glVertexAttrib3dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3dvNV)], %g3 #endif jmpl %g3, %g0 @@ -15312,19 +16046,20 @@ .globl glVertexAttrib3fNV .type glVertexAttrib3fNV,#function glVertexAttrib3fNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3fNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3fNV)], %g3 #endif jmpl %g3, %g0 @@ -15333,19 +16068,20 @@ .globl glVertexAttrib3fvNV .type glVertexAttrib3fvNV,#function glVertexAttrib3fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3fvNV)], %g3 #endif jmpl %g3, %g0 @@ -15354,19 +16090,20 @@ .globl glVertexAttrib3sNV .type glVertexAttrib3sNV,#function glVertexAttrib3sNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3sNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3sNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3sNV)], %g3 #endif jmpl %g3, %g0 @@ -15375,19 +16112,20 @@ .globl glVertexAttrib3svNV .type glVertexAttrib3svNV,#function glVertexAttrib3svNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3svNV)], %g3 #endif jmpl %g3, %g0 @@ -15396,19 +16134,20 @@ .globl glVertexAttrib4dNV .type glVertexAttrib4dNV,#function glVertexAttrib4dNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4dNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4dNV)], %g3 #endif jmpl %g3, %g0 @@ -15417,19 +16156,20 @@ .globl glVertexAttrib4dvNV .type glVertexAttrib4dvNV,#function glVertexAttrib4dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4dvNV)], %g3 #endif jmpl %g3, %g0 @@ -15438,19 +16178,20 @@ .globl glVertexAttrib4fNV .type glVertexAttrib4fNV,#function glVertexAttrib4fNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4fNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4fNV)], %g3 #endif jmpl %g3, %g0 @@ -15459,19 +16200,20 @@ .globl glVertexAttrib4fvNV .type glVertexAttrib4fvNV,#function glVertexAttrib4fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4fvNV)], %g3 #endif jmpl %g3, %g0 @@ -15480,19 +16222,20 @@ .globl glVertexAttrib4sNV .type glVertexAttrib4sNV,#function glVertexAttrib4sNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4sNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4sNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4sNV)], %g3 #endif jmpl %g3, %g0 @@ -15501,19 +16244,20 @@ .globl glVertexAttrib4svNV .type glVertexAttrib4svNV,#function glVertexAttrib4svNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4svNV)], %g3 #endif jmpl %g3, %g0 @@ -15522,19 +16266,20 @@ .globl glVertexAttrib4ubNV .type glVertexAttrib4ubNV,#function glVertexAttrib4ubNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4ubNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4ubNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4ubNV)], %g3 #endif jmpl %g3, %g0 @@ -15543,19 +16288,20 @@ .globl glVertexAttrib4ubvNV .type glVertexAttrib4ubvNV,#function glVertexAttrib4ubvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4ubvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4ubvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4ubvNV)], %g3 #endif jmpl %g3, %g0 @@ -15564,19 +16310,20 @@ .globl glVertexAttribs1dvNV .type glVertexAttribs1dvNV,#function glVertexAttribs1dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs1dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs1dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs1dvNV)], %g3 #endif jmpl %g3, %g0 @@ -15585,19 +16332,20 @@ .globl glVertexAttribs1fvNV .type glVertexAttribs1fvNV,#function glVertexAttribs1fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs1fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs1fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs1fvNV)], %g3 #endif jmpl %g3, %g0 @@ -15606,19 +16354,20 @@ .globl glVertexAttribs1svNV .type glVertexAttribs1svNV,#function glVertexAttribs1svNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs1svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs1svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs1svNV)], %g3 #endif jmpl %g3, %g0 @@ -15627,19 +16376,20 @@ .globl glVertexAttribs2dvNV .type glVertexAttribs2dvNV,#function glVertexAttribs2dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs2dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs2dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs2dvNV)], %g3 #endif jmpl %g3, %g0 @@ -15648,19 +16398,20 @@ .globl glVertexAttribs2fvNV .type glVertexAttribs2fvNV,#function glVertexAttribs2fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs2fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs2fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs2fvNV)], %g3 #endif jmpl %g3, %g0 @@ -15669,19 +16420,20 @@ .globl glVertexAttribs2svNV .type glVertexAttribs2svNV,#function glVertexAttribs2svNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs2svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs2svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs2svNV)], %g3 #endif jmpl %g3, %g0 @@ -15690,19 +16442,20 @@ .globl glVertexAttribs3dvNV .type glVertexAttribs3dvNV,#function glVertexAttribs3dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs3dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs3dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs3dvNV)], %g3 #endif jmpl %g3, %g0 @@ -15711,19 +16464,20 @@ .globl glVertexAttribs3fvNV .type glVertexAttribs3fvNV,#function glVertexAttribs3fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs3fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs3fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs3fvNV)], %g3 #endif jmpl %g3, %g0 @@ -15732,19 +16486,20 @@ .globl glVertexAttribs3svNV .type glVertexAttribs3svNV,#function glVertexAttribs3svNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs3svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs3svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs3svNV)], %g3 #endif jmpl %g3, %g0 @@ -15753,19 +16508,20 @@ .globl glVertexAttribs4dvNV .type glVertexAttribs4dvNV,#function glVertexAttribs4dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs4dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs4dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs4dvNV)], %g3 #endif jmpl %g3, %g0 @@ -15774,19 +16530,20 @@ .globl glVertexAttribs4fvNV .type glVertexAttribs4fvNV,#function glVertexAttribs4fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs4fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs4fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs4fvNV)], %g3 #endif jmpl %g3, %g0 @@ -15795,19 +16552,20 @@ .globl glVertexAttribs4svNV .type glVertexAttribs4svNV,#function glVertexAttribs4svNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs4svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs4svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs4svNV)], %g3 #endif jmpl %g3, %g0 @@ -15816,19 +16574,20 @@ .globl glVertexAttribs4ubvNV .type glVertexAttribs4ubvNV,#function glVertexAttribs4ubvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribs4ubvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttribs4ubvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribs4ubvNV)], %g3 #endif jmpl %g3, %g0 @@ -15837,19 +16596,20 @@ .globl glPointParameteriNV .type glPointParameteriNV,#function glPointParameteriNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameteriNV), %g2 or %g2, %lo(8 * _gloffset_PointParameteriNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameteriNV)], %g3 #endif jmpl %g3, %g0 @@ -15858,19 +16618,20 @@ .globl glPointParameterivNV .type glPointParameterivNV,#function glPointParameterivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterivNV), %g2 or %g2, %lo(8 * _gloffset_PointParameterivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterivNV)], %g3 #endif jmpl %g3, %g0 @@ -15879,19 +16640,20 @@ .globl glBlendFuncSeparate .type glBlendFuncSeparate,#function glBlendFuncSeparate: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendFuncSeparateEXT), %g2 or %g2, %lo(8 * _gloffset_BlendFuncSeparateEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendFuncSeparateEXT)], %g3 #endif jmpl %g3, %g0 @@ -15900,19 +16662,20 @@ .globl glFogCoordf .type glFogCoordf,#function glFogCoordf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoordfEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoordfEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoordfEXT)], %g3 #endif jmpl %g3, %g0 @@ -15921,19 +16684,20 @@ .globl glFogCoordfv .type glFogCoordfv,#function glFogCoordfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoordfvEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoordfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoordfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -15942,19 +16706,20 @@ .globl glFogCoordd .type glFogCoordd,#function glFogCoordd: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoorddEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoorddEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoorddEXT)], %g3 #endif jmpl %g3, %g0 @@ -15963,19 +16728,20 @@ .globl glFogCoorddv .type glFogCoorddv,#function glFogCoorddv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoorddvEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoorddvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoorddvEXT)], %g3 #endif jmpl %g3, %g0 @@ -15984,19 +16750,20 @@ .globl glFogCoordPointer .type glFogCoordPointer,#function glFogCoordPointer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FogCoordPointerEXT), %g2 or %g2, %lo(8 * _gloffset_FogCoordPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FogCoordPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -16005,19 +16772,20 @@ .globl glMultiDrawArrays .type glMultiDrawArrays,#function glMultiDrawArrays: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiDrawArraysEXT), %g2 or %g2, %lo(8 * _gloffset_MultiDrawArraysEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiDrawArraysEXT)], %g3 #endif jmpl %g3, %g0 @@ -16026,19 +16794,20 @@ .globl glMultiDrawElements .type glMultiDrawElements,#function glMultiDrawElements: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MultiDrawElementsEXT), %g2 or %g2, %lo(8 * _gloffset_MultiDrawElementsEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MultiDrawElementsEXT)], %g3 #endif jmpl %g3, %g0 @@ -16047,19 +16816,20 @@ .globl glPointParameterf .type glPointParameterf,#function glPointParameterf: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterfEXT), %g2 or %g2, %lo(8 * _gloffset_PointParameterfEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterfEXT)], %g3 #endif jmpl %g3, %g0 @@ -16068,19 +16838,20 @@ .globl glPointParameterfv .type glPointParameterfv,#function glPointParameterfv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterfvEXT), %g2 or %g2, %lo(8 * _gloffset_PointParameterfvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterfvEXT)], %g3 #endif jmpl %g3, %g0 @@ -16089,19 +16860,20 @@ .globl glPointParameteri .type glPointParameteri,#function glPointParameteri: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameteriNV), %g2 or %g2, %lo(8 * _gloffset_PointParameteriNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameteriNV)], %g3 #endif jmpl %g3, %g0 @@ -16110,19 +16882,20 @@ .globl glPointParameteriv .type glPointParameteriv,#function glPointParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_PointParameterivNV), %g2 or %g2, %lo(8 * _gloffset_PointParameterivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_PointParameterivNV)], %g3 #endif jmpl %g3, %g0 @@ -16131,19 +16904,20 @@ .globl glSecondaryColor3b .type glSecondaryColor3b,#function glSecondaryColor3b: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3bEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3bEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3bEXT)], %g3 #endif jmpl %g3, %g0 @@ -16152,19 +16926,20 @@ .globl glSecondaryColor3bv .type glSecondaryColor3bv,#function glSecondaryColor3bv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3bvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3bvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3bvEXT)], %g3 #endif jmpl %g3, %g0 @@ -16173,19 +16948,20 @@ .globl glSecondaryColor3d .type glSecondaryColor3d,#function glSecondaryColor3d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3dEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3dEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3dEXT)], %g3 #endif jmpl %g3, %g0 @@ -16194,19 +16970,20 @@ .globl glSecondaryColor3dv .type glSecondaryColor3dv,#function glSecondaryColor3dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3dvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3dvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3dvEXT)], %g3 #endif jmpl %g3, %g0 @@ -16215,19 +16992,20 @@ .globl glSecondaryColor3f .type glSecondaryColor3f,#function glSecondaryColor3f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3fEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3fEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3fEXT)], %g3 #endif jmpl %g3, %g0 @@ -16236,19 +17014,20 @@ .globl glSecondaryColor3fv .type glSecondaryColor3fv,#function glSecondaryColor3fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3fvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3fvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3fvEXT)], %g3 #endif jmpl %g3, %g0 @@ -16257,19 +17036,20 @@ .globl glSecondaryColor3i .type glSecondaryColor3i,#function glSecondaryColor3i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3iEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3iEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3iEXT)], %g3 #endif jmpl %g3, %g0 @@ -16278,19 +17058,20 @@ .globl glSecondaryColor3iv .type glSecondaryColor3iv,#function glSecondaryColor3iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3ivEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3ivEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3ivEXT)], %g3 #endif jmpl %g3, %g0 @@ -16299,19 +17080,20 @@ .globl glSecondaryColor3s .type glSecondaryColor3s,#function glSecondaryColor3s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3sEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3sEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3sEXT)], %g3 #endif jmpl %g3, %g0 @@ -16320,19 +17102,20 @@ .globl glSecondaryColor3sv .type glSecondaryColor3sv,#function glSecondaryColor3sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3svEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3svEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3svEXT)], %g3 #endif jmpl %g3, %g0 @@ -16341,19 +17124,20 @@ .globl glSecondaryColor3ub .type glSecondaryColor3ub,#function glSecondaryColor3ub: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3ubEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3ubEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3ubEXT)], %g3 #endif jmpl %g3, %g0 @@ -16362,19 +17146,20 @@ .globl glSecondaryColor3ubv .type glSecondaryColor3ubv,#function glSecondaryColor3ubv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3ubvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3ubvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3ubvEXT)], %g3 #endif jmpl %g3, %g0 @@ -16383,19 +17168,20 @@ .globl glSecondaryColor3ui .type glSecondaryColor3ui,#function glSecondaryColor3ui: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3uiEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3uiEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3uiEXT)], %g3 #endif jmpl %g3, %g0 @@ -16404,19 +17190,20 @@ .globl glSecondaryColor3uiv .type glSecondaryColor3uiv,#function glSecondaryColor3uiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3uivEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3uivEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3uivEXT)], %g3 #endif jmpl %g3, %g0 @@ -16425,19 +17212,20 @@ .globl glSecondaryColor3us .type glSecondaryColor3us,#function glSecondaryColor3us: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3usEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3usEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3usEXT)], %g3 #endif jmpl %g3, %g0 @@ -16446,19 +17234,20 @@ .globl glSecondaryColor3usv .type glSecondaryColor3usv,#function glSecondaryColor3usv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColor3usvEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColor3usvEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColor3usvEXT)], %g3 #endif jmpl %g3, %g0 @@ -16467,19 +17256,20 @@ .globl glSecondaryColorPointer .type glSecondaryColorPointer,#function glSecondaryColorPointer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SecondaryColorPointerEXT), %g2 or %g2, %lo(8 * _gloffset_SecondaryColorPointerEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SecondaryColorPointerEXT)], %g3 #endif jmpl %g3, %g0 @@ -16488,19 +17278,20 @@ .globl glWindowPos2d .type glWindowPos2d,#function glWindowPos2d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2dMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2dMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2dMESA)], %g3 #endif jmpl %g3, %g0 @@ -16509,19 +17300,20 @@ .globl glWindowPos2dv .type glWindowPos2dv,#function glWindowPos2dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2dvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2dvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2dvMESA)], %g3 #endif jmpl %g3, %g0 @@ -16530,19 +17322,20 @@ .globl glWindowPos2f .type glWindowPos2f,#function glWindowPos2f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2fMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2fMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2fMESA)], %g3 #endif jmpl %g3, %g0 @@ -16551,19 +17344,20 @@ .globl glWindowPos2fv .type glWindowPos2fv,#function glWindowPos2fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2fvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2fvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2fvMESA)], %g3 #endif jmpl %g3, %g0 @@ -16572,19 +17366,20 @@ .globl glWindowPos2i .type glWindowPos2i,#function glWindowPos2i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2iMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2iMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2iMESA)], %g3 #endif jmpl %g3, %g0 @@ -16593,19 +17388,20 @@ .globl glWindowPos2iv .type glWindowPos2iv,#function glWindowPos2iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2ivMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2ivMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2ivMESA)], %g3 #endif jmpl %g3, %g0 @@ -16614,19 +17410,20 @@ .globl glWindowPos2s .type glWindowPos2s,#function glWindowPos2s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2sMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2sMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2sMESA)], %g3 #endif jmpl %g3, %g0 @@ -16635,19 +17432,20 @@ .globl glWindowPos2sv .type glWindowPos2sv,#function glWindowPos2sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos2svMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos2svMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos2svMESA)], %g3 #endif jmpl %g3, %g0 @@ -16656,19 +17454,20 @@ .globl glWindowPos3d .type glWindowPos3d,#function glWindowPos3d: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3dMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3dMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3dMESA)], %g3 #endif jmpl %g3, %g0 @@ -16677,19 +17476,20 @@ .globl glWindowPos3dv .type glWindowPos3dv,#function glWindowPos3dv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3dvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3dvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3dvMESA)], %g3 #endif jmpl %g3, %g0 @@ -16698,19 +17498,20 @@ .globl glWindowPos3f .type glWindowPos3f,#function glWindowPos3f: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3fMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3fMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3fMESA)], %g3 #endif jmpl %g3, %g0 @@ -16719,19 +17520,20 @@ .globl glWindowPos3fv .type glWindowPos3fv,#function glWindowPos3fv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3fvMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3fvMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3fvMESA)], %g3 #endif jmpl %g3, %g0 @@ -16740,19 +17542,20 @@ .globl glWindowPos3i .type glWindowPos3i,#function glWindowPos3i: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3iMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3iMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3iMESA)], %g3 #endif jmpl %g3, %g0 @@ -16761,19 +17564,20 @@ .globl glWindowPos3iv .type glWindowPos3iv,#function glWindowPos3iv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3ivMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3ivMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3ivMESA)], %g3 #endif jmpl %g3, %g0 @@ -16782,19 +17586,20 @@ .globl glWindowPos3s .type glWindowPos3s,#function glWindowPos3s: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3sMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3sMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3sMESA)], %g3 #endif jmpl %g3, %g0 @@ -16803,19 +17608,20 @@ .globl glWindowPos3sv .type glWindowPos3sv,#function glWindowPos3sv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_WindowPos3svMESA), %g2 or %g2, %lo(8 * _gloffset_WindowPos3svMESA), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_WindowPos3svMESA)], %g3 #endif jmpl %g3, %g0 @@ -16824,19 +17630,20 @@ .globl glActiveStencilFaceEXT .type glActiveStencilFaceEXT,#function glActiveStencilFaceEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ActiveStencilFaceEXT), %g2 or %g2, %lo(8 * _gloffset_ActiveStencilFaceEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ActiveStencilFaceEXT)], %g3 #endif jmpl %g3, %g0 @@ -16845,19 +17652,20 @@ .globl glDeleteFencesNV .type glDeleteFencesNV,#function glDeleteFencesNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteFencesNV), %g2 or %g2, %lo(8 * _gloffset_DeleteFencesNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteFencesNV)], %g3 #endif jmpl %g3, %g0 @@ -16866,19 +17674,20 @@ .globl glGenFencesNV .type glGenFencesNV,#function glGenFencesNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenFencesNV), %g2 or %g2, %lo(8 * _gloffset_GenFencesNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenFencesNV)], %g3 #endif jmpl %g3, %g0 @@ -16887,19 +17696,20 @@ .globl glIsFenceNV .type glIsFenceNV,#function glIsFenceNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsFenceNV), %g2 or %g2, %lo(8 * _gloffset_IsFenceNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsFenceNV)], %g3 #endif jmpl %g3, %g0 @@ -16908,19 +17718,20 @@ .globl glTestFenceNV .type glTestFenceNV,#function glTestFenceNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_TestFenceNV), %g2 or %g2, %lo(8 * _gloffset_TestFenceNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_TestFenceNV)], %g3 #endif jmpl %g3, %g0 @@ -16929,19 +17740,20 @@ .globl glGetFenceivNV .type glGetFenceivNV,#function glGetFenceivNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetFenceivNV), %g2 or %g2, %lo(8 * _gloffset_GetFenceivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetFenceivNV)], %g3 #endif jmpl %g3, %g0 @@ -16950,19 +17762,20 @@ .globl glFinishFenceNV .type glFinishFenceNV,#function glFinishFenceNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_FinishFenceNV), %g2 or %g2, %lo(8 * _gloffset_FinishFenceNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_FinishFenceNV)], %g3 #endif jmpl %g3, %g0 @@ -16971,19 +17784,20 @@ .globl glSetFenceNV .type glSetFenceNV,#function glSetFenceNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_SetFenceNV), %g2 or %g2, %lo(8 * _gloffset_SetFenceNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_SetFenceNV)], %g3 #endif jmpl %g3, %g0 @@ -16992,19 +17806,20 @@ .globl glVertexAttrib1sARB .type glVertexAttrib1sARB,#function glVertexAttrib1sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1sNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1sNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1sNV)], %g3 #endif jmpl %g3, %g0 @@ -17013,19 +17828,20 @@ .globl glVertexAttrib1fARB .type glVertexAttrib1fARB,#function glVertexAttrib1fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1fNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1fNV)], %g3 #endif jmpl %g3, %g0 @@ -17034,19 +17850,20 @@ .globl glVertexAttrib1dARB .type glVertexAttrib1dARB,#function glVertexAttrib1dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1dNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1dNV)], %g3 #endif jmpl %g3, %g0 @@ -17055,19 +17872,20 @@ .globl glVertexAttrib2sARB .type glVertexAttrib2sARB,#function glVertexAttrib2sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2sNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2sNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2sNV)], %g3 #endif jmpl %g3, %g0 @@ -17076,19 +17894,20 @@ .globl glVertexAttrib2fARB .type glVertexAttrib2fARB,#function glVertexAttrib2fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2fNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2fNV)], %g3 #endif jmpl %g3, %g0 @@ -17097,19 +17916,20 @@ .globl glVertexAttrib2dARB .type glVertexAttrib2dARB,#function glVertexAttrib2dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2dNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2dNV)], %g3 #endif jmpl %g3, %g0 @@ -17118,19 +17938,20 @@ .globl glVertexAttrib3sARB .type glVertexAttrib3sARB,#function glVertexAttrib3sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3sNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3sNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3sNV)], %g3 #endif jmpl %g3, %g0 @@ -17139,19 +17960,20 @@ .globl glVertexAttrib3fARB .type glVertexAttrib3fARB,#function glVertexAttrib3fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3fNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3fNV)], %g3 #endif jmpl %g3, %g0 @@ -17160,19 +17982,20 @@ .globl glVertexAttrib3dARB .type glVertexAttrib3dARB,#function glVertexAttrib3dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3dNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3dNV)], %g3 #endif jmpl %g3, %g0 @@ -17181,19 +18004,20 @@ .globl glVertexAttrib4sARB .type glVertexAttrib4sARB,#function glVertexAttrib4sARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4sNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4sNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4sNV)], %g3 #endif jmpl %g3, %g0 @@ -17202,19 +18026,20 @@ .globl glVertexAttrib4fARB .type glVertexAttrib4fARB,#function glVertexAttrib4fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4fNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4fNV)], %g3 #endif jmpl %g3, %g0 @@ -17223,19 +18048,20 @@ .globl glVertexAttrib4dARB .type glVertexAttrib4dARB,#function glVertexAttrib4dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4dNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4dNV)], %g3 #endif jmpl %g3, %g0 @@ -17244,19 +18070,20 @@ .globl glVertexAttrib4NubARB .type glVertexAttrib4NubARB,#function glVertexAttrib4NubARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4ubNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4ubNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4ubNV)], %g3 #endif jmpl %g3, %g0 @@ -17265,19 +18092,20 @@ .globl glVertexAttrib1svARB .type glVertexAttrib1svARB,#function glVertexAttrib1svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1svNV)], %g3 #endif jmpl %g3, %g0 @@ -17286,19 +18114,20 @@ .globl glVertexAttrib1fvARB .type glVertexAttrib1fvARB,#function glVertexAttrib1fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1fvNV)], %g3 #endif jmpl %g3, %g0 @@ -17307,19 +18136,20 @@ .globl glVertexAttrib1dvARB .type glVertexAttrib1dvARB,#function glVertexAttrib1dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib1dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib1dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib1dvNV)], %g3 #endif jmpl %g3, %g0 @@ -17328,19 +18158,20 @@ .globl glVertexAttrib2svARB .type glVertexAttrib2svARB,#function glVertexAttrib2svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2svNV)], %g3 #endif jmpl %g3, %g0 @@ -17349,19 +18180,20 @@ .globl glVertexAttrib2fvARB .type glVertexAttrib2fvARB,#function glVertexAttrib2fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2fvNV)], %g3 #endif jmpl %g3, %g0 @@ -17370,19 +18202,20 @@ .globl glVertexAttrib2dvARB .type glVertexAttrib2dvARB,#function glVertexAttrib2dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib2dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib2dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib2dvNV)], %g3 #endif jmpl %g3, %g0 @@ -17391,19 +18224,20 @@ .globl glVertexAttrib3svARB .type glVertexAttrib3svARB,#function glVertexAttrib3svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3svNV)], %g3 #endif jmpl %g3, %g0 @@ -17412,19 +18246,20 @@ .globl glVertexAttrib3fvARB .type glVertexAttrib3fvARB,#function glVertexAttrib3fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3fvNV)], %g3 #endif jmpl %g3, %g0 @@ -17433,19 +18268,20 @@ .globl glVertexAttrib3dvARB .type glVertexAttrib3dvARB,#function glVertexAttrib3dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib3dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib3dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib3dvNV)], %g3 #endif jmpl %g3, %g0 @@ -17454,19 +18290,20 @@ .globl glVertexAttrib4bvARB .type glVertexAttrib4bvARB,#function glVertexAttrib4bvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4bvARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4bvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4bvARB)], %g3 #endif jmpl %g3, %g0 @@ -17475,19 +18312,20 @@ .globl glVertexAttrib4svARB .type glVertexAttrib4svARB,#function glVertexAttrib4svARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4svNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4svNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4svNV)], %g3 #endif jmpl %g3, %g0 @@ -17496,19 +18334,20 @@ .globl glVertexAttrib4ivARB .type glVertexAttrib4ivARB,#function glVertexAttrib4ivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4ivARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4ivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4ivARB)], %g3 #endif jmpl %g3, %g0 @@ -17517,19 +18356,20 @@ .globl glVertexAttrib4ubvARB .type glVertexAttrib4ubvARB,#function glVertexAttrib4ubvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4ubvARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4ubvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4ubvARB)], %g3 #endif jmpl %g3, %g0 @@ -17538,19 +18378,20 @@ .globl glVertexAttrib4usvARB .type glVertexAttrib4usvARB,#function glVertexAttrib4usvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4usvARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4usvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4usvARB)], %g3 #endif jmpl %g3, %g0 @@ -17559,19 +18400,20 @@ .globl glVertexAttrib4uivARB .type glVertexAttrib4uivARB,#function glVertexAttrib4uivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4uivARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4uivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4uivARB)], %g3 #endif jmpl %g3, %g0 @@ -17580,19 +18422,20 @@ .globl glVertexAttrib4fvARB .type glVertexAttrib4fvARB,#function glVertexAttrib4fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4fvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4fvNV)], %g3 #endif jmpl %g3, %g0 @@ -17601,19 +18444,20 @@ .globl glVertexAttrib4dvARB .type glVertexAttrib4dvARB,#function glVertexAttrib4dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4dvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4dvNV)], %g3 #endif jmpl %g3, %g0 @@ -17622,19 +18466,20 @@ .globl glVertexAttrib4NbvARB .type glVertexAttrib4NbvARB,#function glVertexAttrib4NbvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4NbvARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4NbvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4NbvARB)], %g3 #endif jmpl %g3, %g0 @@ -17643,19 +18488,20 @@ .globl glVertexAttrib4NsvARB .type glVertexAttrib4NsvARB,#function glVertexAttrib4NsvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4NsvARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4NsvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4NsvARB)], %g3 #endif jmpl %g3, %g0 @@ -17664,19 +18510,20 @@ .globl glVertexAttrib4NivARB .type glVertexAttrib4NivARB,#function glVertexAttrib4NivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4NivARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4NivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4NivARB)], %g3 #endif jmpl %g3, %g0 @@ -17685,19 +18532,20 @@ .globl glVertexAttrib4NubvARB .type glVertexAttrib4NubvARB,#function glVertexAttrib4NubvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4ubvNV), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4ubvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4ubvNV)], %g3 #endif jmpl %g3, %g0 @@ -17706,19 +18554,20 @@ .globl glVertexAttrib4NusvARB .type glVertexAttrib4NusvARB,#function glVertexAttrib4NusvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4NusvARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4NusvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4NusvARB)], %g3 #endif jmpl %g3, %g0 @@ -17727,19 +18576,20 @@ .globl glVertexAttrib4NuivARB .type glVertexAttrib4NuivARB,#function glVertexAttrib4NuivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttrib4NuivARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttrib4NuivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttrib4NuivARB)], %g3 #endif jmpl %g3, %g0 @@ -17748,19 +18598,20 @@ .globl glVertexAttribPointerARB .type glVertexAttribPointerARB,#function glVertexAttribPointerARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_VertexAttribPointerARB), %g2 or %g2, %lo(8 * _gloffset_VertexAttribPointerARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_VertexAttribPointerARB)], %g3 #endif jmpl %g3, %g0 @@ -17769,19 +18620,20 @@ .globl glEnableVertexAttribArrayARB .type glEnableVertexAttribArrayARB,#function glEnableVertexAttribArrayARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EnableVertexAttribArrayARB), %g2 or %g2, %lo(8 * _gloffset_EnableVertexAttribArrayARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EnableVertexAttribArrayARB)], %g3 #endif jmpl %g3, %g0 @@ -17790,19 +18642,20 @@ .globl glDisableVertexAttribArrayARB .type glDisableVertexAttribArrayARB,#function glDisableVertexAttribArrayARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DisableVertexAttribArrayARB), %g2 or %g2, %lo(8 * _gloffset_DisableVertexAttribArrayARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DisableVertexAttribArrayARB)], %g3 #endif jmpl %g3, %g0 @@ -17811,19 +18664,20 @@ .globl glProgramStringARB .type glProgramStringARB,#function glProgramStringARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramStringARB), %g2 or %g2, %lo(8 * _gloffset_ProgramStringARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramStringARB)], %g3 #endif jmpl %g3, %g0 @@ -17832,19 +18686,20 @@ .globl glBindProgramARB .type glBindProgramARB,#function glBindProgramARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BindProgramNV), %g2 or %g2, %lo(8 * _gloffset_BindProgramNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BindProgramNV)], %g3 #endif jmpl %g3, %g0 @@ -17853,19 +18708,20 @@ .globl glDeleteProgramsARB .type glDeleteProgramsARB,#function glDeleteProgramsARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteProgramsNV), %g2 or %g2, %lo(8 * _gloffset_DeleteProgramsNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteProgramsNV)], %g3 #endif jmpl %g3, %g0 @@ -17874,19 +18730,20 @@ .globl glGenProgramsARB .type glGenProgramsARB,#function glGenProgramsARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenProgramsNV), %g2 or %g2, %lo(8 * _gloffset_GenProgramsNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenProgramsNV)], %g3 #endif jmpl %g3, %g0 @@ -17895,19 +18752,20 @@ .globl glIsProgramARB .type glIsProgramARB,#function glIsProgramARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsProgramNV), %g2 or %g2, %lo(8 * _gloffset_IsProgramNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsProgramNV)], %g3 #endif jmpl %g3, %g0 @@ -17916,19 +18774,20 @@ .globl glProgramEnvParameter4dARB .type glProgramEnvParameter4dARB,#function glProgramEnvParameter4dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramEnvParameter4dARB), %g2 or %g2, %lo(8 * _gloffset_ProgramEnvParameter4dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramEnvParameter4dARB)], %g3 #endif jmpl %g3, %g0 @@ -17937,19 +18796,20 @@ .globl glProgramEnvParameter4dvARB .type glProgramEnvParameter4dvARB,#function glProgramEnvParameter4dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramEnvParameter4dvARB), %g2 or %g2, %lo(8 * _gloffset_ProgramEnvParameter4dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramEnvParameter4dvARB)], %g3 #endif jmpl %g3, %g0 @@ -17958,19 +18818,20 @@ .globl glProgramEnvParameter4fARB .type glProgramEnvParameter4fARB,#function glProgramEnvParameter4fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramEnvParameter4fARB), %g2 or %g2, %lo(8 * _gloffset_ProgramEnvParameter4fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramEnvParameter4fARB)], %g3 #endif jmpl %g3, %g0 @@ -17979,19 +18840,20 @@ .globl glProgramEnvParameter4fvARB .type glProgramEnvParameter4fvARB,#function glProgramEnvParameter4fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramEnvParameter4fvARB), %g2 or %g2, %lo(8 * _gloffset_ProgramEnvParameter4fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramEnvParameter4fvARB)], %g3 #endif jmpl %g3, %g0 @@ -18000,19 +18862,20 @@ .globl glProgramLocalParameter4dARB .type glProgramLocalParameter4dARB,#function glProgramLocalParameter4dARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramLocalParameter4dARB), %g2 or %g2, %lo(8 * _gloffset_ProgramLocalParameter4dARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramLocalParameter4dARB)], %g3 #endif jmpl %g3, %g0 @@ -18021,19 +18884,20 @@ .globl glProgramLocalParameter4dvARB .type glProgramLocalParameter4dvARB,#function glProgramLocalParameter4dvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramLocalParameter4dvARB), %g2 or %g2, %lo(8 * _gloffset_ProgramLocalParameter4dvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramLocalParameter4dvARB)], %g3 #endif jmpl %g3, %g0 @@ -18042,19 +18906,20 @@ .globl glProgramLocalParameter4fARB .type glProgramLocalParameter4fARB,#function glProgramLocalParameter4fARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramLocalParameter4fARB), %g2 or %g2, %lo(8 * _gloffset_ProgramLocalParameter4fARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramLocalParameter4fARB)], %g3 #endif jmpl %g3, %g0 @@ -18063,19 +18928,20 @@ .globl glProgramLocalParameter4fvARB .type glProgramLocalParameter4fvARB,#function glProgramLocalParameter4fvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramLocalParameter4fvARB), %g2 or %g2, %lo(8 * _gloffset_ProgramLocalParameter4fvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramLocalParameter4fvARB)], %g3 #endif jmpl %g3, %g0 @@ -18084,19 +18950,20 @@ .globl glGetProgramEnvParameterdvARB .type glGetProgramEnvParameterdvARB,#function glGetProgramEnvParameterdvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramEnvParameterdvARB), %g2 or %g2, %lo(8 * _gloffset_GetProgramEnvParameterdvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramEnvParameterdvARB)], %g3 #endif jmpl %g3, %g0 @@ -18105,19 +18972,20 @@ .globl glGetProgramEnvParameterfvARB .type glGetProgramEnvParameterfvARB,#function glGetProgramEnvParameterfvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramEnvParameterfvARB), %g2 or %g2, %lo(8 * _gloffset_GetProgramEnvParameterfvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramEnvParameterfvARB)], %g3 #endif jmpl %g3, %g0 @@ -18126,19 +18994,20 @@ .globl glGetProgramLocalParameterdvARB .type glGetProgramLocalParameterdvARB,#function glGetProgramLocalParameterdvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramLocalParameterdvARB), %g2 or %g2, %lo(8 * _gloffset_GetProgramLocalParameterdvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramLocalParameterdvARB)], %g3 #endif jmpl %g3, %g0 @@ -18147,19 +19016,20 @@ .globl glGetProgramLocalParameterfvARB .type glGetProgramLocalParameterfvARB,#function glGetProgramLocalParameterfvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramLocalParameterfvARB), %g2 or %g2, %lo(8 * _gloffset_GetProgramLocalParameterfvARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramLocalParameterfvARB)], %g3 #endif jmpl %g3, %g0 @@ -18168,19 +19038,20 @@ .globl glGetProgramivARB .type glGetProgramivARB,#function glGetProgramivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramivARB), %g2 or %g2, %lo(8 * _gloffset_GetProgramivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramivARB)], %g3 #endif jmpl %g3, %g0 @@ -18189,19 +19060,20 @@ .globl glGetProgramStringARB .type glGetProgramStringARB,#function glGetProgramStringARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramStringARB), %g2 or %g2, %lo(8 * _gloffset_GetProgramStringARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramStringARB)], %g3 #endif jmpl %g3, %g0 @@ -18210,19 +19082,20 @@ .globl glGetVertexAttribdvARB .type glGetVertexAttribdvARB,#function glGetVertexAttribdvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetVertexAttribdvNV), %g2 or %g2, %lo(8 * _gloffset_GetVertexAttribdvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetVertexAttribdvNV)], %g3 #endif jmpl %g3, %g0 @@ -18231,19 +19104,20 @@ .globl glGetVertexAttribfvARB .type glGetVertexAttribfvARB,#function glGetVertexAttribfvARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetVertexAttribfvNV), %g2 or %g2, %lo(8 * _gloffset_GetVertexAttribfvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetVertexAttribfvNV)], %g3 #endif jmpl %g3, %g0 @@ -18252,19 +19126,20 @@ .globl glGetVertexAttribivARB .type glGetVertexAttribivARB,#function glGetVertexAttribivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetVertexAttribivNV), %g2 or %g2, %lo(8 * _gloffset_GetVertexAttribivNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetVertexAttribivNV)], %g3 #endif jmpl %g3, %g0 @@ -18273,19 +19148,20 @@ .globl glGetVertexAttribPointervARB .type glGetVertexAttribPointervARB,#function glGetVertexAttribPointervARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetVertexAttribPointervNV), %g2 or %g2, %lo(8 * _gloffset_GetVertexAttribPointervNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetVertexAttribPointervNV)], %g3 #endif jmpl %g3, %g0 @@ -18294,19 +19170,20 @@ .globl glProgramNamedParameter4fNV .type glProgramNamedParameter4fNV,#function glProgramNamedParameter4fNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramNamedParameter4fNV), %g2 or %g2, %lo(8 * _gloffset_ProgramNamedParameter4fNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramNamedParameter4fNV)], %g3 #endif jmpl %g3, %g0 @@ -18315,19 +19192,20 @@ .globl glProgramNamedParameter4dNV .type glProgramNamedParameter4dNV,#function glProgramNamedParameter4dNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramNamedParameter4dNV), %g2 or %g2, %lo(8 * _gloffset_ProgramNamedParameter4dNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramNamedParameter4dNV)], %g3 #endif jmpl %g3, %g0 @@ -18336,19 +19214,20 @@ .globl glProgramNamedParameter4fvNV .type glProgramNamedParameter4fvNV,#function glProgramNamedParameter4fvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramNamedParameter4fvNV), %g2 or %g2, %lo(8 * _gloffset_ProgramNamedParameter4fvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramNamedParameter4fvNV)], %g3 #endif jmpl %g3, %g0 @@ -18357,19 +19236,20 @@ .globl glProgramNamedParameter4dvNV .type glProgramNamedParameter4dvNV,#function glProgramNamedParameter4dvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_ProgramNamedParameter4dvNV), %g2 or %g2, %lo(8 * _gloffset_ProgramNamedParameter4dvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_ProgramNamedParameter4dvNV)], %g3 #endif jmpl %g3, %g0 @@ -18378,19 +19258,20 @@ .globl glGetProgramNamedParameterfvNV .type glGetProgramNamedParameterfvNV,#function glGetProgramNamedParameterfvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramNamedParameterfvNV), %g2 or %g2, %lo(8 * _gloffset_GetProgramNamedParameterfvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramNamedParameterfvNV)], %g3 #endif jmpl %g3, %g0 @@ -18399,19 +19280,20 @@ .globl glGetProgramNamedParameterdvNV .type glGetProgramNamedParameterdvNV,#function glGetProgramNamedParameterdvNV: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetProgramNamedParameterdvNV), %g2 or %g2, %lo(8 * _gloffset_GetProgramNamedParameterdvNV), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetProgramNamedParameterdvNV)], %g3 #endif jmpl %g3, %g0 @@ -18420,19 +19302,20 @@ .globl glBindBufferARB .type glBindBufferARB,#function glBindBufferARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BindBufferARB), %g2 or %g2, %lo(8 * _gloffset_BindBufferARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BindBufferARB)], %g3 #endif jmpl %g3, %g0 @@ -18441,19 +19324,20 @@ .globl glBufferDataARB .type glBufferDataARB,#function glBufferDataARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BufferDataARB), %g2 or %g2, %lo(8 * _gloffset_BufferDataARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BufferDataARB)], %g3 #endif jmpl %g3, %g0 @@ -18462,19 +19346,20 @@ .globl glBufferSubDataARB .type glBufferSubDataARB,#function glBufferSubDataARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BufferSubDataARB), %g2 or %g2, %lo(8 * _gloffset_BufferSubDataARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BufferSubDataARB)], %g3 #endif jmpl %g3, %g0 @@ -18483,19 +19368,20 @@ .globl glDeleteBuffersARB .type glDeleteBuffersARB,#function glDeleteBuffersARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteBuffersARB), %g2 or %g2, %lo(8 * _gloffset_DeleteBuffersARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteBuffersARB)], %g3 #endif jmpl %g3, %g0 @@ -18504,19 +19390,20 @@ .globl glGenBuffersARB .type glGenBuffersARB,#function glGenBuffersARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenBuffersARB), %g2 or %g2, %lo(8 * _gloffset_GenBuffersARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenBuffersARB)], %g3 #endif jmpl %g3, %g0 @@ -18525,19 +19412,20 @@ .globl glGetBufferParameterivARB .type glGetBufferParameterivARB,#function glGetBufferParameterivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetBufferParameterivARB), %g2 or %g2, %lo(8 * _gloffset_GetBufferParameterivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetBufferParameterivARB)], %g3 #endif jmpl %g3, %g0 @@ -18546,19 +19434,20 @@ .globl glGetBufferPointervARB .type glGetBufferPointervARB,#function glGetBufferPointervARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetBufferPointervARB), %g2 or %g2, %lo(8 * _gloffset_GetBufferPointervARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetBufferPointervARB)], %g3 #endif jmpl %g3, %g0 @@ -18567,19 +19456,20 @@ .globl glGetBufferSubDataARB .type glGetBufferSubDataARB,#function glGetBufferSubDataARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetBufferSubDataARB), %g2 or %g2, %lo(8 * _gloffset_GetBufferSubDataARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetBufferSubDataARB)], %g3 #endif jmpl %g3, %g0 @@ -18588,19 +19478,20 @@ .globl glIsBufferARB .type glIsBufferARB,#function glIsBufferARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsBufferARB), %g2 or %g2, %lo(8 * _gloffset_IsBufferARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsBufferARB)], %g3 #endif jmpl %g3, %g0 @@ -18609,19 +19500,20 @@ .globl glMapBufferARB .type glMapBufferARB,#function glMapBufferARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MapBufferARB), %g2 or %g2, %lo(8 * _gloffset_MapBufferARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MapBufferARB)], %g3 #endif jmpl %g3, %g0 @@ -18630,19 +19522,20 @@ .globl glUnmapBufferARB .type glUnmapBufferARB,#function glUnmapBufferARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_UnmapBufferARB), %g2 or %g2, %lo(8 * _gloffset_UnmapBufferARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_UnmapBufferARB)], %g3 #endif jmpl %g3, %g0 @@ -18651,19 +19544,20 @@ .globl glDepthBoundsEXT .type glDepthBoundsEXT,#function glDepthBoundsEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DepthBoundsEXT), %g2 or %g2, %lo(8 * _gloffset_DepthBoundsEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DepthBoundsEXT)], %g3 #endif jmpl %g3, %g0 @@ -18672,19 +19566,20 @@ .globl glGenQueriesARB .type glGenQueriesARB,#function glGenQueriesARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenQueriesARB), %g2 or %g2, %lo(8 * _gloffset_GenQueriesARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenQueriesARB)], %g3 #endif jmpl %g3, %g0 @@ -18693,19 +19588,20 @@ .globl glDeleteQueriesARB .type glDeleteQueriesARB,#function glDeleteQueriesARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteQueriesARB), %g2 or %g2, %lo(8 * _gloffset_DeleteQueriesARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteQueriesARB)], %g3 #endif jmpl %g3, %g0 @@ -18714,19 +19610,20 @@ .globl glIsQueryARB .type glIsQueryARB,#function glIsQueryARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsQueryARB), %g2 or %g2, %lo(8 * _gloffset_IsQueryARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsQueryARB)], %g3 #endif jmpl %g3, %g0 @@ -18735,19 +19632,20 @@ .globl glBeginQueryARB .type glBeginQueryARB,#function glBeginQueryARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BeginQueryARB), %g2 or %g2, %lo(8 * _gloffset_BeginQueryARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BeginQueryARB)], %g3 #endif jmpl %g3, %g0 @@ -18756,19 +19654,20 @@ .globl glEndQueryARB .type glEndQueryARB,#function glEndQueryARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EndQueryARB), %g2 or %g2, %lo(8 * _gloffset_EndQueryARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EndQueryARB)], %g3 #endif jmpl %g3, %g0 @@ -18777,19 +19676,20 @@ .globl glGetQueryivARB .type glGetQueryivARB,#function glGetQueryivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetQueryivARB), %g2 or %g2, %lo(8 * _gloffset_GetQueryivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetQueryivARB)], %g3 #endif jmpl %g3, %g0 @@ -18798,19 +19698,20 @@ .globl glGetQueryObjectivARB .type glGetQueryObjectivARB,#function glGetQueryObjectivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetQueryObjectivARB), %g2 or %g2, %lo(8 * _gloffset_GetQueryObjectivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetQueryObjectivARB)], %g3 #endif jmpl %g3, %g0 @@ -18819,19 +19720,20 @@ .globl glGetQueryObjectuivARB .type glGetQueryObjectuivARB,#function glGetQueryObjectuivARB: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetQueryObjectuivARB), %g2 or %g2, %lo(8 * _gloffset_GetQueryObjectuivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetQueryObjectuivARB)], %g3 #endif jmpl %g3, %g0 @@ -18840,19 +19742,20 @@ .globl glBindBuffer .type glBindBuffer,#function glBindBuffer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BindBufferARB), %g2 or %g2, %lo(8 * _gloffset_BindBufferARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BindBufferARB)], %g3 #endif jmpl %g3, %g0 @@ -18861,19 +19764,20 @@ .globl glBufferData .type glBufferData,#function glBufferData: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BufferDataARB), %g2 or %g2, %lo(8 * _gloffset_BufferDataARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BufferDataARB)], %g3 #endif jmpl %g3, %g0 @@ -18882,19 +19786,20 @@ .globl glBufferSubData .type glBufferSubData,#function glBufferSubData: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BufferSubDataARB), %g2 or %g2, %lo(8 * _gloffset_BufferSubDataARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BufferSubDataARB)], %g3 #endif jmpl %g3, %g0 @@ -18903,19 +19808,20 @@ .globl glDeleteBuffers .type glDeleteBuffers,#function glDeleteBuffers: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteBuffersARB), %g2 or %g2, %lo(8 * _gloffset_DeleteBuffersARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteBuffersARB)], %g3 #endif jmpl %g3, %g0 @@ -18924,19 +19830,20 @@ .globl glGenBuffers .type glGenBuffers,#function glGenBuffers: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenBuffersARB), %g2 or %g2, %lo(8 * _gloffset_GenBuffersARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenBuffersARB)], %g3 #endif jmpl %g3, %g0 @@ -18945,19 +19852,20 @@ .globl glGetBufferParameteriv .type glGetBufferParameteriv,#function glGetBufferParameteriv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetBufferParameterivARB), %g2 or %g2, %lo(8 * _gloffset_GetBufferParameterivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetBufferParameterivARB)], %g3 #endif jmpl %g3, %g0 @@ -18966,19 +19874,20 @@ .globl glGetBufferPointerv .type glGetBufferPointerv,#function glGetBufferPointerv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetBufferPointervARB), %g2 or %g2, %lo(8 * _gloffset_GetBufferPointervARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetBufferPointervARB)], %g3 #endif jmpl %g3, %g0 @@ -18987,19 +19896,20 @@ .globl glGetBufferSubData .type glGetBufferSubData,#function glGetBufferSubData: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetBufferSubDataARB), %g2 or %g2, %lo(8 * _gloffset_GetBufferSubDataARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetBufferSubDataARB)], %g3 #endif jmpl %g3, %g0 @@ -19008,19 +19918,20 @@ .globl glIsBuffer .type glIsBuffer,#function glIsBuffer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsBufferARB), %g2 or %g2, %lo(8 * _gloffset_IsBufferARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsBufferARB)], %g3 #endif jmpl %g3, %g0 @@ -19029,19 +19940,20 @@ .globl glMapBuffer .type glMapBuffer,#function glMapBuffer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_MapBufferARB), %g2 or %g2, %lo(8 * _gloffset_MapBufferARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_MapBufferARB)], %g3 #endif jmpl %g3, %g0 @@ -19050,19 +19962,20 @@ .globl glUnmapBuffer .type glUnmapBuffer,#function glUnmapBuffer: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_UnmapBufferARB), %g2 or %g2, %lo(8 * _gloffset_UnmapBufferARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_UnmapBufferARB)], %g3 #endif jmpl %g3, %g0 @@ -19071,19 +19984,20 @@ .globl glGenQueries .type glGenQueries,#function glGenQueries: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GenQueriesARB), %g2 or %g2, %lo(8 * _gloffset_GenQueriesARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GenQueriesARB)], %g3 #endif jmpl %g3, %g0 @@ -19092,19 +20006,20 @@ .globl glDeleteQueries .type glDeleteQueries,#function glDeleteQueries: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_DeleteQueriesARB), %g2 or %g2, %lo(8 * _gloffset_DeleteQueriesARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_DeleteQueriesARB)], %g3 #endif jmpl %g3, %g0 @@ -19113,19 +20028,20 @@ .globl glIsQuery .type glIsQuery,#function glIsQuery: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_IsQueryARB), %g2 or %g2, %lo(8 * _gloffset_IsQueryARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_IsQueryARB)], %g3 #endif jmpl %g3, %g0 @@ -19134,19 +20050,20 @@ .globl glBeginQuery .type glBeginQuery,#function glBeginQuery: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BeginQueryARB), %g2 or %g2, %lo(8 * _gloffset_BeginQueryARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BeginQueryARB)], %g3 #endif jmpl %g3, %g0 @@ -19155,19 +20072,20 @@ .globl glEndQuery .type glEndQuery,#function glEndQuery: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_EndQueryARB), %g2 or %g2, %lo(8 * _gloffset_EndQueryARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_EndQueryARB)], %g3 #endif jmpl %g3, %g0 @@ -19176,19 +20094,20 @@ .globl glGetQueryiv .type glGetQueryiv,#function glGetQueryiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetQueryivARB), %g2 or %g2, %lo(8 * _gloffset_GetQueryivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetQueryivARB)], %g3 #endif jmpl %g3, %g0 @@ -19197,19 +20116,20 @@ .globl glGetQueryObjectiv .type glGetQueryObjectiv,#function glGetQueryObjectiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetQueryObjectivARB), %g2 or %g2, %lo(8 * _gloffset_GetQueryObjectivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetQueryObjectivARB)], %g3 #endif jmpl %g3, %g0 @@ -19218,19 +20138,20 @@ .globl glGetQueryObjectuiv .type glGetQueryObjectuiv,#function glGetQueryObjectuiv: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_GetQueryObjectuivARB), %g2 or %g2, %lo(8 * _gloffset_GetQueryObjectuivARB), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_GetQueryObjectuivARB)], %g3 #endif jmpl %g3, %g0 @@ -19239,19 +20160,20 @@ .globl glBlendEquationSeparateEXT .type glBlendEquationSeparateEXT,#function glBlendEquationSeparateEXT: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendEquationSeparateEXT), %g2 or %g2, %lo(8 * _gloffset_BlendEquationSeparateEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendEquationSeparateEXT)], %g3 #endif jmpl %g3, %g0 @@ -19260,19 +20182,20 @@ .globl glBlendEquationSeparateATI .type glBlendEquationSeparateATI,#function glBlendEquationSeparateATI: -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) - sethi %hi(0x00000000), %g2 - sethi %hi(0x00000000), %g1 - or %g2, %lo(0x00000000), %g2 - or %g1, %lo(0x00000000), %g1 +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + sethi %uhi(_glapi_Dispatch), %g2 + sethi %hi(_glapi_Dispatch), %g1 + or %g2, %ulo(_glapi_Dispatch), %g2 + or %g1, %lo(_glapi_Dispatch), %g1 sllx %g2, 32, %g2 ldx [%g1 + %g2], %g1 sethi %hi(8 * _gloffset_BlendEquationSeparateEXT), %g2 or %g2, %lo(8 * _gloffset_BlendEquationSeparateEXT), %g2 ldx [%g1 + %g2], %g3 #else - sethi %hi(0x00000000), %g1 - ld [%g1 + %lo(0x00000000)], %g1 + sethi %hi(_glapi_Dispatch), %g1 + ld [%g1 + %lo(_glapi_Dispatch)], %g1 ld [%g1 + (4 * _gloffset_BlendEquationSeparateEXT)], %g3 #endif jmpl %g3, %g0 Index: xc/extras/Mesa/src/mesa/sparc/sparc.c diff -u xc/extras/Mesa/src/mesa/sparc/sparc.c:1.6 xc/extras/Mesa/src/mesa/sparc/sparc.c:1.7 --- xc/extras/Mesa/src/mesa/sparc/sparc.c:1.6 Fri Dec 10 12:47:24 2004 +++ xc/extras/Mesa/src/mesa/sparc/sparc.c Tue May 16 11:34:46 2006 @@ -21,7 +21,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/extras/Mesa/src/mesa/sparc/sparc.c,v 1.6 2004/12/10 17:47:24 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/sparc/sparc.c,v 1.7 2006/05/16 15:34:46 tsi Exp $ */ /* * Sparc assembly code by David S. Miller @@ -36,6 +36,12 @@ #include "math/m_xform.h" #include "tnl/t_context.h" +#if defined(__OpenBSD__) || defined(__NetBSD__) +# include +# include +# include +#endif + #ifdef DEBUG #include "math/m_debug.h" #endif @@ -162,21 +168,48 @@ end_ptr = &_mesa_sparc_glapi_end; disp_addr = (unsigned long) &_glapi_Dispatch; +#if defined(__OpenBSD__) || defined(__NetBSD__) + { /* Re-protect to allow instruction execution */ + unsigned long mask = getpagesize() - 1; + unsigned long base = (unsigned long)insn_ptr & ~mask; + unsigned long size = (((unsigned long)end_ptr + mask) & + ~mask) - base; + + mprotect((void *)base, size, + PROT_READ | PROT_WRITE | PROT_EXEC); + } +#endif + while (insn_ptr < end_ptr) { -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) + +#define all_ones ((unsigned long)(-1L)) + +#if defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__)) + + insn_ptr[0] &= ~(all_ones >> (32 + 10)); insn_ptr[0] |= (disp_addr >> (32 + 10)); + insn_ptr[1] &= ~((all_ones & 0xffffffff) >> 10); insn_ptr[1] |= ((disp_addr & 0xffffffff) >> 10); __glapi_sparc_icache_flush(&insn_ptr[0]); + insn_ptr[2] &= ~((all_ones >> 32) & ((1 << 10) - 1)); insn_ptr[2] |= ((disp_addr >> 32) & ((1 << 10) - 1)); + insn_ptr[3] &= ~(all_ones & ((1 << 10) - 1)); insn_ptr[3] |= (disp_addr & ((1 << 10) - 1)); __glapi_sparc_icache_flush(&insn_ptr[2]); insn_ptr += 11; + #else + + insn_ptr[0] &= ~(all_ones >> 10); insn_ptr[0] |= (disp_addr >> 10); + insn_ptr[1] &= ~(all_ones & ((1 << 10) - 1)); insn_ptr[1] |= (disp_addr & ((1 << 10) - 1)); __glapi_sparc_icache_flush(&insn_ptr[0]); insn_ptr += 5; + #endif + } #endif /* USE_SPARC_ASM */ } Index: xc/extras/Mesa/src/mesa/swrast/s_aatriangle.c diff -u xc/extras/Mesa/src/mesa/swrast/s_aatriangle.c:1.1.1.1 xc/extras/Mesa/src/mesa/swrast/s_aatriangle.c:1.2 --- xc/extras/Mesa/src/mesa/swrast/s_aatriangle.c:1.1.1.1 Thu Apr 8 05:17:55 2004 +++ xc/extras/Mesa/src/mesa/swrast/s_aatriangle.c Sun Dec 10 10:58:23 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/swrast/s_aatriangle.c,v 1.2 2006/12/10 15:58:23 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 5.1 @@ -207,6 +208,7 @@ { const GLfloat area = dx0 * dy1 - dx1 * dy0; ASSERT(area >= 0.0); + (void)area; } #endif @@ -300,6 +302,7 @@ { const GLfloat area = dx0 * dy1 - dx1 * dy0; ASSERT(area >= 0.0); + (void)area; } #endif Index: xc/extras/Mesa/src/mesa/swrast/s_buffers.c diff -u xc/extras/Mesa/src/mesa/swrast/s_buffers.c:1.1.1.3 xc/extras/Mesa/src/mesa/swrast/s_buffers.c:1.2 --- xc/extras/Mesa/src/mesa/swrast/s_buffers.c:1.1.1.3 Fri Dec 10 10:06:50 2004 +++ xc/extras/Mesa/src/mesa/swrast/s_buffers.c Sun Dec 10 10:58:23 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/swrast/s_buffers.c,v 1.2 2006/12/10 15:58:23 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -192,6 +193,7 @@ DD_AUX2_BIT | DD_AUX3_BIT; assert((mask & (~legalBits)) == 0); + (void)legalBits; } #endif Index: xc/extras/Mesa/src/mesa/swrast/s_context.h diff -u xc/extras/Mesa/src/mesa/swrast/s_context.h:1.1.1.4 xc/extras/Mesa/src/mesa/swrast/s_context.h:1.2 --- xc/extras/Mesa/src/mesa/swrast/s_context.h:1.1.1.4 Fri Dec 10 10:33:55 2004 +++ xc/extras/Mesa/src/mesa/swrast/s_context.h Mon Apr 9 11:37:10 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/swrast/s_context.h,v 1.2 2007/04/09 15:37:10 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -202,6 +203,7 @@ (S).primitive = (PRIMITIVE); \ (S).interpMask = (INTERP_MASK); \ (S).arrayMask = (ARRAY_MASK); \ + (S).y = 0; \ (S).start = 0; \ (S).end = (END); \ (S).facing = 0; \ Index: xc/extras/Mesa/src/mesa/swrast/s_triangle.c diff -u xc/extras/Mesa/src/mesa/swrast/s_triangle.c:1.1.1.4 xc/extras/Mesa/src/mesa/swrast/s_triangle.c:1.2 --- xc/extras/Mesa/src/mesa/swrast/s_triangle.c:1.1.1.4 Fri Dec 10 10:06:52 2004 +++ xc/extras/Mesa/src/mesa/swrast/s_triangle.c Mon Apr 9 11:37:10 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/swrast/s_triangle.c,v 1.2 2007/04/09 15:37:10 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -554,6 +555,8 @@ info.eg = FloatToFixed(unit->EnvColor[GCOMP] * CHAN_MAXF); \ info.eb = FloatToFixed(unit->EnvColor[BCOMP] * CHAN_MAXF); \ info.ea = FloatToFixed(unit->EnvColor[ACOMP] * CHAN_MAXF); \ + } else { \ + info.er = info.eg = info.eb = info.ea = 0; \ } \ if (!info.texture) { \ /* this shouldn't happen */ \ @@ -821,6 +824,8 @@ info.eg = FloatToFixed(unit->EnvColor[GCOMP] * CHAN_MAXF); \ info.eb = FloatToFixed(unit->EnvColor[BCOMP] * CHAN_MAXF); \ info.ea = FloatToFixed(unit->EnvColor[ACOMP] * CHAN_MAXF); \ + } else { \ + info.er = info.eg = info.eb = info.ea = 0; \ } \ if (!info.texture) { \ /* this shouldn't happen */ \ Index: xc/extras/Mesa/src/mesa/swrast/s_tritemp.h diff -u xc/extras/Mesa/src/mesa/swrast/s_tritemp.h:1.1.1.4 xc/extras/Mesa/src/mesa/swrast/s_tritemp.h:1.2 --- xc/extras/Mesa/src/mesa/swrast/s_tritemp.h:1.1.1.4 Fri Dec 10 10:06:51 2004 +++ xc/extras/Mesa/src/mesa/swrast/s_tritemp.h Mon Apr 9 11:37:10 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/swrast/s_tritemp.h,v 1.2 2007/04/09 15:37:10 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -720,14 +721,18 @@ GLfixed tLeft=0, dtOuter=0, dtInner; #endif #ifdef INTERP_TEX - GLfloat sLeft[MAX_TEXTURE_COORD_UNITS]; - GLfloat tLeft[MAX_TEXTURE_COORD_UNITS]; - GLfloat uLeft[MAX_TEXTURE_COORD_UNITS]; - GLfloat vLeft[MAX_TEXTURE_COORD_UNITS]; - GLfloat dsOuter[MAX_TEXTURE_COORD_UNITS], dsInner[MAX_TEXTURE_COORD_UNITS]; - GLfloat dtOuter[MAX_TEXTURE_COORD_UNITS], dtInner[MAX_TEXTURE_COORD_UNITS]; - GLfloat duOuter[MAX_TEXTURE_COORD_UNITS], duInner[MAX_TEXTURE_COORD_UNITS]; - GLfloat dvOuter[MAX_TEXTURE_COORD_UNITS], dvInner[MAX_TEXTURE_COORD_UNITS]; + GLfloat sLeft[MAX_TEXTURE_COORD_UNITS] = { 0.0 }; + GLfloat tLeft[MAX_TEXTURE_COORD_UNITS] = { 0.0 }; + GLfloat uLeft[MAX_TEXTURE_COORD_UNITS] = { 0.0 }; + GLfloat vLeft[MAX_TEXTURE_COORD_UNITS] = { 0.0 }; + GLfloat dsOuter[MAX_TEXTURE_COORD_UNITS] = { 0.0 }, + dsInner[MAX_TEXTURE_COORD_UNITS]; + GLfloat dtOuter[MAX_TEXTURE_COORD_UNITS] = { 0.0 }, + dtInner[MAX_TEXTURE_COORD_UNITS]; + GLfloat duOuter[MAX_TEXTURE_COORD_UNITS] = { 0.0 }, + duInner[MAX_TEXTURE_COORD_UNITS]; + GLfloat dvOuter[MAX_TEXTURE_COORD_UNITS] = { 0.0 }, + dvInner[MAX_TEXTURE_COORD_UNITS]; #endif for (subTriangle=0; subTriangle<=1; subTriangle++) { Index: xc/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c diff -u xc/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c:1.1.1.3 xc/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c:1.2 --- xc/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c:1.1.1.3 Fri Dec 10 10:06:44 2004 +++ xc/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c Mon Apr 9 11:37:10 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c,v 1.2 2007/04/09 15:37:10 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -56,9 +57,9 @@ SWvertex *v0 = &verts[e0]; SWvertex *v1 = &verts[e1]; SWvertex *v2 = &verts[e2]; - GLchan c[2][4]; - GLchan s[2][4]; - GLfloat i[2]; + GLchan c[2][4] = {{0, }, }; + GLchan s[2][4] = {{0, }, }; + GLfloat i[2] = {0.0, 0.0}; /* cull testing */ if (ctx->Polygon.CullFlag) { @@ -115,9 +116,9 @@ SWvertex *v0 = &verts[e0]; SWvertex *v1 = &verts[e1]; SWvertex *v2 = &verts[e2]; - GLchan c[2][4]; - GLchan s[2][4]; - GLfloat i[2]; + GLchan c[2][4] = {{0, }, }; + GLchan s[2][4] = {{0, }, }; + GLfloat i[2] = {0.0, }; /* cull testing */ if (ctx->Polygon.CullFlag) { Index: xc/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h diff -u xc/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h:1.1.1.3 xc/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h:1.2 --- xc/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h:1.1.1.3 Fri Dec 10 10:06:44 2004 +++ xc/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h Mon Apr 9 11:37:10 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h,v 1.2 2007/04/09 15:37:10 tsi Exp $ */ /* * Mesa 3-D graphics library * Version: 6.1 @@ -35,9 +36,9 @@ GLfloat offset; GLenum mode = GL_FILL; GLuint facing = 0; - GLchan saved_color[3][4]; - GLchan saved_spec[3][4]; - GLfloat saved_index[3]; + GLchan saved_color[3][4] = {{0, }, }; + GLchan saved_spec[3][4] = {{0, }, }; + GLfloat saved_index[3] = {0.0, 0.0, 0.0}; v[0] = &verts[e0]; v[1] = &verts[e1]; Index: xc/extras/Xpm/lib/data.c diff -u xc/extras/Xpm/lib/data.c:1.7 xc/extras/Xpm/lib/data.c:1.8 --- xc/extras/Xpm/lib/data.c:1.7 Mon Jan 9 09:56:41 2006 +++ xc/extras/Xpm/lib/data.c Mon Sep 4 11:17:14 2006 @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/data.c,v 1.7 2006/01/09 14:56:41 dawes Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/data.c,v 1.8 2006/09/04 15:17:14 tsi Exp $ */ /* October 2004, source code review by Thomas Biege */ @@ -51,7 +51,6 @@ if (data->type == XPMBUFFER) { register char c; register unsigned int n = 0; - unsigned int notend; char *s, *s2; s = data->Comment; @@ -74,12 +73,15 @@ /* store comment */ data->Comment[0] = *s; s = data->Comment; - notend = 1; n = 0; - while (notend) { + while (1) { s2 = data->Ecmt; while (*s != *s2 && c) { c = *data->cptr++; + if (c == '\0') { /* unterminated comment, stop */ + data->cptr--; + return 0; + } if (n == XPMMAXCMTLEN - 1) { /* forget it */ s = data->Comment; n = 0; @@ -90,6 +92,10 @@ data->CommentLength = n; do { c = *data->cptr++; + if (c == '\0') { + data->cptr--; + return 0; + } if (n == XPMMAXCMTLEN - 1) { /* forget it */ s = data->Comment; n = 0; @@ -97,19 +103,17 @@ *++s = c; n++; s2++; - } while (c == *s2 && *s2 != '\0' && c); + } while (c == *s2 && *s2 != '\0'); if (*s2 == '\0') { /* this is the end of the comment */ - notend = 0; data->cptr--; + return 0; } } - return 0; } else { FILE *file = data->stream.file; register int c; register unsigned int n = 0, a; - unsigned int notend; char *s, *s2; s = data->Comment; @@ -134,9 +138,8 @@ /* store comment */ data->Comment[0] = *s; s = data->Comment; - notend = 1; n = 0; - while (notend) { + while (1) { s2 = data->Ecmt; while (*s != *s2 && c != EOF) { c = Getc(data, file); @@ -150,6 +153,9 @@ data->CommentLength = n; do { c = Getc(data, file); + if (c == EOF) { /* unterminated comment, stop */ + return 0; + } if (n == XPMMAXCMTLEN - 1) { /* forget it */ s = data->Comment; n = 0; @@ -157,14 +163,13 @@ *++s = c; n++; s2++; - } while (c == *s2 && *s2 != '\0' && c != EOF); + } while (c == *s2 && *s2 != '\0'); if (*s2 == '\0') { /* this is the end of the comment */ - notend = 0; Ungetc(data, *s, file); + return 0; } } - return 0; } } Index: xc/extras/fontconfig/src/fccharset.c diff -u xc/extras/fontconfig/src/fccharset.c:1.2 xc/extras/fontconfig/src/fccharset.c:1.3 --- xc/extras/fontconfig/src/fccharset.c:1.2 Wed Jun 4 12:29:39 2003 +++ xc/extras/fontconfig/src/fccharset.c Mon Apr 9 11:37:10 2007 @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/extras/fontconfig/src/fccharset.c,v 1.2 2003/06/04 16:29:39 dawes Exp $ */ +/* $XFree86: xc/extras/fontconfig/src/fccharset.c,v 1.3 2007/04/09 15:37:10 tsi Exp $ */ #include #include "fcint.h" @@ -254,6 +254,7 @@ { iter->ucs4 = ~0; iter->leaf = 0; + iter->pos = 0; return; } iter->ucs4 = (FcChar32) fcs->numbers[pos] << 8; Index: xc/extras/freetype2/include/freetype/fterrdef.h diff -u xc/extras/freetype2/include/freetype/fterrdef.h:1.1.1.2 xc/extras/freetype2/include/freetype/fterrdef.h:1.3 --- xc/extras/freetype2/include/freetype/fterrdef.h:1.1.1.2 Mon Apr 26 11:40:14 2004 +++ xc/extras/freetype2/include/freetype/fterrdef.h Mon Apr 16 16:49:01 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/include/freetype/fterrdef.h,v 1.3 2007/04/16 20:49:01 tsi Exp $ */ /***************************************************************************/ /* */ /* fterrdef.h */ @@ -52,6 +53,8 @@ "broken table" ) FT_ERRORDEF_( Invalid_Offset, 0x09, \ "broken offset within table" ) + FT_ERRORDEF_( Array_Too_Large, 0x0A, \ + "array allocation size too large" ) /* glyph/character errors */ @@ -226,6 +229,8 @@ "`ENCODING' field missing" ) FT_ERRORDEF_( Missing_Bbx_Field, 0xB6, \ "`BBX' field missing" ) + FT_ERRORDEF_( Bbx_Too_Big, 0xB7, \ + "`BBX' too big" ) /* END */ Index: xc/extras/freetype2/include/freetype/fttypes.h diff -u xc/extras/freetype2/include/freetype/fttypes.h:1.1.1.5 xc/extras/freetype2/include/freetype/fttypes.h:1.2 --- xc/extras/freetype2/include/freetype/fttypes.h:1.1.1.5 Wed May 28 22:01:45 2003 +++ xc/extras/freetype2/include/freetype/fttypes.h Fri May 18 14:01:57 2007 @@ -1,3 +1,5 @@ +/* $XFree86: xc/extras/freetype2/include/freetype/fttypes.h,v 1.2 2007/05/18 18:01:57 tsi Exp $ */ + /***************************************************************************/ /* */ /* fttypes.h */ @@ -25,7 +27,19 @@ #include FT_SYSTEM_H #include FT_IMAGE_H +#ifndef FONTMODULE #include +#else +#include +#define _XTYPEDEF_BOOL +#include +#include "xf86_ansic.h" +#ifndef size_t +#define DONT_DEFINE_WRAPPERS +#define size_t xf86size_t +#undef DONT_DEFINE_WRAPPERS +#endif +#endif FT_BEGIN_HEADER Index: xc/extras/freetype2/include/freetype/config/ftconfig.h diff -u xc/extras/freetype2/include/freetype/config/ftconfig.h:1.6 xc/extras/freetype2/include/freetype/config/ftconfig.h:1.7 --- xc/extras/freetype2/include/freetype/config/ftconfig.h:1.6 Mon Apr 26 12:15:53 2004 +++ xc/extras/freetype2/include/freetype/config/ftconfig.h Fri May 18 14:01:57 2007 @@ -1,3 +1,5 @@ +/* $XFree86: xc/extras/freetype2/include/freetype/config/ftconfig.h,v 1.7 2007/05/18 18:01:57 tsi Exp $ */ + /***************************************************************************/ /* */ /* ftconfig.h */ @@ -14,7 +16,6 @@ /* understand and accept it fully. */ /* */ /***************************************************************************/ -/* $XFree86: xc/extras/freetype2/include/freetype/config/ftconfig.h,v 1.6 2004/04/26 16:15:53 dawes Exp $ */ /*************************************************************************/ /* */ @@ -72,11 +73,12 @@ /* The size of an `int' type. */ -#if FT_UINT_MAX == 0xFFFFFFFFUL +#if FT_UINT_MAX == 0xFFFFFFFFUL #define FT_SIZEOF_INT (32 / FT_CHAR_BIT) #elif FT_UINT_MAX == 0xFFFFU #define FT_SIZEOF_INT (16 / FT_CHAR_BIT) -#elif FT_UINT_MAX > 0xFFFFFFFFU && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFU +#elif ((FT_UINT_MAX & ~0xFFFFFFFFU) != 0) && \ + (FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFU) #define FT_SIZEOF_INT (64 / FT_CHAR_BIT) #else #error "Unsupported size of `int' type!" @@ -85,7 +87,8 @@ /* The size of a `long' type. */ #if FT_ULONG_MAX == 0xFFFFFFFFUL #define FT_SIZEOF_LONG (32 / FT_CHAR_BIT) -#elif FT_ULONG_MAX > 0xFFFFFFFFU && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFU +#elif ((FT_ULONG_MAX & ~0xFFFFFFFFU) != 0) && \ + (FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFU) #define FT_SIZEOF_LONG (64 / FT_CHAR_BIT) #else #error "Unsupported size of `long' type!" Index: xc/extras/freetype2/include/freetype/config/ftmodule.h diff -u xc/extras/freetype2/include/freetype/config/ftmodule.h:1.1.1.5 xc/extras/freetype2/include/freetype/config/ftmodule.h:1.2 --- xc/extras/freetype2/include/freetype/config/ftmodule.h:1.1.1.5 Wed May 28 22:01:46 2003 +++ xc/extras/freetype2/include/freetype/config/ftmodule.h Fri May 18 14:01:57 2007 @@ -1,6 +1,10 @@ +/* $XFree86: xc/extras/freetype2/include/freetype/config/ftmodule.h,v 1.2 2007/05/18 18:01:57 tsi Exp $ */ + FT_USE_MODULE(autohint_module_class) FT_USE_MODULE(cff_driver_class) +#ifndef FONTMODULE FT_USE_MODULE(t1cid_driver_class) +#endif FT_USE_MODULE(pcf_driver_class) FT_USE_MODULE(bdf_driver_class) FT_USE_MODULE(psaux_module_class) @@ -8,12 +12,16 @@ FT_USE_MODULE(pshinter_module_class) FT_USE_MODULE(ft_raster1_renderer_class) FT_USE_MODULE(sfnt_module_class) +#ifndef FONTMODULE FT_USE_MODULE(ft_smooth_renderer_class) FT_USE_MODULE(ft_smooth_lcd_renderer_class) FT_USE_MODULE(ft_smooth_lcdv_renderer_class) +#endif FT_USE_MODULE(tt_driver_class) FT_USE_MODULE(t1_driver_class) +#ifndef FONTMODULE FT_USE_MODULE(t42_driver_class) FT_USE_MODULE(pfr_driver_class) FT_USE_MODULE(winfnt_driver_class) +#endif Index: xc/extras/freetype2/include/freetype/config/ftoption.h diff -u xc/extras/freetype2/include/freetype/config/ftoption.h:1.8 xc/extras/freetype2/include/freetype/config/ftoption.h:1.9 --- xc/extras/freetype2/include/freetype/config/ftoption.h:1.8 Mon Apr 26 12:15:53 2004 +++ xc/extras/freetype2/include/freetype/config/ftoption.h Fri May 18 14:01:57 2007 @@ -1,3 +1,5 @@ +/* $XFree86: xc/extras/freetype2/include/freetype/config/ftoption.h,v 1.9 2007/05/18 18:01:57 tsi Exp $ */ + /***************************************************************************/ /* */ /* ftoption.h */ @@ -526,7 +528,11 @@ /* files into an existing face. Note that if set, the T1 driver will be */ /* unable to produce kerning distances. */ /* */ +#ifdef FONTMODULE +#define T1_CONFIG_OPTION_NO_AFM +#else #undef T1_CONFIG_OPTION_NO_AFM +#endif /*************************************************************************/ @@ -535,7 +541,11 @@ /* compilation of the Multiple Masters font support in the Type 1 */ /* driver. */ /* */ +#ifdef FONTMODULE +#define T1_CONFIG_OPTION_NO_MM_SUPPORT +#else #undef T1_CONFIG_OPTION_NO_MM_SUPPORT +#endif /* */ Index: xc/extras/freetype2/include/freetype/config/ftstdlib.h diff -u xc/extras/freetype2/include/freetype/config/ftstdlib.h:1.1.1.2 xc/extras/freetype2/include/freetype/config/ftstdlib.h:1.2 --- xc/extras/freetype2/include/freetype/config/ftstdlib.h:1.1.1.2 Mon Apr 26 11:40:19 2004 +++ xc/extras/freetype2/include/freetype/config/ftstdlib.h Fri May 18 14:01:57 2007 @@ -1,3 +1,5 @@ +/* $XFree86: xc/extras/freetype2/include/freetype/config/ftstdlib.h,v 1.2 2007/05/18 18:01:57 tsi Exp $ */ + /***************************************************************************/ /* */ /* ftstdlib.h */ @@ -58,6 +60,8 @@ /**********************************************************************/ +#ifndef FONTMODULE + #include #define FT_UINT_MAX UINT_MAX @@ -132,6 +136,74 @@ #define ft_longjmp longjmp /* " */ +#else + +#include +#define _XTYPEDEF_BOOL +#include +#define DONT_DEFINE_WRAPPERS +#define DEFINE_SETJMP_WRAPPERS +#include "xf86_ansic.h" +#undef DONT_DEFINE_WRAPPERS + +#ifndef offsetof +#define offsetof(TYPE, MEMBER) ((xf86size_t)&((TYPE*)0)->MEMBER) +#endif + +#define FT_CHAR_BIT 8 +#define FT_UINT_MAX 4294967295U +#ifdef LONG64 +#define FT_ULONG_MAX 18446744073709551615UL +#else +#define FT_ULONG_MAX 4294967295UL +#endif + +#define ft_isalnum xf86isalnum +#define ft_isupper xf86isupper +#define ft_islower xf86islower +#define ft_isdigit xf86isdigit +#define ft_isxdigit xf86isxdigit + +#define ft_memcmp xf86memcmp +#define ft_memcpy xf86memcpy +#define ft_memmove xf86memmove +#define ft_memset xf86memset +#define ft_strcat xf86strcat +#define ft_strcmp xf86strcmp +#define ft_strcpy xf86strcpy +#define ft_strlen xf86strlen +#define ft_strncmp xf86strncmp +#define ft_strncpy xf86strncpy +#define ft_strrchr xf86strrchr + +#define ft_sprintf xf86sprintf + +#define ft_qsort xf86qsort +#define ft_exit xf86exit + +#define ft_atol xf86atol + +#define ft_jmp_buf jmp_buf +#define ft_setjmp setjmp +#define ft_longjmp longjmp + +#undef exit +#define exit xf86exit + +#undef fprintf +#define fprintf xf86fprintf + +#undef memcpy +#define memcpy xf86memcpy +#undef memset +#define memset xf86memset + +#undef stderr +#define stderr xf86stderr + +#endif /* FONTMODULE */ + + /* the following is only used for debugging purposes, i.e. when */ /* FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined */ /* */ Index: xc/extras/freetype2/src/base/ftmac.c diff -u xc/extras/freetype2/src/base/ftmac.c:1.6 xc/extras/freetype2/src/base/ftmac.c:1.8 --- xc/extras/freetype2/src/base/ftmac.c:1.6 Mon Apr 26 12:15:54 2004 +++ xc/extras/freetype2/src/base/ftmac.c Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/base/ftmac.c,v 1.8 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* ftmac.c */ @@ -14,7 +15,6 @@ /* understand and accept it fully. */ /* */ /***************************************************************************/ -/* $XFree86: xc/extras/freetype2/src/base/ftmac.c,v 1.6 2004/04/26 16:15:54 dawes Exp $ */ /* Notes @@ -62,10 +62,13 @@ #include #include FT_FREETYPE_H #include FT_INTERNAL_STREAM_H +#include FT_INTERNAL_OBJECTS_H #ifdef __GNUC__ +#if 0 #include "../truetype/ttobjs.h" #include "../type1/t1objs.h" +#endif /* This is for Mac OS X. Without redefinition, OS_INLINE */ /* expands to `static inline' which doesn't survive the */ /* -ansi compilation flag of GCC. */ @@ -253,8 +256,8 @@ FSSpec* spec ) { FT_Error error; - short ref_num, v_ref_num; - long dir_id; + short ref_num, v_ref_num = 0; + long dir_id = 0; Str255 fond_file_name; @@ -262,10 +265,12 @@ error = ResError(); if ( !error ) + { error = get_file_location( ref_num, &v_ref_num, &dir_id, fond_file_name ); - if ( !error ) - error = FSMakeFSSpec( v_ref_num, dir_id, file_name, spec ); + if ( !error ) + error = FSMakeFSSpec( v_ref_num, dir_id, file_name, spec ); + } return error; } @@ -433,7 +438,7 @@ FT_Error error = FT_Err_Ok; short res_id; unsigned char *buffer, *p, *size_p = NULL; - FT_ULong total_size = 0; + FT_ULong total_size = 0, old_total_size = 0; FT_ULong post_size, pfb_chunk_size; Handle post_data; char code, last_code; @@ -466,6 +471,15 @@ last_code = code; } + /* Detect integer overflows */ + if ( total_size < old_total_size ) + { + error = FT_Err_Array_Too_Large; + goto Error; + } + + old_total_size = total_size; + if ( FT_ALLOC( buffer, (FT_Long)total_size ) ) goto Error; @@ -673,8 +687,8 @@ FT_Long face_index, FT_Face *aface ) { - FT_Byte* pfb_data; - FT_ULong pfb_size; + FT_Byte* pfb_data = NULL; + FT_ULong pfb_size = 0; FT_Error error; short res_ref; @@ -842,8 +856,8 @@ OSStatus status = FMCreateFontFamilyIterator( NULL, NULL, options, &famIter ); - FMFont the_font = NULL; - FMFontFamily family = NULL; + FMFont the_font = 0; + FMFontFamily family = 0; *face_index = 0; @@ -1012,11 +1026,13 @@ FT_Long face_index, FT_Face *aface ) { - FT_Open_Args args; FT_Error error; +#if defined( __MWERKS__ ) && !TARGET_RT_MAC_MACHO + FT_Open_Args args; FT_Stream stream; FILE* file; FT_Memory memory; +#endif /* test for valid `library' and `aface' delayed to FT_Open_Face() */ Index: xc/extras/freetype2/src/base/ftoutln.c diff -u xc/extras/freetype2/src/base/ftoutln.c:1.1.1.8 xc/extras/freetype2/src/base/ftoutln.c:1.2 --- xc/extras/freetype2/src/base/ftoutln.c:1.1.1.8 Mon Apr 26 11:40:31 2004 +++ xc/extras/freetype2/src/base/ftoutln.c Mon Apr 9 11:37:10 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/base/ftoutln.c,v 1.2 2007/04/09 15:37:10 tsi Exp $ */ /***************************************************************************/ /* */ /* ftoutln.c */ @@ -725,6 +726,8 @@ xmax.pos = ymax.pos = -32768L; xmin.index = ymin.index = xmax.index = ymax.index = -1; + xmin.first = ymin.first = xmax.first = ymax.first = 0; + xmin.last = ymin.last = xmax.last = ymax.last = 0; first = 0; for ( n = 0; n < outline->n_contours; n++, first = last + 1 ) Index: xc/extras/freetype2/src/base/ftsystem.c diff -u xc/extras/freetype2/src/base/ftsystem.c:1.2 xc/extras/freetype2/src/base/ftsystem.c:1.3 --- xc/extras/freetype2/src/base/ftsystem.c:1.2 Mon Feb 28 18:19:13 2005 +++ xc/extras/freetype2/src/base/ftsystem.c Fri May 18 14:01:57 2007 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/freetype2/src/base/ftsystem.c,v 1.2 2005/02/28 23:19:13 dawes Exp $ */ +/* $XFree86: xc/extras/freetype2/src/base/ftsystem.c,v 1.3 2007/05/18 18:01:57 tsi Exp $ */ /***************************************************************************/ /* */ @@ -35,8 +35,28 @@ #include FT_TYPES_H #include FT_INTERNAL_STREAM_H +#ifndef FONTMODULE #include #include +#else +#include +#define _XTYPEDEF_BOOL +#include +#define DONT_DEFINE_WRAPPERS +#include "xf86_ansic.h" +#undef DONT_DEFINE_WRAPPERS +#define malloc(x) xf86malloc(x) +#define realloc(x, y) xf86realloc(x, y) +#define free(x) xf86free(x) +#define FILE XF86FILE +#define fopen(x, y) xf86fopen(x, y) +#define fclose(x) xf86fclose(x) +#define fseek(x, y, z) xf86fseek(x, y, z) +#define ftell(x) xf86ftell(x) +#define SEEK_SET XF86_SEEK_SET +#define SEEK_END XF86_SEEK_END +#define fread(x, y, z, t) xf86fread(x, y, z, t) +#endif /*************************************************************************/ @@ -267,6 +287,10 @@ #endif +#ifdef FONTMODULE +#undef free +#endif + /* documentation is in ftobjs.h */ FT_EXPORT_DEF( FT_Memory ) Index: xc/extras/freetype2/src/base/ftutil.c diff -u xc/extras/freetype2/src/base/ftutil.c:1.1.1.2 xc/extras/freetype2/src/base/ftutil.c:1.2 --- xc/extras/freetype2/src/base/ftutil.c:1.1.1.2 Wed May 28 22:01:49 2003 +++ xc/extras/freetype2/src/base/ftutil.c Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/base/ftutil.c,v 1.2 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* ftutil.c */ @@ -51,6 +52,8 @@ FT_Long size, void* *P ) { + FT_Error error = FT_Err_Ok; + FT_ASSERT( P != 0 ); if ( size > 0 ) @@ -67,13 +70,17 @@ FT_MEM_ZERO( *P, size ); } else + { *P = NULL; + if ( size < 0 ) + error = FT_Err_Invalid_Argument; + } FT_TRACE7(( "FT_Alloc:" )); FT_TRACE7(( " size = %ld, block = 0x%08p, ref = 0x%08p\n", size, *P, P )); - return FT_Err_Ok; + return error; } @@ -86,10 +93,16 @@ void** P ) { void* Q; - + FT_Error error; FT_ASSERT( P != 0 ); + if ( ( size < 0 ) || ( current < 0 ) ) + { + error = FT_Err_Invalid_Argument; + goto Fail; + } + /* if the original pointer is NULL, call FT_Alloc() */ if ( !*P ) return FT_Alloc( memory, size, P ); @@ -103,7 +116,10 @@ Q = memory->realloc( memory, current, size, *P ); if ( !Q ) + { + error = FT_Err_Out_Of_Memory; goto Fail; + } if ( size > current ) FT_MEM_ZERO( (char*)Q + current, size - current ); @@ -115,7 +131,7 @@ FT_ERROR(( "FT_Realloc:" )); FT_ERROR(( " Failed (current %ld, requested %ld)\n", current, size )); - return FT_Err_Out_Of_Memory; + return error; } Index: xc/extras/freetype2/src/bdf/bdfdrivr.c diff -u xc/extras/freetype2/src/bdf/bdfdrivr.c:1.3 xc/extras/freetype2/src/bdf/bdfdrivr.c:1.4 --- xc/extras/freetype2/src/bdf/bdfdrivr.c:1.3 Mon Apr 26 12:15:54 2004 +++ xc/extras/freetype2/src/bdf/bdfdrivr.c Mon Apr 9 11:37:11 2007 @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/extras/freetype2/src/bdf/bdfdrivr.c,v 1.3 2004/04/26 16:15:54 dawes Exp $ */ +/* $XFree86: xc/extras/freetype2/src/bdf/bdfdrivr.c,v 1.4 2007/04/09 15:37:11 tsi Exp $ */ #include @@ -319,7 +319,7 @@ FT_Error error = BDF_Err_Ok; FT_Memory memory = FT_FACE_MEMORY( face ); - bdf_font_t* font; + bdf_font_t* font = NULL; bdf_options_t options; FT_UNUSED( num_params ); Index: xc/extras/freetype2/src/bdf/bdflib.c diff -u xc/extras/freetype2/src/bdf/bdflib.c:1.4 xc/extras/freetype2/src/bdf/bdflib.c:1.7 --- xc/extras/freetype2/src/bdf/bdflib.c:1.4 Mon Apr 26 12:15:54 2004 +++ xc/extras/freetype2/src/bdf/bdflib.c Thu May 24 11:18:56 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/bdf/bdflib.c,v 1.7 2007/05/24 15:18:56 tsi Exp $ */ /* * Copyright 2000 Computing Research Labs, New Mexico State University * Copyright 2001, 2002, 2003, 2004 Francesco Zappa Nardelli @@ -20,7 +21,6 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/extras/freetype2/src/bdf/bdflib.c,v 1.4 2004/04/26 16:15:54 dawes Exp $ */ /*************************************************************************/ /* */ @@ -386,8 +386,8 @@ } _bdf_parse_t; -#define setsbit( m, cc ) ( m[(cc) >> 3] |= (FT_Byte)( 1 << ( (cc) & 7 ) ) ) -#define sbitset( m, cc ) ( m[(cc) >> 3] & ( 1 << ( (cc) & 7 ) ) ) +#define setsbit( m, cc ) ( m[(FT_Byte)(cc) >> 3] |= (FT_Byte)( 1 << ( (cc) & 7 ) ) ) +#define sbitset( m, cc ) ( m[(FT_Byte)(cc) >> 3] & ( 1 << ( (cc) & 7 ) ) ) /* An empty string for empty fields. */ @@ -569,12 +569,11 @@ unsigned long i, j; char *fp, *dp; + *len = 0; if ( list == 0 || list->used == 0 ) return 0; - *len = 0; - dp = list->field[0]; for ( i = j = 0; i < list->used; i++ ) { @@ -1099,7 +1098,7 @@ #define ERRMSG1 "[line %ld] Missing \"%s\" line.\n" #define ERRMSG2 "[line %ld] Font header corrupted or missing fields.\n" #define ERRMSG3 "[line %ld] Font glyphs corrupted or missing fields.\n" - +#define ERRMSG4 "[line %ld] BBX too big.\n" static FT_Error _bdf_add_comment( bdf_font_t* font, @@ -1142,7 +1141,7 @@ bdf_options_t* opts ) { unsigned long len; - char name[128]; + char name[256]; _bdf_list_t list; FT_Memory memory; FT_Error error = BDF_Err_Ok; @@ -1159,6 +1158,13 @@ font->spacing = opts->font_spacing; len = (unsigned long)( ft_strlen( font->name ) + 1 ); + /* Limit font names to 256 characters */ + if ( len >= 256 ) + { + error = BDF_Err_Invalid_Argument; + goto Exit; + } + FT_MEM_COPY( name, font->name, len ); list.size = list.used = 0; @@ -1493,6 +1499,12 @@ /* Make sure the number of glyphs is non-zero. */ if ( p->cnt == 0 ) font->glyphs_size = 64; + else /* Limit to the number of code points in Unicode */ + if ( p->cnt > 1114112 ) + { + error = BDF_Err_Invalid_Argument; + goto Exit; + } if ( FT_NEW_ARRAY( font->glyphs, font->glyphs_size ) ) goto Exit; @@ -1571,6 +1583,13 @@ goto Exit; p->glyph_enc = _bdf_atol( p->list.field[1], 0, 10 ); + /* Ensure p->have doesn't overflow */ + if ( p->glyph_enc > ( sizeof ( p->have ) * 8 ) ) + { + error = BDF_Err_Invalid_File_Format; + goto Exit; + } + /* Check to see whether this encoding has already been encountered. */ /* If it has then change it to unencoded so it gets added if */ /* indicated. */ @@ -1821,6 +1840,8 @@ /* And finally, gather up the bitmap. */ if ( ft_memcmp( line, "BITMAP", 6 ) == 0 ) { + FT_ULong bytes; + if ( !( p->flags & _BDF_BBX ) ) { /* Missing BBX field. */ @@ -1831,6 +1852,15 @@ /* Allocate enough space for the bitmap. */ glyph->bpr = ( glyph->bbx.width * p->font->bpp + 7 ) >> 3; + bytes = glyph->bpr * glyph->bbx.height; + + if ( bytes != (unsigned short)bytes ) + { + FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG4, lineno )); + error = BDF_Err_Bbx_Too_Big; + goto Exit; + } + glyph->bytes = (unsigned short)( glyph->bpr * glyph->bbx.height ); if ( FT_NEW_ARRAY( glyph->bitmap, glyph->bytes ) ) Index: xc/extras/freetype2/src/cff/cffgload.c diff -u xc/extras/freetype2/src/cff/cffgload.c:1.4 xc/extras/freetype2/src/cff/cffgload.c:1.5 --- xc/extras/freetype2/src/cff/cffgload.c:1.4 Mon Apr 26 12:15:54 2004 +++ xc/extras/freetype2/src/cff/cffgload.c Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/cff/cffgload.c,v 1.5 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* cffgload.c */ @@ -15,9 +16,6 @@ /* */ /***************************************************************************/ -/* $XFree86: xc/extras/freetype2/src/cff/cffgload.c,v 1.4 2004/04/26 16:15:54 dawes Exp $ */ - - #include #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_CALC_H @@ -2288,7 +2286,7 @@ FT_LOCAL_DEF( FT_Error ) cff_slot_load( CFF_GlyphSlot glyph, CFF_Size size, - FT_Int glyph_index, + FT_UInt glyph_index, FT_Int32 load_flags ) { FT_Error error; @@ -2334,7 +2332,7 @@ error = sfnt->load_sbit_image( face, (FT_ULong)size->strike_index, - (FT_UInt)glyph_index, + glyph_index, (FT_Int)load_flags, stream, &glyph->root.bitmap, @@ -2397,7 +2395,12 @@ /* subsetted font, glyph_indices and CIDs are identical, though */ if ( cff->top_font.font_dict.cid_registry != 0xFFFFU && cff->charset.cids ) - glyph_index = cff->charset.cids[glyph_index]; + { + if ( glyph_index < cff->charset.max_cid ) + glyph_index = cff->charset.cids[glyph_index]; + else + glyph_index = 0; + } cff_decoder_init( &decoder, face, size, glyph, hinting, FT_LOAD_TARGET_MODE( load_flags ) ); Index: xc/extras/freetype2/src/cff/cffgload.h diff -u xc/extras/freetype2/src/cff/cffgload.h:1.1.1.6 xc/extras/freetype2/src/cff/cffgload.h:1.2 --- xc/extras/freetype2/src/cff/cffgload.h:1.1.1.6 Mon Apr 26 11:40:36 2004 +++ xc/extras/freetype2/src/cff/cffgload.h Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/cff/cffgload.h,v 1.2 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* cffgload.h */ @@ -200,7 +201,7 @@ FT_LOCAL( FT_Error ) cff_slot_load( CFF_GlyphSlot glyph, CFF_Size size, - FT_Int glyph_index, + FT_UInt glyph_index, FT_Int32 load_flags ); Index: xc/extras/freetype2/src/cff/cffload.c diff -u xc/extras/freetype2/src/cff/cffload.c:1.1.1.7 xc/extras/freetype2/src/cff/cffload.c:1.2 --- xc/extras/freetype2/src/cff/cffload.c:1.1.1.7 Mon Apr 26 11:40:36 2004 +++ xc/extras/freetype2/src/cff/cffload.c Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/cff/cffload.c,v 1.2 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* cffload.c */ @@ -1235,7 +1236,7 @@ } /* access element */ - if ( off1 ) + if ( off1 && ( off2 > off1 ) ) { *pbyte_len = off2 - off1; @@ -1688,6 +1689,8 @@ for ( i = 0; i < num_glyphs; i++ ) charset->cids[charset->sids[i]] = i; + + charset->max_cid = max_cid; } Exit: @@ -2042,6 +2045,9 @@ goto Exit; } + /* ensure num_blue_values is even */ + priv->num_blue_values &= ~1; + /* read the local subrs, if any */ if ( priv->local_subrs_offset ) { Index: xc/extras/freetype2/src/cff/cfftypes.h diff -u xc/extras/freetype2/src/cff/cfftypes.h:1.1.1.1 xc/extras/freetype2/src/cff/cfftypes.h:1.2 --- xc/extras/freetype2/src/cff/cfftypes.h:1.1.1.1 Mon Apr 26 11:40:36 2004 +++ xc/extras/freetype2/src/cff/cfftypes.h Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/cff/cfftypes.h,v 1.2 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* cfftypes.h */ @@ -84,6 +85,7 @@ FT_UShort* sids; FT_UShort* cids; /* the inverse mapping of `sids'; only needed */ /* for CID-keyed fonts */ + FT_UInt max_cid; } CFF_CharsetRec, *CFF_Charset; Index: xc/extras/freetype2/src/gzip/inftrees.c diff -u xc/extras/freetype2/src/gzip/inftrees.c:1.1.1.2 xc/extras/freetype2/src/gzip/inftrees.c:1.2 --- xc/extras/freetype2/src/gzip/inftrees.c:1.1.1.2 Mon Apr 26 11:40:38 2004 +++ xc/extras/freetype2/src/gzip/inftrees.c Mon Apr 9 11:37:11 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/gzip/inftrees.c,v 1.2 2007/04/09 15:37:11 tsi Exp $ */ /* inftrees.c -- generate Huffman trees for efficient decoding * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -253,8 +254,10 @@ /* set up table entry in r */ r.bits = (Byte)(k - w); - if (p >= v + n) + if (p >= v + n) { r.exop = 128 + 64; /* out of values--invalid code */ + r.base = 0; + } else if (*p < s) { r.exop = (Byte)(*p < 256 ? 0 : 32 + 64); /* 256 is end-of-block */ Index: xc/extras/freetype2/src/gzip/zutil.c diff -u xc/extras/freetype2/src/gzip/zutil.c:1.2 xc/extras/freetype2/src/gzip/zutil.c:1.3 --- xc/extras/freetype2/src/gzip/zutil.c:1.2 Mon Jan 9 09:56:44 2006 +++ xc/extras/freetype2/src/gzip/zutil.c Sun Dec 10 10:58:23 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/gzip/zutil.c,v 1.3 2006/12/10 15:58:23 tsi Exp $ */ /* zutil.c -- target dependent utility functions for the compression library * Copyright (C) 1995-2002 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h @@ -9,6 +10,24 @@ extern void exit OF((int)); #endif +#ifdef DEBUG +# ifndef FONTMODULE +# include +# endif + +# ifndef verbose +# define verbose 0 +# endif +int z_verbose = verbose; + +void z_error (m) + char *m; +{ + fprintf(stderr, "%s\n", m); + exit(1); +} +#endif + #ifndef HAVE_MEMCPY Index: xc/extras/freetype2/src/gzip/zutil.h diff -u xc/extras/freetype2/src/gzip/zutil.h:1.4 xc/extras/freetype2/src/gzip/zutil.h:1.5 --- xc/extras/freetype2/src/gzip/zutil.h:1.4 Mon Jan 9 09:56:44 2006 +++ xc/extras/freetype2/src/gzip/zutil.h Sun Dec 10 10:58:23 2006 @@ -8,7 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* $XFree86: xc/extras/freetype2/src/gzip/zutil.h,v 1.4 2006/01/09 14:56:44 dawes Exp $ */ +/* $XFree86: xc/extras/freetype2/src/gzip/zutil.h,v 1.5 2006/12/10 15:58:23 tsi Exp $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H @@ -186,7 +186,9 @@ /* Diagnostic functions */ #ifdef DEBUG -# include +# ifndef FONTMODULE +# include +# endif extern int z_verbose; extern void z_error OF((char *m)); # define Assert(cond,msg) {if(!(cond)) z_error(msg);} Index: xc/extras/freetype2/src/lzw/zopen.h diff -u xc/extras/freetype2/src/lzw/zopen.h:1.2 xc/extras/freetype2/src/lzw/zopen.h:1.3 --- xc/extras/freetype2/src/lzw/zopen.h:1.2 Mon Jan 9 09:56:44 2006 +++ xc/extras/freetype2/src/lzw/zopen.h Sun Dec 10 10:58:24 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/lzw/zopen.h,v 1.3 2006/12/10 15:58:24 tsi Exp $ */ /*- * Copyright (c) 1985, 1986, 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -40,7 +41,9 @@ * */ +#ifndef FONTMODULE #include +#endif #define BITS 16 /* Default bits. */ #define HSIZE 69001 /* 95% occupancy */ Index: xc/extras/freetype2/src/pcf/pcfread.c diff -u xc/extras/freetype2/src/pcf/pcfread.c:1.5 xc/extras/freetype2/src/pcf/pcfread.c:1.6 --- xc/extras/freetype2/src/pcf/pcfread.c:1.5 Mon Apr 26 12:15:54 2004 +++ xc/extras/freetype2/src/pcf/pcfread.c Sun Jul 23 15:44:48 2006 @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/extras/freetype2/src/pcf/pcfread.c,v 1.5 2004/04/26 16:15:54 dawes Exp $ */ +/* $XFree86: xc/extras/freetype2/src/pcf/pcfread.c,v 1.6 2006/07/23 19:44:48 tsi Exp $ */ #include @@ -399,6 +399,10 @@ if ( FT_STREAM_READ_FIELDS( pcf_property_header, props + i ) ) goto Bail; } + if (props[i].name < 0 + || (props[i].isString != 0 && props[i].isString != 1) + || (props[i].isString && props[i].value < 0)) + goto Bail; } /* pad the property array */ Index: xc/extras/freetype2/src/pshinter/pshglob.c diff -u xc/extras/freetype2/src/pshinter/pshglob.c:1.1.1.5 xc/extras/freetype2/src/pshinter/pshglob.c:1.2 --- xc/extras/freetype2/src/pshinter/pshglob.c:1.1.1.5 Mon Apr 26 11:40:45 2004 +++ xc/extras/freetype2/src/pshinter/pshglob.c Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/pshinter/pshglob.c,v 1.2 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* pshglob.c */ @@ -150,7 +151,7 @@ FT_UNUSED( target ); - for ( ; read_count > 0; read_count -= 2 ) + for ( ; read_count > 1; read_count -= 2 ) { FT_Int reference, delta; FT_UInt count; Index: xc/extras/freetype2/src/sfnt/ttcmap0.c diff -u xc/extras/freetype2/src/sfnt/ttcmap0.c:1.5 xc/extras/freetype2/src/sfnt/ttcmap0.c:1.6 --- xc/extras/freetype2/src/sfnt/ttcmap0.c:1.5 Mon Apr 26 12:15:55 2004 +++ xc/extras/freetype2/src/sfnt/ttcmap0.c Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/sfnt/ttcmap0.c,v 1.6 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* ttcmap0.c */ @@ -14,7 +15,6 @@ /* understand and accept it fully. */ /* */ /***************************************************************************/ -/* $XFree86: xc/extras/freetype2/src/sfnt/ttcmap0.c,v 1.5 2004/04/26 16:15:55 dawes Exp $ */ #include #include FT_INTERNAL_DEBUG_H @@ -1932,7 +1932,7 @@ charmap.encoding = FT_ENCODING_NONE; /* will be filled later */ offset = TT_NEXT_ULONG( p ); - if ( offset && table + offset + 2 < limit ) + if ( offset && ( offset < face->cmap_size - 2 ) ) { FT_Byte* cmap = table + offset; volatile FT_UInt format = TT_PEEK_USHORT( cmap ); Index: xc/extras/freetype2/src/tools/cordic.py diff -u xc/extras/freetype2/src/tools/cordic.py:1.4 xc/extras/freetype2/src/tools/cordic.py:1.5 --- xc/extras/freetype2/src/tools/cordic.py:1.4 Wed May 28 22:13:05 2003 +++ xc/extras/freetype2/src/tools/cordic.py Tue May 16 11:34:46 2006 @@ -1,3 +1,6 @@ +#!/usr/bin/env python +# $XFree86: xc/extras/freetype2/src/tools/cordic.py,v 1.5 2006/05/16 15:34:46 tsi Exp $ +# # compute arctangent table for CORDIC computations in fttrigon.c import sys, math @@ -75,4 +78,4 @@ print "shrink factor 2 = " + repr( shrink * (2.0**32) ) print "expansion factor = " + repr(1/shrink) print "" - \ No newline at end of file + Index: xc/extras/freetype2/src/tools/docmaker/content.py diff -u xc/extras/freetype2/src/tools/docmaker/content.py:1.1.1.2 xc/extras/freetype2/src/tools/docmaker/content.py:1.2 --- xc/extras/freetype2/src/tools/docmaker/content.py:1.1.1.2 Mon Apr 26 11:40:56 2004 +++ xc/extras/freetype2/src/tools/docmaker/content.py Tue May 16 11:34:46 2006 @@ -1,3 +1,6 @@ +#!/usr/bin/env python +# $XFree86: xc/extras/freetype2/src/tools/docmaker/content.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ +# # # this file contains routines used to parse the content of documentation # comment block and build a more structured objects out of them Index: xc/extras/freetype2/src/tools/docmaker/formatter.py diff -u xc/extras/freetype2/src/tools/docmaker/formatter.py:1.1.1.2 xc/extras/freetype2/src/tools/docmaker/formatter.py:1.2 --- xc/extras/freetype2/src/tools/docmaker/formatter.py:1.1.1.2 Mon Apr 26 11:40:56 2004 +++ xc/extras/freetype2/src/tools/docmaker/formatter.py Tue May 16 11:34:46 2006 @@ -1,3 +1,7 @@ +#!/usr/bin/env python +# $XFree86: xc/extras/freetype2/src/tools/docmaker/formatter.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ +# + from sources import * from content import * from utils import * Index: xc/extras/freetype2/src/tools/docmaker/sources.py diff -u xc/extras/freetype2/src/tools/docmaker/sources.py:1.1.1.2 xc/extras/freetype2/src/tools/docmaker/sources.py:1.2 --- xc/extras/freetype2/src/tools/docmaker/sources.py:1.1.1.2 Mon Apr 26 11:40:56 2004 +++ xc/extras/freetype2/src/tools/docmaker/sources.py Tue May 16 11:34:46 2006 @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# $XFree86: xc/extras/freetype2/src/tools/docmaker/sources.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ # # this file contains definitions of classes needed to decompose # C sources files into a series of multi-line "blocks". There are Index: xc/extras/freetype2/src/tools/docmaker/tohtml.py diff -u xc/extras/freetype2/src/tools/docmaker/tohtml.py:1.1.1.2 xc/extras/freetype2/src/tools/docmaker/tohtml.py:1.2 --- xc/extras/freetype2/src/tools/docmaker/tohtml.py:1.1.1.2 Mon Apr 26 11:40:56 2004 +++ xc/extras/freetype2/src/tools/docmaker/tohtml.py Tue May 16 11:34:46 2006 @@ -1,3 +1,7 @@ +#!/usr/bin/env python +# $XFree86: xc/extras/freetype2/src/tools/docmaker/tohtml.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ +# + from sources import * from content import * from formatter import * Index: xc/extras/freetype2/src/tools/docmaker/utils.py diff -u xc/extras/freetype2/src/tools/docmaker/utils.py:1.1.1.2 xc/extras/freetype2/src/tools/docmaker/utils.py:1.2 --- xc/extras/freetype2/src/tools/docmaker/utils.py:1.1.1.2 Mon Apr 26 11:40:56 2004 +++ xc/extras/freetype2/src/tools/docmaker/utils.py Tue May 16 11:34:46 2006 @@ -1,3 +1,7 @@ +#!/usr/bin/env python +# $XFree86: xc/extras/freetype2/src/tools/docmaker/utils.py,v 1.2 2006/05/16 15:34:46 tsi Exp $ +# + import string, sys, os, glob # current output directory Index: xc/extras/freetype2/src/truetype/ttgload.c diff -u xc/extras/freetype2/src/truetype/ttgload.c:1.12 xc/extras/freetype2/src/truetype/ttgload.c:1.13 --- xc/extras/freetype2/src/truetype/ttgload.c:1.12 Mon Apr 26 12:15:55 2004 +++ xc/extras/freetype2/src/truetype/ttgload.c Fri May 25 12:23:26 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/truetype/ttgload.c,v 1.13 2007/05/25 16:23:26 tsi Exp $ */ /***************************************************************************/ /* */ /* ttgload.c */ @@ -366,7 +367,11 @@ n_points = 0; if ( n_contours > 0 ) + { n_points = cont[-1] + 1; + if ( n_points < 0 ) + goto Invalid_Outline; + } error = FT_GlyphLoader_CheckPoints( gloader, n_points + 4, 0 ); if ( error ) @@ -670,7 +675,7 @@ { FT_GlyphLoader gloader = load->gloader; FT_Outline* outline = &gloader->current.outline; - FT_UInt n_points = outline->n_points; + FT_Int n_points = outline->n_points; #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER FT_UInt n_ins; #endif Index: xc/extras/freetype2/src/type1/t1load.c diff -u xc/extras/freetype2/src/type1/t1load.c:1.1.1.10 xc/extras/freetype2/src/type1/t1load.c:1.2 --- xc/extras/freetype2/src/type1/t1load.c:1.1.1.10 Mon Apr 26 11:41:01 2004 +++ xc/extras/freetype2/src/type1/t1load.c Thu Apr 5 12:08:58 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/freetype2/src/type1/t1load.c,v 1.2 2007/04/05 16:08:58 tsi Exp $ */ /***************************************************************************/ /* */ /* t1load.c */ @@ -1783,6 +1784,9 @@ if ( error ) goto Exit; + /* Ensure num_blue_values is even */ + priv->num_blue_values &= ~1; + #ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT /* the following can happen for MM instances; we then treat the */ Index: xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl diff -u xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl:1.1.1.1 Thu Nov 2 14:24:40 2000 +++ xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl Mon Jul 23 10:57:22 2007 @@ -1,3 +1,4 @@ +.\" $XFree86: xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl,v 1.2 2007/07/23 14:57:22 tsi Exp $ .\" ** .\" ** (c) Copyright 1993, 1994, 1995, 1996 Silicon Graphics, Inc. .\" ** @@ -17,7 +18,7 @@ .iX "creation functions" .sp 1 .SH SYNOPSIS -\fB#include \fP +\fB#include \fP .br Widget \fBGLwCreateMDrawingArea\fP( Widget \fIparent\fP, String \fIname\fP, Index: xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl diff -u xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl:1.2 xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl:1.3 --- xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl:1.2 Wed Mar 10 13:26:06 2004 +++ xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl Mon Jul 23 10:57:22 2007 @@ -1,3 +1,4 @@ +.\" $XFree86: xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl,v 1.3 2007/07/23 14:57:22 tsi Exp $ .\" ** .\" ** (c) Copyright 1993, 1994, 1995, 1996 Silicon Graphics, Inc. .\" ** @@ -10,7 +11,6 @@ .\" ** Maynard, MA. All Rights Reserved. .\" ** .\" ** -.\" $XFree86: xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl,v 1.2 2004/03/10 18:26:06 tsi Exp $ .TH GLwDrawingArea 3X "" "" "" "" .SH NAME \fBGLwDrawingArea, GLwMDrawingArea \(em OpenGL drawing widgets.\fP @@ -18,11 +18,11 @@ .iX "widget class" "OpenGL" "Draw" .sp 1 .SH SYNOPSIS -\fB#include +\fB#include .br \fBld ... -lGLw -lGL -l -lXext -lXt -lX11 -lm .sp -\fB#include +\fB#include .br \fBld ... -lGLw -lGL -lXm -lXext -lXt -lX11 -lm .sp 1 @@ -400,7 +400,7 @@ .nf \f(CW \& #include -\& #include +\& #include static GLXContext glx_context; /* assume only one context */ . . . Index: xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl diff -u xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl:1.1.1.1 Thu Nov 2 14:24:39 2000 +++ xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl Mon Jul 23 10:57:22 2007 @@ -1,3 +1,4 @@ +.\" $XFree86: xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl,v 1.2 2007/07/23 14:57:22 tsi Exp $ .\" ** .\" ** (c) Copyright 1993, 1994, 1995, 1996 Silicon Graphics, Inc. .\" ** @@ -17,7 +18,7 @@ .iX "GLwDrawingArea" .sp 1 .SH SYNOPSIS -\fB#include \fP +\fB#include \fP .br void \fBGLwDrawingAreaMakeCurrent\fP( Widget \fIw\fP, GLXContext \fIctx\fP ) Index: xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl diff -u xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl:1.1.1.1 Thu Nov 2 14:24:39 2000 +++ xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl Mon Jul 23 10:57:22 2007 @@ -1,3 +1,4 @@ +.\" $XFree86: xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl,v 1.2 2007/07/23 14:57:22 tsi Exp $ .\" ** .\" ** (c) Copyright 1993, 1994, 1995, 1996 Silicon Graphics, Inc. .\" ** @@ -17,7 +18,7 @@ .iX "GLwDrawingArea" .sp 1 .SH SYNOPSIS -\fB#include \fP +\fB#include \fP .br void \fBGLwDrawingAreaSwapBuffers\fP( Widget \fIw\fP ) .br Index: xc/extras/x86emu/include/x86emu/types.h diff -u xc/extras/x86emu/include/x86emu/types.h:1.8 xc/extras/x86emu/include/x86emu/types.h:1.9 --- xc/extras/x86emu/include/x86emu/types.h:1.8 Tue Jun 28 21:14:09 2005 +++ xc/extras/x86emu/include/x86emu/types.h Tue Oct 31 13:06:59 2006 @@ -36,7 +36,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.8 2005/06/29 01:14:09 dawes Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.9 2006/10/31 18:06:59 tsi Exp $ */ #ifndef __X86EMU_TYPES_H #define __X86EMU_TYPES_H @@ -90,15 +90,15 @@ typedef unsigned long long u64; #endif -typedef char s8; -typedef short s16; -typedef NUM32 s32; +typedef signed char s8; +typedef short s16; +typedef NUM32 s32; #ifdef __HAS_LONG_LONG__ -typedef long long s64; +typedef long long s64; #endif -typedef unsigned int uint; -typedef int sint; +typedef unsigned int uint; +typedef int sint; typedef u16 X86EMU_pioAddr; Index: xc/extras/zlib/inftrees.c diff -u xc/extras/zlib/inftrees.c:1.1.1.1 xc/extras/zlib/inftrees.c:1.2 --- xc/extras/zlib/inftrees.c:1.1.1.1 Sun Jun 1 17:00:17 2003 +++ xc/extras/zlib/inftrees.c Mon Apr 9 11:37:11 2007 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/zlib/inftrees.c,v 1.2 2007/04/09 15:37:11 tsi Exp $ */ /* inftrees.c -- generate Huffman trees for efficient decoding * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -250,8 +251,10 @@ /* set up table entry in r */ r.bits = (Byte)(k - w); - if (p >= v + n) + if (p >= v + n) { r.exop = 128 + 64; /* out of values--invalid code */ + r.base = 0; + } else if (*p < s) { r.exop = (Byte)(*p < 256 ? 0 : 32 + 64); /* 256 is end-of-block */ Index: xc/fonts/util/ucs2any.c diff -u xc/fonts/util/ucs2any.c:1.2 xc/fonts/util/ucs2any.c:1.5 --- xc/fonts/util/ucs2any.c:1.2 Mon Jan 9 09:58:14 2006 +++ xc/fonts/util/ucs2any.c Mon Apr 9 11:37:11 2007 @@ -2,9 +2,6 @@ * Copyright (c) 2003 The NetBSD Foundation, Inc. * All rights reserved. * - * This code is derived from software contributed to The NetBSD Foundation - * by Ben Collver . - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its + * 3. Neither the name of The NetBSD Foundation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/fonts/util/ucs2any.c,v 1.2 2006/01/09 14:58:14 dawes Exp $ */ +/* $XFree86: xc/fonts/util/ucs2any.c,v 1.5 2007/04/09 15:37:11 tsi Exp $ */ /* * This utility allows you to generate from an ISO10646-1 encoded * BDF font other BDF fonts in any possible encoding. This way, you can @@ -519,7 +512,7 @@ int i; int j; int *chars = NULL; - bbx_t bbx; + bbx_t bbx = {0, 0, 0, 0}; char *fout = NULL; FILE *fout_fp; int k; @@ -631,10 +624,10 @@ spacing_index = ++nextheader; da_add_str(headers, spacing_index, NULL); } else if ((nextc = startswith(l, "COMMENT")) != NULL) { - if (strncmp(nextc, "$XFree86: ", 5)==0) { + if (strncmp(nextc, "$XFree86: ", 10)==0) { char *header = NULL; char *id = NULL, *end = NULL; - id = zstrdup(nextc + 5); + id = zstrdup(nextc + 10); end = strrchr(id, '$'); if (end) *end = '\0'; zstrcpy(&header, "COMMENT Derived from "); Index: xc/include/DPS/dpsconfig.h diff -u xc/include/DPS/dpsconfig.h:1.9 xc/include/DPS/dpsconfig.h:1.10 --- xc/include/DPS/dpsconfig.h:1.9 Tue Jun 28 21:14:09 2005 +++ xc/include/DPS/dpsconfig.h Mon Dec 25 10:27:41 2006 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsconfig.h,v 1.9 2005/06/29 01:14:09 dawes Exp $ */ +/* $XFree86: xc/include/DPS/dpsconfig.h,v 1.10 2006/12/25 15:27:41 tsi Exp $ */ #ifndef DPSCONFIG_H #define DPSCONFIG_H @@ -161,7 +161,7 @@ #define SWAPBITS 0 #endif /* _IBMR2 */ -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__) #define SWAPBITS 1 #endif /* __i386__ */ Index: xc/include/extensions/XKBsrv.h diff -u xc/include/extensions/XKBsrv.h:3.24 xc/include/extensions/XKBsrv.h:3.25 --- xc/include/extensions/XKBsrv.h:3.24 Mon Jan 9 09:58:17 2006 +++ xc/include/extensions/XKBsrv.h Sat Sep 2 12:44:03 2006 @@ -23,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.24 2006/01/09 14:58:17 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.25 2006/09/02 16:44:03 dawes Exp $ */ #ifndef _XKBSRV_H_ #define _XKBSRV_H_ @@ -242,7 +242,7 @@ extern int XkbEventBase; extern int XkbKeyboardErrorCode; extern int XkbDisableLockActions; -extern char * XkbBaseDirectory; +extern const char * XkbBaseDirectory; extern char * XkbInitialMap; extern int _XkbClientMajor; extern int _XkbClientMinor; @@ -318,7 +318,7 @@ extern int XkbProcessArguments( int /* argc */, - char ** /* argv */, + const char ** /* argv */, int /* i */ ); @@ -1114,9 +1114,9 @@ ); extern FILE *XkbDDXOpenConfigFile( - char * /* mapName */, - char * /* fileNameRtrn */, - int /* fileNameRtrnLen */ + const char * /* mapName */, + char * /* fileNameRtrn */, + int /* fileNameRtrnLen */ ); extern Bool XkbDDXApplyConfig( Index: xc/include/extensions/XRes.h diff -u xc/include/extensions/XRes.h:1.4 xc/include/extensions/XRes.h:1.5 --- xc/include/extensions/XRes.h:1.4 Thu Dec 18 00:48:06 2003 +++ xc/include/extensions/XRes.h Tue Nov 7 15:03:29 2006 @@ -1,11 +1,12 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XRes.h,v 1.5 2006/11/07 20:03:29 tsi Exp $ */ #ifndef _XRES_H #define _XRES_H +#include #include typedef struct { Index: xc/include/extensions/security.h diff -u xc/include/extensions/security.h:1.5 xc/include/extensions/security.h:1.6 --- xc/include/extensions/security.h:1.5 Mon Jan 9 09:58:19 2006 +++ xc/include/extensions/security.h Sat Sep 2 12:44:03 2006 @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/security.h,v 1.5 2006/01/09 14:58:19 dawes Exp $ */ +/* $XFree86: xc/include/extensions/security.h,v 1.6 2006/09/02 16:44:03 dawes Exp $ */ #ifndef _SECURITY_H #define _SECURITY_H @@ -160,7 +160,7 @@ extern Bool SecuritySameLevel(ClientPtr client, XID authId); #endif -extern int XSecurityOptions(int argc, char **argv, int i); +extern int XSecurityOptions(int argc, const char **argv, int i); /* Give this value or higher to the -audit option to get security messages */ #define SECURITY_AUDIT_LEVEL 4 Index: xc/include/fonts/font.h diff -u xc/include/fonts/font.h:3.7 xc/include/fonts/font.h:3.8 --- xc/include/fonts/font.h:3.7 Mon Jan 9 09:58:20 2006 +++ xc/include/fonts/font.h Sat Sep 2 12:44:03 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/fonts/font.h,v 3.7 2006/01/09 14:58:20 dawes Exp $ */ +/* $XFree86: xc/include/fonts/font.h,v 3.8 2006/09/02 16:44:03 dawes Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -141,7 +141,7 @@ extern void CacheFontPattern ( FontPatternCachePtr /* cache */, - char * /* pattern */, + const char * /* pattern */, int /* patlen */, FontPtr /* pFont */ ); @@ -151,7 +151,7 @@ extern FontPtr FindCachedFontPattern ( FontPatternCachePtr /* cache */, - char * /* pattern */, + const char * /* pattern */, int /* patlen */ ); Index: xc/lib/FS/FSlibInt.c diff -u xc/lib/FS/FSlibInt.c:3.12 xc/lib/FS/FSlibInt.c:3.14 --- xc/lib/FS/FSlibInt.c:3.12 Tue Mar 22 22:11:23 2005 +++ xc/lib/FS/FSlibInt.c Mon Jun 19 12:56:49 2006 @@ -22,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.12 2005/03/23 03:11:23 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.14 2006/06/19 16:56:49 tsi Exp $ */ /* @@ -49,7 +49,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.12 2005/03/23 03:11:23 dawes Exp $ */ /* * FSlibInt.c - Internal support routines for the C subroutine @@ -1237,13 +1236,21 @@ */ struct utsname name; - uname(&name); - len = strlen(name.nodename); - if (len >= maxlen) - len = maxlen - 1; - strncpy(buf, name.nodename, len); + if ((maxlen <= 0) || (buf == NULL)) + return 0; + + len = 0; + if (uname(&name) >= 0) { + len = strlen(name.nodename); + if (len >= maxlen) + len = maxlen - 1; + strncpy(buf, name.nodename, len); + } buf[len] = '\0'; #else + if ((maxlen <= 0) || (buf == NULL)) + return 0; + buf[0] = '\0'; (void) gethostname(buf, maxlen); buf[maxlen - 1] = '\0'; Index: xc/lib/GL/apple/Imakefile diff -u xc/lib/GL/apple/Imakefile:1.9 xc/lib/GL/apple/Imakefile:1.10 --- xc/lib/GL/apple/Imakefile:1.9 Fri Oct 14 11:15:55 2005 +++ xc/lib/GL/apple/Imakefile Sat Dec 2 19:42:10 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/apple/Imakefile,v 1.9 2005/10/14 15:15:55 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/apple/Imakefile,v 1.10 2006/12/03 00:42:10 tsi Exp $ #include @@ -29,8 +29,8 @@ DEFINES = $(ALLOC_DEFINES) GlxDefines $(GLX_DEFS) -DXP_NO_X_HEADERS=1 \ -DOSVERSION=OSMajorVersion*100+OSMinorVersion - INCLUDES = -I$(XF86OSSRC) \ - -I$(DRMINCLUDESDIR) -I$(DRI_INCS) -F$(AS)/Frameworks + INCLUDES = -I$(XF86OSSRC) -I$(DRMINCLUDESDIR) $(DRI_INCS) \ + -F$(AS)/Frameworks SRCS = appledri.c $(DRI_SRCS) OBJS = appledri.o $(DRI_OBJS) Index: xc/lib/GL/apple/dri_dispatch.c diff -u xc/lib/GL/apple/dri_dispatch.c:1.7 xc/lib/GL/apple/dri_dispatch.c:1.8 --- xc/lib/GL/apple/dri_dispatch.c:1.7 Mon Jan 9 09:58:21 2006 +++ xc/lib/GL/apple/dri_dispatch.c Mon Apr 2 20:21:06 2007 @@ -27,7 +27,7 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/lib/GL/apple/dri_dispatch.c,v 1.7 2006/01/09 14:58:21 dawes Exp $ */ +/* $XFree86: xc/lib/GL/apple/dri_dispatch.c,v 1.8 2007/04/03 00:21:06 tsi Exp $ */ #include #include @@ -123,7 +123,7 @@ #include "dri_dispatch.h" -__private_extern__ const CGLContextObj +__private_extern__ CGLContextObj XAppleDRIGetIndirectContext (void) { static CGLContextObj ctx; Index: xc/lib/GL/apple/dri_dispatch.defs diff -u xc/lib/GL/apple/dri_dispatch.defs:1.8 xc/lib/GL/apple/dri_dispatch.defs:1.9 --- xc/lib/GL/apple/dri_dispatch.defs:1.8 Mon Jan 9 09:58:21 2006 +++ xc/lib/GL/apple/dri_dispatch.defs Mon Apr 2 20:21:06 2007 @@ -2,7 +2,7 @@ ;; dri_dispatch.defs -;; $XFree86: xc/lib/GL/apple/dri_dispatch.defs,v 1.8 2006/01/09 14:58:21 dawes Exp $ +;; $XFree86: xc/lib/GL/apple/dri_dispatch.defs,v 1.9 2007/04/03 00:21:06 tsi Exp $ ;; Copyright (c) 2002 Apple Computer, Inc. All rights reserved. ;; Copyright (c) 2003-2004 Torrey T. Lyons. All rights reserved. @@ -818,8 +818,6 @@ (void MinmaxEXT -1 "GLenum target, GLenum internalformat, GLboolean sink" Minmax) (void PointParameterfSGIS -1 "GLenum pname, GLfloat param" PointParameterf) (void PointParameterfvSGIS -1 "GLenum pname, const GLfloat * params" PointParameterfv) -(void PointParameteri -1 "GLenum pname, GLint params" PointParameteriNV) -(void PointParameteriv -1 "GLenum pname, const GLint * params" PointParameterivNV) (void PrioritizeTexturesEXT -1 "GLsizei n, const GLenum * textures, const GLclampf * priorities" PrioritizeTextures) (void ResetHistogramEXT -1 "GLenum target" ResetHistogram) (void ResetMinmaxEXT -1 "GLenum target" ResetMinmax) Index: xc/lib/GL/apple/dri_dispatch.h diff -u xc/lib/GL/apple/dri_dispatch.h:1.8 xc/lib/GL/apple/dri_dispatch.h:1.9 --- xc/lib/GL/apple/dri_dispatch.h:1.8 Mon Jan 9 09:58:21 2006 +++ xc/lib/GL/apple/dri_dispatch.h Mon Apr 2 20:21:06 2007 @@ -1,5 +1,5 @@ /* dri_dispatch.h -- built automatically, DO NOT EDIT - $XFree86: xc/lib/GL/apple/dri_dispatch.h,v 1.8 2006/01/09 14:58:21 dawes Exp $ */ + $XFree86: xc/lib/GL/apple/dri_dispatch.h,v 1.9 2007/04/03 00:21:06 tsi Exp $ */ /* Actually, this file has been edited to add necessary dependencies on the version of Mac OS X. Someday the @@ -3178,14 +3178,6 @@ (GLenum pname, const GLfloat * params), (pname, params)) -DEFUN_ALIAS_VOID (PointParameteri, PointParameteriNV, - (GLenum pname, GLint params), - (pname, params)) - -DEFUN_ALIAS_VOID (PointParameteriv, PointParameterivNV, - (GLenum pname, const GLint * params), - (pname, params)) - DEFUN_ALIAS_VOID (PrioritizeTexturesEXT, PrioritizeTextures, (GLsizei n, const GLenum * textures, const GLclampf * priorities), (n, textures, priorities)) Index: xc/lib/GL/apple/dri_driver.c diff -u xc/lib/GL/apple/dri_driver.c:1.5 xc/lib/GL/apple/dri_driver.c:1.6 --- xc/lib/GL/apple/dri_driver.c:1.5 Fri Oct 14 11:15:55 2005 +++ xc/lib/GL/apple/dri_driver.c Mon Apr 2 20:21:06 2007 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/apple/dri_driver.c,v 1.5 2005/10/14 15:15:55 tsi Exp $ */ +/* $XFree86: xc/lib/GL/apple/dri_driver.c,v 1.6 2007/04/03 00:21:06 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -60,9 +60,15 @@ #ifdef GLX_DIRECT_RENDERING +/* These are first to ensure that Apple's GL headers are used. */ +#include +#include + #include #include #include + +#define GLAPIENTRYP * #include #include "glxclient.h" #include "appledri.h" @@ -112,7 +118,7 @@ static void unwrap_context(__DRIcontextPrivate *pcp); static void wrap_context(__DRIcontextPrivate *pcp); -extern const CGLContextObj XAppleDRIGetIndirectContext(void); +extern CGLContextObj XAppleDRIGetIndirectContext(void); /*****************************************************************/ Index: xc/lib/GL/apple/dri_glx.c diff -u xc/lib/GL/apple/dri_glx.c:1.4 xc/lib/GL/apple/dri_glx.c:1.5 --- xc/lib/GL/apple/dri_glx.c:1.4 Fri Oct 14 11:15:55 2005 +++ xc/lib/GL/apple/dri_glx.c Mon Apr 2 20:21:06 2007 @@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/lib/GL/apple/dri_glx.c,v 1.4 2005/10/14 15:15:55 tsi Exp $ */ +/* $XFree86: xc/lib/GL/apple/dri_glx.c,v 1.5 2007/04/03 00:21:06 tsi Exp $ */ /* * Authors: @@ -50,11 +50,10 @@ /* Apple OpenGL "driver" information. */ -static const char *__driDriverName = "apple"; -static const char __driConfigOptions[] = ""; -static const int __driDriverMajor = 1; -static const int __driDriverMinor = 0; -static const int __driDriverPatch = 0; +static const char *__driAppleDriverName = "apple"; +static const int __driAppleDriverMajor = 1; +static const int __driAppleDriverMinor = 0; +static const int __driAppleDriverPatch = 0; /* @@ -107,11 +106,11 @@ return False; } - *driverName = (char *) __driDriverName; + *driverName = (char *) __driAppleDriverName; InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n", - __driDriverMajor, __driDriverMinor, __driDriverPatch, - *driverName, scrNum); + __driAppleDriverMajor, __driAppleDriverMinor, + __driAppleDriverPatch, *driverName, scrNum); return True; } @@ -153,11 +152,9 @@ * Note: In a standard GLX imlementation the driver remains opened after * this function returns. */ -const char *glXGetDriverConfig (const char *driverName) { - if (strcmp(driverName, __driDriverName) == 0) - return __driConfigOptions; - else - return NULL; +const char *glXGetDriverConfig(const char *driverName) { + /* the apple stub driver does not support configuration */ + return NULL; } Index: xc/lib/GL/glx/Imakefile diff -u xc/lib/GL/glx/Imakefile:1.35 xc/lib/GL/glx/Imakefile:1.36 --- xc/lib/GL/glx/Imakefile:1.35 Sun Feb 19 19:14:35 2006 +++ xc/lib/GL/glx/Imakefile Mon Jul 17 23:05:29 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.35 2006/02/20 00:14:35 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.36 2006/07/18 03:05:29 tsi Exp $ XCOMM The contents of this file are subject to the GLX Public License Version 1.0 XCOMM (the "License"). You may not use this file except in compliance with the XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc., @@ -216,14 +216,6 @@ LibraryObjectRule() -#if BuildXF86DRI && defined(i386Architecture) && MesaUseX86Asm -ObjectFromAsmSource(glapi_x86, NullParameter) -#endif -#if BuildXF86DRI && defined(SparcArchitecture) -STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) -ObjectFromAsmSource(glapi_sparc, NullParameter) -#endif - SubdirLibraryRule($(OBJS)) NormalLintTarget($(SRCS)) Index: xc/lib/GL/glx/glxcmds.c diff -u xc/lib/GL/glx/glxcmds.c:1.38 xc/lib/GL/glx/glxcmds.c:1.39 --- xc/lib/GL/glx/glxcmds.c:1.38 Fri Oct 14 11:15:55 2005 +++ xc/lib/GL/glx/glxcmds.c Mon Apr 9 11:37:11 2007 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.38 2005/10/14 15:15:55 tsi Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.39 2007/04/09 15:37:11 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -942,7 +942,7 @@ int *value_return) { __GLXdisplayPrivate *priv; - __GLXscreenConfigs *psc; + __GLXscreenConfigs *psc = NULL; int status; status = GetGLXPrivScreenConfig( dpy, vis->screen, & priv, & psc ); @@ -1692,6 +1692,7 @@ __GLcontextModes ** config = NULL; int i; + *nelements = 0; if ( (priv->screenConfigs != NULL) && (screen >= 0) && (screen <= ScreenCount(dpy)) && (priv->screenConfigs[screen].configs != NULL) @@ -2160,7 +2161,7 @@ GLXFBConfigSGIX GLX_PREFIX(glXGetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis) { __GLXdisplayPrivate *priv; - __GLXscreenConfigs *psc; + __GLXscreenConfigs *psc = NULL; if ( (GetGLXPrivScreenConfig( dpy, vis->screen, & priv, & psc ) != Success) && __glXExtensionBitIsEnabled( psc, SGIX_fbconfig_bit ) Index: xc/lib/GL/glx/glxext.c diff -u xc/lib/GL/glx/glxext.c:1.30 xc/lib/GL/glx/glxext.c:1.33 --- xc/lib/GL/glx/glxext.c:1.30 Fri Oct 14 11:15:55 2005 +++ xc/lib/GL/glx/glxext.c Thu Apr 19 10:08:02 2007 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/glxext.c,v 1.30 2005/10/14 15:15:55 tsi Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxext.c,v 1.33 2007/04/19 14:08:02 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are @@ -74,6 +74,10 @@ #endif #ifdef USE_SPARC_ASM +#if defined(__OpenBSD__) || defined(__NetBSD__) +#include +#endif + /* * This is where our dispatch table's bounds are. * And the static mesa_init is taken directly from @@ -655,6 +659,7 @@ #ifdef GLX_DIRECT_RENDERING +#ifndef GLX_USE_APPLEGL static unsigned filter_modes( __GLcontextModes ** server_modes, const __GLcontextModes * driver_modes ) @@ -708,7 +713,7 @@ return modes_count; } - +#endif /* !GLX_USE_APPLEGL */ /** @@ -1001,11 +1006,11 @@ if (!_XReply(dpy, (xReply*) &reply, 0, False)) { /* Something is busted. Punt. */ UnlockDisplay(dpy); + SyncHandle(); FreeScreenConfigs(priv); return GL_FALSE; } - UnlockDisplay(dpy); if (!reply.numVisuals) { /* This screen does not support GL rendering */ UnlockDisplay(dpy); @@ -1813,12 +1818,11 @@ } #endif -#ifdef USE_SPARC_ASM +#ifdef USE_SPARC_ASM /* * Used only when we are sparc, using sparc assembler. * */ - static void _glx_mesa_init_sparc_glapi_relocs(void) { @@ -1830,42 +1834,68 @@ disp_addr = (unsigned long) &_glapi_Dispatch; /* - * Verbatim from Mesa sparc.c. It's needed because there doesn't - * seem to be a better way to do this: - * - * UNCONDITIONAL_JUMP ( (*_glapi_Dispatch) + entry_offset ) - * - * This code is patching in the ADDRESS of the pointer to the - * dispatch table. Hence, it must be called exactly once, because - * that address is not going to change. - * - * What it points to can change, but Mesa (and hence, we) assume - * that there is only one pointer. - * + * Verbatim from Mesa sparc.c. It's needed because there doesn't seem + * to be a better way to do this: + * + * UNCONDITIONAL_JUMP ( (*_glapi_Dispatch) + entry_offset ) + * + * This code is patching in the ADDRESS of the pointer to the dispatch + * table. Hence, it must be called exactly once, because that address + * is not going to change. + * + * What it points to can change, but Mesa (and hence, we) assume + * that there is only one pointer. */ + +#if defined(__OpenBSD__) || defined(__NetBSD__) + { /* Re-protect to allow instruction execution */ + unsigned long mask = getpagesize() - 1; + unsigned long base = (unsigned long)insn_ptr & ~mask; + unsigned long size = (((unsigned long)end_ptr + mask) & + ~mask) - base; + + mprotect((void *)base, size, + PROT_READ | PROT_WRITE | PROT_EXEC); + } +#endif + while (insn_ptr < end_ptr) { -#if ( defined(__sparc_v9__) && ( !defined(__linux__) || defined(__linux_64__) ) ) -/* - This code patches for 64-bit addresses. This had better - not happen for Sparc/Linux, no matter what architecture we - are building for. So, don't do this. - The 'defined(__linux_64__)' is used here as a placeholder for - when we do do 64-bit usermode on sparc linux. - */ +#define all_ones ((unsigned long)(-1L)) + +#if defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_64__)) + + /* + * This code patches for 64-bit addresses. This had better not + * happen for Sparc/Linux, no matter what architecture we are + * building for. So, don't do this. + * + * The 'defined(__linux_64__)' is used here as a placeholder + * for when we do do 64-bit usermode on sparc linux. + */ + insn_ptr[0] &= ~(all_ones >> (32 + 10)); insn_ptr[0] |= (disp_addr >> (32 + 10)); + insn_ptr[1] &= ~((all_ones & 0xffffffff) >> 10); insn_ptr[1] |= ((disp_addr & 0xffffffff) >> 10); __glapi_sparc_icache_flush(&insn_ptr[0]); + insn_ptr[2] &= ~((all_ones >> 32) & ((1 << 10) - 1)); insn_ptr[2] |= ((disp_addr >> 32) & ((1 << 10) - 1)); + insn_ptr[3] &= ~(all_ones & ((1 << 10) - 1)); insn_ptr[3] |= (disp_addr & ((1 << 10) - 1)); __glapi_sparc_icache_flush(&insn_ptr[2]); insn_ptr += 11; + #else + + insn_ptr[0] &= ~(all_ones >> 10); insn_ptr[0] |= (disp_addr >> 10); + insn_ptr[1] &= ~(all_ones & ((1 << 10) - 1)); insn_ptr[1] |= (disp_addr & ((1 << 10) - 1)); __glapi_sparc_icache_flush(&insn_ptr[0]); insn_ptr += 5; + #endif + } } #endif /* sparc ASM in use */ Index: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/ffb/Imakefile:1.6 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile:1.7 --- xc/lib/GL/mesa/drivers/dri/ffb/Imakefile:1.6 Fri Oct 14 11:15:56 2005 +++ xc/lib/GL/mesa/drivers/dri/ffb/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile,v 1.6 2005/10/14 15:15:56 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile,v 1.7 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -94,7 +94,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(FFBOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -116,4 +117,3 @@ #endif DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/gamma/Imakefile:1.8 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile:1.9 --- xc/lib/GL/mesa/drivers/dri/gamma/Imakefile:1.8 Fri Oct 14 11:15:56 2005 +++ xc/lib/GL/mesa/drivers/dri/gamma/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile,v 1.8 2005/10/14 15:15:56 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile,v 1.9 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -95,7 +95,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(GAMMAOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -117,4 +118,3 @@ #endif DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/i810/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/i810/Imakefile:1.8 xc/lib/GL/mesa/drivers/dri/i810/Imakefile:1.9 --- xc/lib/GL/mesa/drivers/dri/i810/Imakefile:1.8 Fri Oct 14 11:15:56 2005 +++ xc/lib/GL/mesa/drivers/dri/i810/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i810/Imakefile,v 1.8 2005/10/14 15:15:56 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i810/Imakefile,v 1.9 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -95,7 +95,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(I810OBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -117,4 +118,3 @@ #endif DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/i915/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/i915/Imakefile:1.5 xc/lib/GL/mesa/drivers/dri/i915/Imakefile:1.6 --- xc/lib/GL/mesa/drivers/dri/i915/Imakefile:1.5 Fri Oct 14 11:15:56 2005 +++ xc/lib/GL/mesa/drivers/dri/i915/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i915/Imakefile,v 1.5 2005/10/14 15:15:56 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i915/Imakefile,v 1.6 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -100,7 +100,8 @@ OBJS = $(LOOBJS) $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(I915OBJS) $(HIOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB) +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -122,4 +123,3 @@ #endif DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/mga/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/mga/Imakefile:1.8 xc/lib/GL/mesa/drivers/dri/mga/Imakefile:1.9 --- xc/lib/GL/mesa/drivers/dri/mga/Imakefile:1.8 Fri Oct 14 11:15:56 2005 +++ xc/lib/GL/mesa/drivers/dri/mga/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/mga/Imakefile,v 1.8 2005/10/14 15:15:56 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/mga/Imakefile,v 1.9 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -96,7 +96,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(MGAOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -118,4 +119,3 @@ #endif DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/r128/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/r128/Imakefile:1.8 xc/lib/GL/mesa/drivers/dri/r128/Imakefile:1.9 --- xc/lib/GL/mesa/drivers/dri/r128/Imakefile:1.8 Fri Oct 14 11:15:57 2005 +++ xc/lib/GL/mesa/drivers/dri/r128/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r128/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r128/Imakefile,v 1.9 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -95,7 +95,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -117,4 +118,3 @@ #endif DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/r200/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/r200/Imakefile:1.8 xc/lib/GL/mesa/drivers/dri/r200/Imakefile:1.10 --- xc/lib/GL/mesa/drivers/dri/r200/Imakefile:1.8 Fri Oct 14 11:15:57 2005 +++ xc/lib/GL/mesa/drivers/dri/r200/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r200/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r200/Imakefile,v 1.10 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -94,7 +94,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(R200OBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -115,9 +116,4 @@ #endif #endif -#ifdef i386Architecture -ObjectFromAsmSource(r200_vtxtmp_x86, NullParameter) -#endif - DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/radeon/Imakefile:1.8 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile:1.10 --- xc/lib/GL/mesa/drivers/dri/radeon/Imakefile:1.8 Fri Oct 14 11:15:57 2005 +++ xc/lib/GL/mesa/drivers/dri/radeon/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile,v 1.10 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -94,7 +94,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -115,9 +116,4 @@ #endif #endif -#ifdef i386Architecture -ObjectFromAsmSource(radeon_vtxtmp_x86, NullParameter) -#endif - DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/sis/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/sis/Imakefile:1.8 xc/lib/GL/mesa/drivers/dri/sis/Imakefile:1.9 --- xc/lib/GL/mesa/drivers/dri/sis/Imakefile:1.8 Fri Oct 14 11:15:57 2005 +++ xc/lib/GL/mesa/drivers/dri/sis/Imakefile Sun Jul 23 16:51:49 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/sis/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/sis/Imakefile,v 1.9 2006/07/23 20:51:49 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -98,7 +98,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(COMMONOBJS) $(SISOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -120,4 +121,3 @@ #endif DependTarget() - Index: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile:1.8 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile:1.9 --- xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile:1.8 Fri Oct 14 11:15:57 2005 +++ xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile Sun Jul 23 16:51:50 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile,v 1.9 2006/07/23 20:51:50 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -94,7 +94,8 @@ OBJS = $(DRMOBJS) $(COREMESAOBJS) \ $(MESA_ASM_OBJS) $(TDFXOBJS) -REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) ExpatLibrary +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) \ + $(XLIB) ExpatLibrary #include @@ -116,4 +117,3 @@ #endif DependTarget() - Index: xc/lib/GL/mesa/drivers/osmesa/Imakefile diff -u xc/lib/GL/mesa/drivers/osmesa/Imakefile:1.10 xc/lib/GL/mesa/drivers/osmesa/Imakefile:1.11 --- xc/lib/GL/mesa/drivers/osmesa/Imakefile:1.10 Fri Oct 14 11:15:57 2005 +++ xc/lib/GL/mesa/drivers/osmesa/Imakefile Sun Jul 23 16:51:50 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/osmesa/Imakefile,v 1.10 2005/10/14 15:15:57 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/osmesa/Imakefile,v 1.11 2006/07/23 20:51:50 tsi Exp $ /* * Copyright (c) 2000-2005 by The XFree86 Project, Inc. @@ -113,7 +113,7 @@ #ifdef SharedOSMesaReqs REQUIREDLIBS = SharedOSMesaReqs #elif !BuildXF86DRI || !GlxUseBuiltInDRIDriver - REQUIREDLIBS = $(LDPRELIB) $(GLXLIB) + REQUIREDLIBS = $(LDPRELIB) $(GLXLIB) $(XXF86VMLIB) $(XLIB) #endif #include Index: xc/lib/GL/mesa/sparc/Imakefile diff -u xc/lib/GL/mesa/sparc/Imakefile:1.4 xc/lib/GL/mesa/sparc/Imakefile:1.5 --- xc/lib/GL/mesa/sparc/Imakefile:1.4 Fri Oct 14 11:15:58 2005 +++ xc/lib/GL/mesa/sparc/Imakefile Mon Jul 17 23:05:29 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/sparc/Imakefile,v 1.4 2005/10/14 15:15:58 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/sparc/Imakefile,v 1.5 2006/07/18 03:05:29 tsi Exp $ /* * Need both shared and unshared Mesa objects in the following cases: @@ -52,10 +52,4 @@ AllTarget($(OBJS)) NormalLintTarget($(SRCS)) -#if 0 -ObjectFromAsmSource(xform, NullParameter) -ObjectFromAsmSource(clip, NullParameter) -ObjectFromAsmSource(norm, NullParameter) -#endif - DependTarget() Index: xc/lib/GL/mesa/x86/Imakefile diff -u xc/lib/GL/mesa/x86/Imakefile:1.3 xc/lib/GL/mesa/x86/Imakefile:1.4 --- xc/lib/GL/mesa/x86/Imakefile:1.3 Fri Oct 14 11:15:58 2005 +++ xc/lib/GL/mesa/x86/Imakefile Mon Jul 17 23:05:29 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/x86/Imakefile,v 1.3 2005/10/14 15:15:58 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/x86/Imakefile,v 1.4 2006/07/18 03:05:29 tsi Exp $ /* * Need both shared and unshared Mesa objects in the following cases: @@ -53,37 +53,6 @@ AllTarget($(OBJS)) NormalLintTarget($(SRCS)) -#if 0 /* Is this needed anymore? */ - -ObjectFromAsmSource(common_x86_asm, NullParameter) - -ObjectFromAsmSource(x86_cliptest, NullParameter) -ObjectFromAsmSource(x86_xform2, NullParameter) -ObjectFromAsmSource(x86_xform3, NullParameter) -ObjectFromAsmSource(x86_xform4, NullParameter) - -#if MesaUseMMX -ObjectFromAsmSource(mmx_blend, NullParameter) -#endif - -#if MesaUse3DNow -ObjectFromAsmSource(3dnow_normal, NullParameter) -ObjectFromAsmSource(3dnow_xform1, NullParameter) -ObjectFromAsmSource(3dnow_xform2, NullParameter) -ObjectFromAsmSource(3dnow_xform3, NullParameter) -ObjectFromAsmSource(3dnow_xform4, NullParameter) -#endif - -#if MesaUseSSE -ObjectFromAsmSource(sse_normal, NullParameter) -ObjectFromAsmSource(sse_xform1, NullParameter) -ObjectFromAsmSource(sse_xform2, NullParameter) -ObjectFromAsmSource(sse_xform3, NullParameter) -ObjectFromAsmSource(sse_xform4, NullParameter) -#endif - -#endif - LinkSourceFile(gen_matypes.c, $(MESASRCDIR)/src/mesa/x86) MATYPES = ./gen_matypes Index: xc/lib/SM/sm_genid.c diff -u xc/lib/SM/sm_genid.c:3.19 xc/lib/SM/sm_genid.c:3.20 --- xc/lib/SM/sm_genid.c:3.19 Tue Mar 22 22:11:25 2005 +++ xc/lib/SM/sm_genid.c Tue Jun 27 22:31:46 2006 @@ -24,7 +24,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_genid.c,v 3.19 2005/03/23 03:11:25 dawes Exp $ */ +/* $XFree86: xc/lib/SM/sm_genid.c,v 3.20 2006/06/28 02:31:46 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -174,8 +174,12 @@ { ptr2 = strchr (ptr1, '.'); len = ptr2 - ptr1; - if (!ptr2 || len > 3) + if (!ptr2 || len > 3) { +#if defined(IPv6) && defined(AF_INET6) + freeaddrinfo(first_ai); +#endif return (NULL); + } strncpy (temp, ptr1, len); temp[len] = '\0'; decimal[i] = atoi (temp); Index: xc/lib/X11/ImUtil.c diff -u xc/lib/X11/ImUtil.c:3.14 xc/lib/X11/ImUtil.c:3.15 --- xc/lib/X11/ImUtil.c:3.14 Mon Jan 9 09:58:29 2006 +++ xc/lib/X11/ImUtil.c Thu Apr 5 12:08:58 2007 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ImUtil.c,v 3.14 2006/01/09 14:58:29 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ImUtil.c,v 3.15 2007/04/05 16:08:58 tsi Exp $ */ #include #include @@ -323,12 +323,13 @@ { register XImage *image; int bits_per_pixel = 1; + int min_bytes_per_line; if (depth == 0 || depth > 32 || (format != XYBitmap && format != XYPixmap && format != ZPixmap) || (format == XYBitmap && depth != 1) || (xpad != 8 && xpad != 16 && xpad != 32) || - offset < 0 || image_bytes_per_line < 0) + offset < 0) return (XImage *) NULL; if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL) return (XImage *) NULL; @@ -359,16 +360,21 @@ /* * compute per line accelerator. */ - if (image_bytes_per_line == 0) { if (format == ZPixmap) - image->bytes_per_line = + min_bytes_per_line = ROUNDUP((bits_per_pixel * width), image->bitmap_pad); else - image->bytes_per_line = + min_bytes_per_line = ROUNDUP((width + offset), image->bitmap_pad); } - else image->bytes_per_line = image_bytes_per_line; + if (image_bytes_per_line == 0) { + image->bytes_per_line = min_bytes_per_line; + } else if (image_bytes_per_line < min_bytes_per_line) { + return 0; + } else { + image->bytes_per_line = image_bytes_per_line; + } image->bits_per_pixel = bits_per_pixel; image->obdata = NULL; @@ -380,7 +386,11 @@ Status XInitImage (image) XImage *image; { + int min_bytes_per_line; + if (image->depth == 0 || image->depth > 32 || + image->bits_per_pixel > 32 || image->bitmap_unit > 32 || + image->bits_per_pixel < 0 || image->bitmap_unit < 0 || (image->format != XYBitmap && image->format != XYPixmap && image->format != ZPixmap) || @@ -388,21 +398,24 @@ (image->bitmap_pad != 8 && image->bitmap_pad != 16 && image->bitmap_pad != 32) || - image->xoffset < 0 || image->bytes_per_line < 0) + image->xoffset < 0) return 0; /* * compute per line accelerator. */ - if (image->bytes_per_line == 0) - { if (image->format == ZPixmap) - image->bytes_per_line = + min_bytes_per_line = ROUNDUP((image->bits_per_pixel * image->width), image->bitmap_pad); else - image->bytes_per_line = + min_bytes_per_line = ROUNDUP((image->width + image->xoffset), image->bitmap_pad); + + if (image->bytes_per_line == 0) { + image->bytes_per_line = min_bytes_per_line; + } else if (image->bytes_per_line < min_bytes_per_line) { + return 0; } _XInitImageFuncPtrs (image); Index: xc/lib/X11/SetHints.c diff -u xc/lib/X11/SetHints.c:1.6 xc/lib/X11/SetHints.c:1.7 --- xc/lib/X11/SetHints.c:1.6 Mon Jan 9 09:58:34 2006 +++ xc/lib/X11/SetHints.c Mon Apr 9 11:37:11 2007 @@ -44,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/SetHints.c,v 1.6 2006/01/09 14:58:34 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetHints.c,v 1.7 2007/04/09 15:37:11 tsi Exp $ */ #include #include @@ -228,7 +228,7 @@ XSizeHints *hints) /* size hints for window in its normal state */ { XWMHints phints; - phints.flags = 0; + (void) memset(&phints, 0, sizeof(phints)); if (name != NULL) XStoreName (dpy, w, name); Index: xc/lib/X11/XKBCvt.c diff -u xc/lib/X11/XKBCvt.c:3.36 xc/lib/X11/XKBCvt.c:3.37 --- xc/lib/X11/XKBCvt.c:3.36 Mon Jan 9 09:58:37 2006 +++ xc/lib/X11/XKBCvt.c Tue May 16 10:57:09 2006 @@ -25,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.36 2006/01/09 14:58:37 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.37 2006/05/16 14:57:09 tsi Exp $ */ #include #include @@ -270,7 +270,7 @@ #else char *cf = __XOS2RedirRoot(CHARSET_FILE); #endif - if ( (stat(cf,&sbuf)==0) && (sbuf.st_mode&S_IFREG) && + if ( (stat(cf,&sbuf)==0) && ((sbuf.st_mode&S_IFMT) == S_IFREG) && (file = fopen(cf,"r")) ) { tmp = _XkbAlloc(sbuf.st_size+1); if (tmp!=NULL) { Index: xc/lib/X11/XKBExtDev.c diff -u xc/lib/X11/XKBExtDev.c:3.6 xc/lib/X11/XKBExtDev.c:3.7 --- xc/lib/X11/XKBExtDev.c:3.6 Mon Jan 9 09:58:37 2006 +++ xc/lib/X11/XKBExtDev.c Mon Apr 9 11:37:11 2007 @@ -23,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.6 2006/01/09 14:58:37 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.7 2007/04/09 15:37:11 tsi Exp $ */ #include #define NEED_REPLIES @@ -794,6 +794,7 @@ changes.leds.led_id= XkbXINone; changes.leds.defined= 0; size= nLeds= 0; + _InitLedStuff(&lstuff,changes.changed,devi); if (_XkbSetDeviceInfoSize(devi,&changes,NULL,&size,&nLeds)!=Success) return False; LockDisplay(dpy); @@ -815,5 +816,6 @@ } UnlockDisplay(dpy); SyncHandle(); + _FreeLedStuff(&lstuff); return ok; } Index: xc/lib/X11/XKBMisc.c diff -u xc/lib/X11/XKBMisc.c:3.7 xc/lib/X11/XKBMisc.c:3.8 --- xc/lib/X11/XKBMisc.c:3.7 Fri Oct 14 11:15:59 2005 +++ xc/lib/X11/XKBMisc.c Mon Apr 9 11:37:11 2007 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.7 2005/10/14 15:15:59 tsi Exp $ */ +/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.8 2007/04/09 15:37:11 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -776,12 +776,11 @@ register int i,bit; register unsigned mask; + *mask_rtrn = 0; if (xkb==NULL) return False; - if (virtual_mask==0) { - *mask_rtrn= 0; + if (virtual_mask==0) return True; - } if (xkb->server==NULL) return False; for (i=mask=0,bit=1;i #if defined(hpux) @@ -55,17 +55,13 @@ #include "XlcPublic.h" #include "XlcPubI.h" -#if defined(_LP64) && defined(__sparcv9) -# define _MACH64_NAME "sparcv9" +#if defined(_LP64) && defined(__sparcv9) && defined(sun) +# define _MACH64_NAME "sparcv9" #else -# undef _MACH64_NAME -#endif /* defined(_LP64) && defined(__sparcv9) */ - -#ifdef _MACH64_NAME -# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1) +# undef _MACH64_NAME #endif -#define XI18N_DLREL 2 +#define XI18N_DLREL 2 #define iscomment(ch) ((ch) == '\0' || (ch) == '#') @@ -128,7 +124,7 @@ { char *result; - if ((result = malloc(strlen(symbol) + 2)) == NULL) + if ((result = malloc(strlen(symbol) + 2)) == NULL) return NULL; result[0] = '_'; strcpy(result + 1, symbol); @@ -137,18 +133,18 @@ #ifndef hpux static void * -try_both_dlsym (void *handle, char *name) +try_both_dlsym(void *handle, char *name) { void *ret; - ret = dlsym (handle, name); + ret = dlsym(handle, name); if (!ret) { - name = strdup_with_underscore (name); + name = strdup_with_underscore(name); if (name) { - ret = dlsym (handle, name); - free (name); + ret = dlsym(handle, name); + free(name); } } return ret; @@ -198,7 +194,7 @@ if (!xi18n_objects_list) return; } n = parse_line(p, args, 6); - + if (n == 3 || n == 5) { if (!strcmp(args[0], "XLC")){ xi18n_objects_list[lc_count].type = XLC_OBJECT; @@ -235,12 +231,12 @@ /* * reject this for possible security issue */ - if (strstr (dl_name, "../")) + if (strstr(dl_name, "../")) return NULL; -#if defined (_LP64) && defined (_MACH64_NAME) +#if defined(_MACH64_NAME) len = (lc_dir ? strlen(lc_dir) : 0 ) + - (dl_name ? strlen(dl_name) : 0) + _MACH64_NAME_LEN + 10; + (dl_name ? strlen(dl_name) : 0) + sizeof(_MACH64_NAME) + 9; path = Xmalloc(len + 1); if (strchr(dl_name, '/') != NULL) { @@ -269,7 +265,7 @@ #else len = (lc_dir ? strlen(lc_dir) : 0 ) + (dl_name ? strlen(dl_name) : 0) + 10; -#if defined POSTLOCALELIBDIR +#if defined(POSTLOCALELIBDIR) len += (strlen(POSTLOCALELIBDIR) + 1); #endif path = Xmalloc(len + 1); @@ -279,14 +275,14 @@ slash_p = strrchr(lc_dir, '/'); *slash_p = '\0'; strcpy(path, lc_dir); strcat(path, "/"); -#if defined POSTLOCALELIBDIR +#if defined(POSTLOCALELIBDIR) strcat(path, POSTLOCALELIBDIR); strcat(path, "/"); #endif strcat(path, dl_name); strcat(path, ".so.2"); *slash_p = '/'; } else { strcpy(path, lc_dir); strcat(path, "/"); -#if defined POSTLOCALELIBDIR +#if defined(POSTLOCALELIBDIR) strcat(path, POSTLOCALELIBDIR); strcat(path, "/"); #endif strcat(path, dl_name); strcat(path, ".so.2"); @@ -308,7 +304,7 @@ char *lc_dir) { char *path; - + if (object->refcount == 0) { path = __lc_path(object->dl_name, lc_dir); if (!path) @@ -340,21 +336,21 @@ #endif if (symbol == NULL) - return NULL; + return NULL; #if defined(hpux) getsyms_cnt = shl_getsymbols(object->dl_module, TYPE_PROCEDURE, EXPORT_SYMBOLS, malloc, &symbols); for(i=0; i 0) { - free(symbols); + free(symbols); } #else result = try_both_dlsym(object->dl_module, symbol); @@ -370,11 +366,11 @@ if (object->refcount == 0) { #if defined(hpux) - shl_unload(object->dl_module); + shl_unload(object->dl_module); #else - dlclose(object->dl_module); + dlclose(object->dl_module); #endif - object->dl_module = NULL; + object->dl_module = NULL; } } @@ -400,19 +396,19 @@ objects_list = xi18n_objects_list; count = lc_count; for (; count-- > 0; objects_list++) { - if (objects_list->type != XLC_OBJECT || + if (objects_list->type != XLC_OBJECT || strcmp(objects_list->locale_name, lc_name)) continue; - if (!open_object (objects_list, lc_dir)) + if (!open_object(objects_list, lc_dir)) continue; - lc_loader = (dynamicLoadProc)fetch_symbol (objects_list, objects_list->open); + lc_loader = (dynamicLoadProc)fetch_symbol(objects_list, objects_list->open); if (!lc_loader) continue; lcd = (*lc_loader)(lc_name); if (lcd != (XLCd)NULL) { break; } - - close_object (objects_list); + + close_object(objects_list); } return (XLCd)lcd; } @@ -440,17 +436,17 @@ if (objects_list->type != XIM_OBJECT || strcmp(objects_list->locale_name, lc_name)) continue; - if (!open_object (objects_list, lc_dir)) - continue; + if (!open_object(objects_list, lc_dir)) + continue; im_openIM = (dynamicOpenProcp)fetch_symbol(objects_list, objects_list->open); if (!im_openIM) continue; im = (*im_openIM)(lcd, display, rdb, res_name, res_class); if (im != (XIM)NULL) { - break; + break; } - - close_object (objects_list); + + close_object(objects_list); } return (XIM)im; } @@ -488,8 +484,8 @@ if (objects_list->type != XIM_OBJECT || strcmp(objects_list->locale_name, lc_name)) continue; - if (!open_object (objects_list, lc_dir)) - continue; + if (!open_object(objects_list, lc_dir)) + continue; im_registerIM = (dynamicRegisterCBProcp)fetch_symbol(objects_list, objects_list->im_register); if (!im_registerIM) continue; @@ -498,7 +494,7 @@ callback, client_data); if (ret_flag) break; - close_object (objects_list); + close_object(objects_list); } return (Bool)ret_flag; } @@ -536,7 +532,7 @@ strcmp(objects_list->locale_name, lc_name)) continue; if (!objects_list->refcount) /* Must already be opened */ - continue; + continue; im_unregisterIM = (dynamicUnregisterProcp)fetch_symbol(objects_list, objects_list->im_unregister); @@ -546,7 +542,7 @@ res_name, res_class, callback, client_data); if (ret_flag) { - close_object (objects_list); /* opened in RegisterIMInstantiateCallback */ + close_object(objects_list); /* opened in RegisterIMInstantiateCallback */ break; } } @@ -566,7 +562,7 @@ typedef XOM (*dynamicIOpenProcp)( - XLCd, Display *, XrmDatabase, _Xconst char *, _Xconst char *); + XLCd, Display *, XrmDatabase, _Xconst char *, _Xconst char *); static XOM _XDynamicOpenOM(XLCd lcd, Display *display, XrmDatabase rdb, @@ -591,14 +587,14 @@ for (; count-- > 0; objects_list++) { if (objects_list->type != XOM_OBJECT || strcmp(objects_list->locale_name, lc_name)) continue; - if (!open_object (objects_list, lc_dir)) - continue; - + if (!open_object(objects_list, lc_dir)) + continue; + om_openOM = (dynamicIOpenProcp)fetch_symbol(objects_list, objects_list->open); if (!om_openOM) continue; om = (*om_openOM)(lcd, display, rdb, res_name, res_class); if (om != (XOM)NULL) { - break; + break; } close_object(objects_list); } Index: xc/lib/X11/XlibInt.c diff -u xc/lib/X11/XlibInt.c:3.40 xc/lib/X11/XlibInt.c:3.41 --- xc/lib/X11/XlibInt.c:3.40 Mon Jan 9 09:58:39 2006 +++ xc/lib/X11/XlibInt.c Mon Jun 19 09:43:23 2006 @@ -25,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/XlibInt.c,v 3.40 2006/01/09 14:58:39 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlibInt.c,v 3.41 2006/06/19 13:43:23 tsi Exp $ */ /* * XlibInt.c - Internal support routines for the C subroutine @@ -3192,18 +3192,21 @@ if (maxlen <= 0 || buf == NULL) return 0; - uname (&name); - len = strlen (name.nodename); - if (len >= maxlen) len = maxlen - 1; - strncpy (buf, name.nodename, len); + len = 0; + if (uname(&name) >= 0) { + len = strlen(name.nodename); + if (len >= maxlen) + len = maxlen - 1; + strncpy(buf, name.nodename, len); + } buf[len] = '\0'; #else if (maxlen <= 0 || buf == NULL) return 0; buf[0] = '\0'; - (void) gethostname (buf, maxlen); - buf [maxlen - 1] = '\0'; + (void) gethostname(buf, maxlen); + buf[maxlen - 1] = '\0'; len = strlen(buf); #endif /* NEED_UTSNAME */ return len; Index: xc/lib/X11/Xrm.c diff -u xc/lib/X11/Xrm.c:3.25 xc/lib/X11/Xrm.c:3.28 --- xc/lib/X11/Xrm.c:3.25 Mon Jan 9 09:58:40 2006 +++ xc/lib/X11/Xrm.c Wed Dec 13 22:44:40 2006 @@ -1,15 +1,15 @@ /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard - All Rights Reserved + All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -47,7 +47,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/Xrm.c,v 3.25 2006/01/09 14:58:40 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xrm.c,v 3.28 2006/12/14 03:44:40 tsi Exp $ */ #include #include @@ -57,7 +57,7 @@ #ifdef XTHREADS #include "locking.h" #endif -#include "XrmI.h" +#include "XrmI.h" #include #include "Xresinternal.h" #include "Xresource.h" @@ -302,11 +302,11 @@ EOS,0,0,0,0,0,0,0, 0,SPACE,EOL,0,0, #if defined(WIN32) || defined(__UNIXOS2__) - EOL, /* treat CR the same as LF, just in case */ + EOL, /* treat CR the same as LF, just in case */ #else - 0, + 0, #endif - 0,0, + 0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, SPACE,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL, @@ -362,9 +362,9 @@ register XrmQuarkList quarks) /* RETURN */ { register XrmBits bits; - register Signature sig = 0; - register char ch, *tname; - register int i = 0; + register Signature sig = 0; + register char ch, *tname; + register int i = 0; if ((tname = (char *)name)) { tname--; @@ -396,10 +396,10 @@ register XrmQuarkList quarks) /* RETURN */ { register XrmBits bits; - register Signature sig = 0; - register char ch, *tname; - register XrmBinding binding; - register int i = 0; + register Signature sig = 0; + register char ch, *tname; + register XrmBinding binding; + register int i = 0; if ((tname = (char *)name)) { tname--; @@ -434,7 +434,7 @@ #ifdef DEBUG -static void PrintQuarkList( +void PrintQuarkList( XrmQuarkList quarks, FILE *stream) { @@ -1065,20 +1065,20 @@ */ /* - * This function is highly optimized to inline as much as possible. - * Be very careful with modifications, or simplifications, as they + * This function is highly optimized to inline as much as possible. + * Be very careful with modifications, or simplifications, as they * may adversely affect the performance. * * Chris Peterson, MIT X Consortium 5/17/90. */ -/* +/* * Xlib spec says max 100 quarks in a lookup, will stop and return if * return if any single production's lhs has more than 100 components. */ #define QLIST_SIZE 100 -/* +/* * This should be big enough to handle things like the XKeysymDB or biggish * ~/.Xdefaults or app-defaults files. Anything bigger will be allocated on * the heap. @@ -1119,14 +1119,14 @@ if (!db) return; - /* - * if strlen (str) < DEF_BUFF_SIZE allocate buffers on the stack for + /* + * if strlen (str) < DEF_BUFF_SIZE allocate buffers on the stack for * speed otherwise malloc the buffer. From a buffer overflow standpoint * we can be sure that neither: a) a component on the lhs, or b) a * value on the rhs, will be longer than the overall length of str, * i.e. strlen(str). * - * This should give good performance when parsing "*foo: bar" type + * This should give good performance when parsing "*foo: bar" type * databases as might be passed with -xrm command line options; but * with larger databases, e.g. .Xdefaults, app-defaults, or KeysymDB * files, the size of the buffers will be overly large. One way @@ -1137,7 +1137,7 @@ str_len = strlen (str); if (DEF_BUFF_SIZE > str_len) lhs = lhs_s; - else if ((lhs = (char*) Xmalloc (str_len)) == NULL) + else if ((lhs = (char*) Xmalloc (str_len)) == NULL) return; alloc_chars = DEF_BUFF_SIZE < str_len ? str_len : DEF_BUFF_SIZE; @@ -1153,7 +1153,7 @@ dolines = doall; /* - * First: Remove extra whitespace. + * First: Remove extra whitespace. */ do { @@ -1225,13 +1225,13 @@ * Third: loop through the LHS of the resource specification * storing characters and converting this to a Quark. */ - + num_quarks = 0; t_bindings = bindings; sig = 0; ptr = lhs; - *t_bindings = XrmBindTightly; + *t_bindings = XrmBindTightly; for(;;) { if (!is_binding(bits)) { while (!is_EOQ(bits)) { @@ -1240,7 +1240,7 @@ bits = next_char(c, str); } - quarks[num_quarks++] = + quarks[num_quarks++] = _XrmInternalStringToQuark(lhs, ptr - lhs, sig, False); if (num_quarks > QLIST_SIZE) { @@ -1260,9 +1260,9 @@ sig = (sig << 1) + c; /* Compute the signature. */ } while (is_space(bits = next_char(c, str))); - /* + /* * The spec doesn't permit it, but support spaces - * internal to resource name/class + * internal to resource name/class */ if (is_separator(bits)) @@ -1286,7 +1286,7 @@ * If two separators appear with no Text between them then * ignore them. * - * If anyone of those separators is a '*' then the binding + * If anyone of those separators is a '*' then the binding * will be loose, otherwise it will be tight. */ @@ -1331,7 +1331,7 @@ * the right hand side. */ - /* + /* * Fourth: Remove more whitespace */ @@ -1349,7 +1349,7 @@ break; } - /* + /* * Fifth: Process the right hand side. */ @@ -1450,8 +1450,8 @@ else { int tcount; - /* - * Otherwise just insert those characters into the + /* + * Otherwise just insert those characters into the * string, since no special processing is needed on * numerics we can skip the special processing. */ @@ -1474,7 +1474,7 @@ } } - /* + /* * It is important to make sure that there is room for at least * four more characters in the buffer, since I can add that * many characters into the buffer after a backslash has occured. @@ -1483,7 +1483,7 @@ if (ptr + len > ptr_max) { char * temp_str; - alloc_chars += BUFSIZ/10; + alloc_chars += BUFSIZ/10; temp_str = Xrealloc(rhs, sizeof(char) * alloc_chars); if (!temp_str) { @@ -1500,8 +1500,8 @@ } /* - * Lastly: Terminate the value string, and store this entry - * into the database. + * Lastly: Terminate the value string, and store this entry + * into the database. */ *ptr++ = '\0'; @@ -1509,7 +1509,7 @@ /* Store it in database */ value.size = ptr - rhs; value.addr = (XPointer) rhs; - + PutEntry(db, bindings, quarks, XrmQString, &value); } @@ -1705,7 +1705,7 @@ static Bool EnumLTable( LTable table, XrmNameList names, - XrmClassList classes, + XrmClassList classes, register int level, register EClosure closure) { @@ -1785,7 +1785,7 @@ static Bool EnumNTable( NTable table, XrmNameList names, - XrmClassList classes, + XrmClassList classes, register int level, register EClosure closure) { @@ -1793,11 +1793,11 @@ register XrmQuark q; register unsigned int leaf; Bool (*get)( - NTable table, - XrmNameList names, - XrmClassList classes, - register int level, - EClosure closure); + NTable table, + XrmNameList names, + XrmClassList classes, + register int level, + EClosure closure); Bool bilevel; /* find entries named ename, leafness leaf, tight or loose, and call get */ @@ -2137,7 +2137,7 @@ static Bool AppendLEntry( LTable table, XrmNameList names, - XrmClassList classes, + XrmClassList classes, register SClosure closure) { /* check for duplicate */ @@ -2156,7 +2156,7 @@ static Bool AppendLooseLEntry( LTable table, XrmNameList names, - XrmClassList classes, + XrmClassList classes, register SClosure closure) { /* check for duplicate */ @@ -2176,17 +2176,17 @@ static Bool SearchNEntry( NTable table, XrmNameList names, - XrmClassList classes, + XrmClassList classes, SClosure closure) { register NTable entry; register XrmQuark q; register unsigned int leaf; Bool (*get)( - NTable table, - XrmNameList names, - XrmClassList classes, - SClosure closure); + NTable table, + XrmNameList names, + XrmClassList classes, + SClosure closure); if (names[1]) { get = SearchNEntry; /* recurse */ @@ -2274,7 +2274,7 @@ } else { if (table && !table->leaf) table = table->next; - if (table && + if (table && AppendLEntry((LTable)table, names, classes, &closure)) { _XUnlockMutex(&db->linfo); return False; @@ -2290,8 +2290,8 @@ XrmSearchList searchList, register XrmName name, register XrmClass class, - XrmRepresentation *pType, /* RETURN */ - XrmValue *pValue) /* RETURN */ + XrmRepresentation *pType, /* RETURN */ + XrmValue *pValue) /* RETURN */ { register LTable *list; register LTable table; @@ -2378,7 +2378,7 @@ static Bool GetVEntry( LTable table, XrmNameList names, - XrmClassList classes, + XrmClassList classes, VClosure closure) { register VEntry entry; @@ -2413,7 +2413,7 @@ static Bool GetLooseVEntry( LTable table, XrmNameList names, - XrmClassList classes, + XrmClassList classes, VClosure closure) { register VEntry entry; @@ -2455,17 +2455,17 @@ static Bool GetNEntry( NTable table, XrmNameList names, - XrmClassList classes, + XrmClassList classes, VClosure closure) { register NTable entry; register XrmQuark q; register unsigned int leaf; Bool (*get)( - NTable table, - XrmNameList names, - XrmClassList classes, - VClosure closure); + NTable table, + XrmNameList names, + XrmClassList classes, + VClosure closure); NTable otable; if (names[2]) { @@ -2527,7 +2527,7 @@ Bool XrmQGetResource( XrmDatabase db, XrmNameList names, - XrmClassList classes, + XrmClassList classes, XrmRepresentation *pType, /* RETURN */ XrmValuePtr pValue) /* RETURN */ { @@ -2651,6 +2651,7 @@ else DestroyNTable(table); } + _XUnlockMutex(&db->linfo); _XFreeMutex(&db->linfo); (*db->methods->destroy)(db->mbstate); Xfree((char *)db);