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.

50 lines
2.0 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/glibc23/elf-machine-rela.patch.mips
  9. # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
  10. #
  11. # This program is free software; you can redistribute it and/or modify
  12. # it under the terms of the GNU General Public License as published by
  13. # the Free Software Foundation; either version 2 of the License, or
  14. # (at your option) any later version. A copy of the GNU General Public
  15. # License can be found at Documentation/COPYING.
  16. #
  17. # Many people helped and are helping developing ROCK Linux. Please
  18. # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
  19. # file for details.
  20. #
  21. # --- ROCK-COPYRIGHT-NOTE-END ---
  22. --- libc/elf/dl-conflict.c.mips Mon Feb 4 13:44:57 2002
  23. +++ libc/elf/dl-conflict.c Mon Feb 4 15:10:31 2002
  24. @@ -33,6 +33,7 @@ void
  25. _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
  26. ElfW(Rela) *conflictend)
  27. {
  28. +#ifndef _DL_HAVE_NO_ELF_MACHINE_RELA
  29. if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_RELOC, 0))
  30. _dl_printf ("\nconflict processing: %s\n",
  31. l->l_name[0] ? l->l_name : _dl_argv[0]);
  32. @@ -63,4 +64,5 @@ _dl_resolve_conflicts (struct link_map *
  33. for (; conflict < conflictend; ++conflict)
  34. elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
  35. }
  36. +#endif
  37. }
  38. --- libc/sysdeps/mips/dl-machine.h.mips Mon Feb 4 13:45:18 2002
  39. +++ libc/sysdeps/mips/dl-machine.h Mon Feb 4 15:08:39 2002
  40. @@ -56,6 +56,9 @@
  41. #define ELF_MACHINE_JMP_SLOT R_MIPS_REL32
  42. #define elf_machine_type_class(type) ELF_RTYPE_CLASS_PLT
  43. +/* MIPS doesn't support RELA. */
  44. +#define _DL_HAVE_NO_ELF_MACHINE_RELA
  45. +
  46. /* Translate a processor specific dynamic tag to the index
  47. in l_info array. */
  48. #define DT_MIPS(x) (DT_MIPS_##x - DT_LOPROC + DT_NUM)