mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

43 lines
1.7 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/x11/xfree86/imstt.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. Fix the driver for proper compilation on PowerPC ...
  20. - Rene Rebe <rene@rocklinux.org>
  21. --- xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h.orig 2002-08-06 21:57:30.000000000 +0200
  22. +++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h 2004-02-18 16:24:47.000000000 +0100
  23. @@ -9,7 +9,7 @@
  24. static __inline__ void regw(unsigned long base_addr, unsigned long regindex, unsigned long regdata)
  25. {
  26. - asm volatile ("stwbrx %1,%2,%3; eieio"
  27. + __asm__ __volatile__ ("stwbrx %1,%2,%3; eieio"
  28. : "=m" (*(volatile unsigned *)(base_addr+regindex))
  29. : "r" (regdata), "b" (regindex), "r" (base_addr));
  30. }
  31. @@ -19,7 +19,7 @@
  32. {
  33. register unsigned long val;
  34. - asm volatile ("lwbrx %0,%1,%2; eieio"
  35. + __asm__ __volatile__ ("lwbrx %0,%1,%2; eieio"
  36. : "=r" (val)
  37. : "b" (regindex), "r" (base_addr),
  38. "m" (*(volatile unsigned *)(base_addr+regindex)));