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.

40 lines
1.6 KiB

  1. --- ./elf/dl-runtime.c.orig 2004-09-02 12:06:09.000000000 +0200
  2. +++ ./elf/dl-runtime.c 2004-09-02 12:08:02.000000000 +0200
  3. @@ -46,6 +46,9 @@
  4. #ifndef ELF_MACHINE_NO_PLT
  5. static ElfW(Addr) __attribute_used__
  6. +#ifdef ELF_MACHINE_RUNTIME_FIXUP_ATTR
  7. + ELF_MACHINE_RUNTIME_FIXUP_ATTR
  8. +#endif
  9. fixup (
  10. # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
  11. ELF_MACHINE_RUNTIME_FIXUP_ARGS,
  12. @@ -133,6 +136,9 @@
  13. #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__
  14. static ElfW(Addr) __attribute_used__
  15. +#ifdef ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR
  16. + ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR
  17. +#endif
  18. profile_fixup (
  19. #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
  20. ELF_MACHINE_RUNTIME_FIXUP_ARGS,
  21. --- ./sysdeps/i386/dl-machine.h.orig 2004-09-02 12:05:52.000000000 +0200
  22. +++ ./sysdeps/i386/dl-machine.h 2004-09-02 12:08:20.000000000 +0200
  23. @@ -154,11 +154,13 @@
  24. destroys the passed register information. */
  25. /* GKM FIXME: Fix trampoline to pass bounds so we can do
  26. without the `__unbounded' qualifier. */
  27. +#define ELF_MACHINE_RUNTIME_FIXUP_ATTR __attribute__ ((regparm (2)))
  28. +#define ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR __attribute__ ((regparm (3)))
  29. static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset)
  30. - __attribute__ ((regparm (2), unused));
  31. + __attribute_used__ ELF_MACHINE_RUNTIME_FIXUP_ATTR;
  32. static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
  33. ElfW(Addr) retaddr)
  34. - __attribute__ ((regparm (3), unused));
  35. + __attribute_used__ ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR;
  36. # endif
  37. /* This code is used in dl-runtime.c to call the `fixup' function