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.

59 lines
2.5 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/base/glibc/glibc23/dl-runtime-fix.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 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. --- ./elf/dl-runtime.c.orig 2004-09-02 12:06:09.000000000 +0200
  20. +++ ./elf/dl-runtime.c 2004-09-02 12:08:02.000000000 +0200
  21. @@ -46,6 +46,9 @@
  22. #ifndef ELF_MACHINE_NO_PLT
  23. static ElfW(Addr) __attribute_used__
  24. +#ifdef ELF_MACHINE_RUNTIME_FIXUP_ATTR
  25. + ELF_MACHINE_RUNTIME_FIXUP_ATTR
  26. +#endif
  27. fixup (
  28. # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
  29. ELF_MACHINE_RUNTIME_FIXUP_ARGS,
  30. @@ -133,6 +136,9 @@
  31. #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__
  32. static ElfW(Addr) __attribute_used__
  33. +#ifdef ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR
  34. + ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR
  35. +#endif
  36. profile_fixup (
  37. #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
  38. ELF_MACHINE_RUNTIME_FIXUP_ARGS,
  39. --- ./sysdeps/i386/dl-machine.h.orig 2004-09-02 12:05:52.000000000 +0200
  40. +++ ./sysdeps/i386/dl-machine.h 2004-09-02 12:08:20.000000000 +0200
  41. @@ -154,11 +154,13 @@
  42. destroys the passed register information. */
  43. /* GKM FIXME: Fix trampoline to pass bounds so we can do
  44. without the `__unbounded' qualifier. */
  45. +#define ELF_MACHINE_RUNTIME_FIXUP_ATTR __attribute__ ((regparm (2)))
  46. +#define ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR __attribute__ ((regparm (3)))
  47. static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset)
  48. - __attribute__ ((regparm (2), unused));
  49. + __attribute_used__ ELF_MACHINE_RUNTIME_FIXUP_ATTR;
  50. static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
  51. ElfW(Addr) retaddr)
  52. - __attribute__ ((regparm (3), unused));
  53. + __attribute_used__ ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR;
  54. # endif
  55. /* This code is used in dl-runtime.c to call the `fixup' function