OpenSDE Packages Database (without history before r20070)
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.

85 lines
3.7 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../musl/pkg/gcc/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
  5. # Copyright (C) 2020 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. From 775adf35d6f34f61947fc28a2bdbfa7e881c40d5 Mon Sep 17 00:00:00 2001
  17. From: Ariadne Conill <ariadne@dereferenced.org>
  18. Date: Fri, 21 Aug 2020 07:03:42 +0000
  19. Subject: [PATCH 23/30] DP: Use --push-state/--pop-state for gold as well when
  20. linking libtsan.
  21. ---
  22. gcc/gcc.c | 16 ++++++++--------
  23. 1 file changed, 8 insertions(+), 8 deletions(-)
  24. diff --git a/gcc/gcc.c b/gcc/gcc.c
  25. index 6920bec0fa0..40e07354b3d 100644
  26. --- a/gcc/gcc.c
  27. +++ b/gcc/gcc.c
  28. @@ -696,10 +696,10 @@ proper position among the other output files. */
  29. #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
  30. #elif defined(HAVE_LD_STATIC_DYNAMIC)
  31. #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
  32. - " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
  33. + " %{!static-libasan:--push-state --no-as-needed}" \
  34. " -lasan " \
  35. " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
  36. - " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
  37. + " %{!static-libasan:--pop-state}" \
  38. STATIC_LIBASAN_LIBS
  39. #else
  40. #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
  41. @@ -717,10 +717,10 @@ proper position among the other output files. */
  42. #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
  43. #elif defined(HAVE_LD_STATIC_DYNAMIC)
  44. #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
  45. - " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
  46. + " %{!static-libtsan:--push-state --no-as-needed}" \
  47. " -ltsan " \
  48. " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
  49. - " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
  50. + " %{!static-libtsan:--pop-state}" \
  51. STATIC_LIBTSAN_LIBS
  52. #else
  53. #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
  54. @@ -738,10 +738,10 @@ proper position among the other output files. */
  55. #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
  56. #elif defined(HAVE_LD_STATIC_DYNAMIC)
  57. #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
  58. - " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
  59. + " %{!static-liblsan:--push-state --no-as-needed}" \
  60. " -llsan " \
  61. " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
  62. - " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
  63. + " %{!static-liblsan:--pop-state}" \
  64. STATIC_LIBLSAN_LIBS
  65. #else
  66. #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
  67. @@ -757,10 +757,10 @@ proper position among the other output files. */
  68. " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
  69. #ifdef HAVE_LD_STATIC_DYNAMIC
  70. #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
  71. - " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
  72. + " %{!static-libubsan:--push-state --no-as-needed}" \
  73. " -lubsan " \
  74. " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
  75. - " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
  76. + " %{!static-libubsan:--pop-state}" \
  77. STATIC_LIBUBSAN_LIBS
  78. #else
  79. #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
  80. --
  81. 2.27.0