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.

110 lines
3.1 KiB

  1. Fixes
  2. In file included from dynamic-link.h:22,
  3. from dl-reloc.c:265:
  4. ../sysdeps/arm/dl-machine.h: In function '_dl_relocate_object':
  5. ../sysdeps/arm/dl-machine.h:371: error: invalid storage class for function 'fix_bad_pc24'
  6. ../sysdeps/arm/dl-machine.h:406: error: invalid storage class for function 'elf_machine_rel'
  7. ../sysdeps/arm/dl-machine.h:532: error: invalid storage class for function 'elf_machine_rela'
  8. ../sysdeps/arm/dl-machine.h:612: error: invalid storage class for function 'elf_machine_rel_relative'
  9. ../sysdeps/arm/dl-machine.h:621: error: invalid storage class for function 'elf_machine_rela_relative'
  10. ../sysdeps/arm/dl-machine.h:630: error: invalid storage class for function 'elf_machine_lazy_rel'
  11. --- glibc-2.3.4/sysdeps/arm/dl-machine.h.old Sun Mar 20 17:54:37 2005
  12. +++ glibc-2.3.4/sysdeps/arm/dl-machine.h Sun Mar 20 17:57:32 2005
  13. @@ -359,7 +359,14 @@
  14. # endif
  15. /* Deal with an out-of-range PC24 reloc. */
  16. -static Elf32_Addr
  17. +#if __GNUC__ >= 4
  18. + auto inline Elf32_Addr
  19. +#else
  20. + static inline Elf32_Addr
  21. +#endif
  22. +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
  23. + __attribute ((always_inline))
  24. +#endif
  25. fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value)
  26. {
  27. static void *fix_page;
  28. @@ -392,7 +399,14 @@
  29. /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
  30. MAP is the object containing the reloc. */
  31. -static inline void
  32. +#if __GNUC__ >= 4
  33. + auto inline void
  34. +#else
  35. + static inline void
  36. +#endif
  37. +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
  38. + __attribute ((always_inline))
  39. +#endif
  40. elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
  41. const Elf32_Sym *sym, const struct r_found_version *version,
  42. void *const reloc_addr_arg)
  43. @@ -517,7 +531,14 @@
  44. }
  45. # ifndef RTLD_BOOTSTRAP
  46. -static inline void
  47. +#if __GNUC__ >= 4
  48. + auto inline void
  49. +#else
  50. + static inline void
  51. +#endif
  52. +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
  53. + __attribute ((always_inline))
  54. +#endif
  55. elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
  56. const Elf32_Sym *sym, const struct r_found_version *version,
  57. void *const reloc_addr_arg)
  58. @@ -597,7 +618,14 @@
  59. }
  60. # endif
  61. -static inline void
  62. +#if __GNUC__ >= 4
  63. + auto inline void
  64. +#else
  65. + static inline void
  66. +#endif
  67. +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
  68. + __attribute ((always_inline))
  69. +#endif
  70. elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
  71. void *const reloc_addr_arg)
  72. {
  73. @@ -606,7 +634,14 @@
  74. }
  75. # ifndef RTLD_BOOTSTRAP
  76. -static inline void
  77. +#if __GNUC__ >= 4
  78. + auto inline void
  79. +#else
  80. + static inline void
  81. +#endif
  82. +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
  83. + __attribute ((always_inline))
  84. +#endif
  85. elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
  86. void *const reloc_addr_arg)
  87. {
  88. @@ -615,7 +650,14 @@
  89. }
  90. # endif
  91. -static inline void
  92. +#if __GNUC__ >= 4
  93. + auto inline void
  94. +#else
  95. + static inline void
  96. +#endif
  97. +#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
  98. + __attribute ((always_inline))
  99. +#endif
  100. elf_machine_lazy_rel (struct link_map *map,
  101. Elf32_Addr l_addr, const Elf32_Rel *reloc)
  102. {