11.4.0, 12.3.0, 13.2.0, 15.0.0: musl: drop 50_all_cpu_indicator.patch here too

See 17e4c9c2c64242745ac0ed67f2b0ac394f22fe0a.

Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 13 insertions, 146 deletions

diff --git a/11.4.0/musl/50_all_cpu_indicator.patch b/11.4.0/musl/50_all_cpu_indicator.patch
deleted file mode 100644
index 060b322..0000000
--- a/11.4.0/musl/50_all_cpu_indicator.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d16a8ceb1c3c8a7ec381090b4c316ff4c55661c0 Mon Sep 17 00:00:00 2001
-From: 
-Date: Thu, 7 May 2020 21:14:11 -0500
-Subject: [PATCH] convert "__cpu_indicator_init" to
- "__cpu_indicator_init_local"
-
---- a/gcc/config/i386/i386-expand.c
-+++ b/gcc/config/i386/i386-expand.c
-@@ -10941,10 +10941,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
-     {
-     case IX86_BUILTIN_CPU_INIT:
-       {
--	/* Make it call __cpu_indicator_init in libgcc. */
-+	/* Make it call __cpu_indicator_init_local in libgcc. */
- 	tree call_expr, fndecl, type;
-         type = build_function_type_list (integer_type_node, NULL_TREE); 
--	fndecl = build_fn_decl ("__cpu_indicator_init", type);
-+	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0); 
- 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
-       }
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -508,7 +508,7 @@ __cpu_indicator_init (void)
-   return 0;
- }
- 
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+  __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
--- 
-2.26.2
-
diff --git a/12.3.0/musl/50_all_cpu_indicator.patch b/12.3.0/musl/50_all_cpu_indicator.patch
deleted file mode 100644
index a7d199f..0000000
--- a/12.3.0/musl/50_all_cpu_indicator.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d16a8ceb1c3c8a7ec381090b4c316ff4c55661c0 Mon Sep 17 00:00:00 2001
-From:
-Date: Thu, 7 May 2020 21:14:11 -0500
-Subject: [PATCH] convert "__cpu_indicator_init" to
- "__cpu_indicator_init_local"
-
---- a/gcc/config/i386/i386-expand.cc
-+++ b/gcc/config/i386/i386-expand.cc
-@@ -12338,10 +12338,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
-     {
-     case IX86_BUILTIN_CPU_INIT:
-       {
--	/* Make it call __cpu_indicator_init in libgcc.  */
-+	/* Make it call __cpu_indicator_init_local in libgcc.  */
- 	tree call_expr, fndecl, type;
- 	type = build_function_type_list (integer_type_node, NULL_TREE);
--	fndecl = build_fn_decl ("__cpu_indicator_init", type);
-+	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0);
- 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
-       }
-
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -508,7 +508,7 @@ __cpu_indicator_init (void)
-   return 0;
- }
- 
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+  __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
diff --git a/12.3.0/musl/README.history b/12.3.0/musl/README.history
index f149181..06330d5 100644
--- a/12.3.0/musl/README.history
+++ b/12.3.0/musl/README.history
@@ -1,3 +1,7 @@
+2	????
+
+	- 50_all_cpu_indicator.patch
+
 1	28 Apr 2023
 
 	+ 25_all_multilib_pure64.patch
diff --git a/13.2.0/musl/50_all_cpu_indicator.patch b/13.2.0/musl/50_all_cpu_indicator.patch
deleted file mode 100644
index 52e8b92..0000000
--- a/13.2.0/musl/50_all_cpu_indicator.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://gcc.gnu.org/pipermail/gcc-patches/2023-February/612648.html
-
-From d16a8ceb1c3c8a7ec381090b4c316ff4c55661c0 Mon Sep 17 00:00:00 2001
-From:
-Date: Thu, 7 May 2020 21:14:11 -0500
-Subject: [PATCH] convert "__cpu_indicator_init" to
- "__cpu_indicator_init_local"
-
---- a/gcc/config/i386/i386-expand.cc
-+++ b/gcc/config/i386/i386-expand.cc
-@@ -12338,10 +12338,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
-     {
-     case IX86_BUILTIN_CPU_INIT:
-       {
--	/* Make it call __cpu_indicator_init in libgcc.  */
-+	/* Make it call __cpu_indicator_init_local in libgcc.  */
- 	tree call_expr, fndecl, type;
- 	type = build_function_type_list (integer_type_node, NULL_TREE);
--	fndecl = build_fn_decl ("__cpu_indicator_init", type);
-+	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0);
- 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
-       }
-
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -508,7 +508,7 @@ __cpu_indicator_init (void)
-   return 0;
- }
- 
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+  __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
diff --git a/13.2.0/musl/README.history b/13.2.0/musl/README.history
index 5bceb63..fcda95a 100644
--- a/13.2.0/musl/README.history
+++ b/13.2.0/musl/README.history
@@ -1,4 +1,9 @@
+3	????
+
+	- 50_all_cpu_indicator.patch
+
 2	10 May 2023
+
 	+ 50_all_sanitizer_lfs.patch
 
 1	26 Apr 2023
diff --git a/15.0.0/musl/50_all_cpu_indicator.patch b/15.0.0/musl/50_all_cpu_indicator.patch
deleted file mode 100644
index 52e8b92..0000000
--- a/15.0.0/musl/50_all_cpu_indicator.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://gcc.gnu.org/pipermail/gcc-patches/2023-February/612648.html
-
-From d16a8ceb1c3c8a7ec381090b4c316ff4c55661c0 Mon Sep 17 00:00:00 2001
-From:
-Date: Thu, 7 May 2020 21:14:11 -0500
-Subject: [PATCH] convert "__cpu_indicator_init" to
- "__cpu_indicator_init_local"
-
---- a/gcc/config/i386/i386-expand.cc
-+++ b/gcc/config/i386/i386-expand.cc
-@@ -12338,10 +12338,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
-     {
-     case IX86_BUILTIN_CPU_INIT:
-       {
--	/* Make it call __cpu_indicator_init in libgcc.  */
-+	/* Make it call __cpu_indicator_init_local in libgcc.  */
- 	tree call_expr, fndecl, type;
- 	type = build_function_type_list (integer_type_node, NULL_TREE);
--	fndecl = build_fn_decl ("__cpu_indicator_init", type);
-+	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0);
- 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
-       }
-
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -508,7 +508,7 @@ __cpu_indicator_init (void)
-   return 0;
- }
- 
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+  __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
diff --git a/15.0.0/musl/README.history b/15.0.0/musl/README.history
index f149181..06330d5 100644
--- a/15.0.0/musl/README.history
+++ b/15.0.0/musl/README.history
@@ -1,3 +1,7 @@
+2	????
+
+	- 50_all_cpu_indicator.patch
+
 1	28 Apr 2023
 
 	+ 25_all_multilib_pure64.patch