0019-fix-missing-alias-functions.patch 3.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123
  1. From 6de07625ef56d37f9804ef4ffc7fe568954cb689 Mon Sep 17 00:00:00 2001
  2. From: "max.ma" <max.ma@starfivetech.com>
  3. Date: Wed, 14 Dec 2022 16:55:05 -0800
  4. Subject: [PATCH 19/19] fix missing alias functions
  5. ---
  6. sysdeps/riscv/rv64/multiarch/memchr_as.S | 8 ++++++--
  7. sysdeps/riscv/rv64/multiarch/memchr_riscv.S | 3 +--
  8. sysdeps/riscv/rv64/multiarch/memcmp_riscv.S | 1 -
  9. sysdeps/riscv/rv64/multiarch/memmove_riscv.S | 1 -
  10. sysdeps/riscv/rv64/multiarch/memset_riscv.S | 1 -
  11. sysdeps/riscv/rv64/strnlen.S | 13 ++++++++-----
  12. 6 files changed, 15 insertions(+), 12 deletions(-)
  13. diff --git a/sysdeps/riscv/rv64/multiarch/memchr_as.S b/sysdeps/riscv/rv64/multiarch/memchr_as.S
  14. index ad559e6a11..4d3221c60e 100644
  15. --- a/sysdeps/riscv/rv64/multiarch/memchr_as.S
  16. +++ b/sysdeps/riscv/rv64/multiarch/memchr_as.S
  17. @@ -22,7 +22,7 @@
  18. .option arch, +zbb
  19. .p2align 6
  20. -ENTRY (memchr)
  21. +ENTRY (__memchr)
  22. beqz a2, .L_not_find
  23. li a4, 9
  24. bltu a2, a4, .L_0_to_8
  25. @@ -91,5 +91,9 @@ ENTRY (memchr)
  26. add a0, a0, a3
  27. .L_find_byte:
  28. ret
  29. -END (memchr)
  30. +END (__memchr)
  31. +#ifdef weak_alias
  32. +weak_alias (__memchr, memchr)
  33. +#endif
  34. +
  35. libc_hidden_builtin_def (memchr)
  36. diff --git a/sysdeps/riscv/rv64/multiarch/memchr_riscv.S b/sysdeps/riscv/rv64/multiarch/memchr_riscv.S
  37. index 84b3375f31..829f57e7e5 100644
  38. --- a/sysdeps/riscv/rv64/multiarch/memchr_riscv.S
  39. +++ b/sysdeps/riscv/rv64/multiarch/memchr_riscv.S
  40. @@ -20,12 +20,11 @@
  41. #if IS_IN (libc) && defined SHARED && defined __riscv_vector
  42. -#define memchr __memchr_riscv
  43. +#define __memchr __memchr_riscv
  44. #undef libc_hidden_builtin_def
  45. #define libc_hidden_builtin_def(name)
  46. #include "memchr_as.S"
  47. -
  48. #else
  49. #include "memchr_as.S"
  50. diff --git a/sysdeps/riscv/rv64/multiarch/memcmp_riscv.S b/sysdeps/riscv/rv64/multiarch/memcmp_riscv.S
  51. index 32df79f769..f9ba9da081 100644
  52. --- a/sysdeps/riscv/rv64/multiarch/memcmp_riscv.S
  53. +++ b/sysdeps/riscv/rv64/multiarch/memcmp_riscv.S
  54. @@ -21,7 +21,6 @@
  55. #undef libc_hidden_builtin_def
  56. #define libc_hidden_builtin_def(name)
  57. -#undef weak_alias
  58. # define memcmp __memcmp_riscv
  59. # include "memcmp_as.S"
  60. diff --git a/sysdeps/riscv/rv64/multiarch/memmove_riscv.S b/sysdeps/riscv/rv64/multiarch/memmove_riscv.S
  61. index 14f154e226..f829e0d5c3 100644
  62. --- a/sysdeps/riscv/rv64/multiarch/memmove_riscv.S
  63. +++ b/sysdeps/riscv/rv64/multiarch/memmove_riscv.S
  64. @@ -21,7 +21,6 @@
  65. #undef libc_hidden_builtin_def
  66. #define libc_hidden_builtin_def(name)
  67. -#undef weak_alias
  68. # define memmove __memmove_riscv
  69. # include "memmove_as.S"
  70. diff --git a/sysdeps/riscv/rv64/multiarch/memset_riscv.S b/sysdeps/riscv/rv64/multiarch/memset_riscv.S
  71. index 8585db0228..6540639296 100644
  72. --- a/sysdeps/riscv/rv64/multiarch/memset_riscv.S
  73. +++ b/sysdeps/riscv/rv64/multiarch/memset_riscv.S
  74. @@ -20,7 +20,6 @@
  75. #undef libc_hidden_builtin_def
  76. #define libc_hidden_builtin_def(name)
  77. -#undef weak_alias
  78. # define memset __memset_riscv
  79. # include "memset_as.S"
  80. #else
  81. diff --git a/sysdeps/riscv/rv64/strnlen.S b/sysdeps/riscv/rv64/strnlen.S
  82. index 33b140a0ac..73757b69f2 100644
  83. --- a/sysdeps/riscv/rv64/strnlen.S
  84. +++ b/sysdeps/riscv/rv64/strnlen.S
  85. @@ -19,7 +19,7 @@
  86. #include <sysdep.h>
  87. .p2align 6
  88. -ENTRY (strnlen)
  89. +ENTRY (__strnlen)
  90. mv a2, a0
  91. mv a0, a1
  92. li a3, -1
  93. @@ -56,7 +56,10 @@ ENTRY (strnlen)
  94. .Ldone:
  95. ret
  96. -END (strnlen)
  97. -weak_alias (strnlen, __strnlen)
  98. -libc_hidden_builtin_def (strnlen)
  99. -libc_hidden_builtin_def (__strnlen)
  100. +END (__strnlen)
  101. +
  102. +#ifndef STRNLEN
  103. +libc_hidden_def (__strnlen)
  104. +weak_alias (__strnlen, strnlen)
  105. +#endif
  106. +libc_hidden_def (strnlen)
  107. --
  108. 2.25.1