[gentoo-commits] proj/toolchain/binutils-patches:master commit in: 9999/

["Sam James" <sam@gentoo.org>]

commit:     43f28a46d9f3ea14979b20a23d05eadf76b76d14
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 06:27:14 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 06:27:14 2024 +0000
URL:        https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=43f28a46

9999: add more macro reverts

Bug: https://sourceware.org/PR32484
Bug: https://sourceware.org/PR32486
Bug: https://sourceware.org/PR32487
Signed-off-by: Sam James <sam <AT> gentoo.org>

 9999/0006-Revert-PR-32391-testcase.patch           | 183 +++++++++++++++++++++
 ...Fix-error-macro-may-be-used-uninitialized.patch |  39 +++++
 ...he-handling-or-arguments-and-macro-pseud.patch} |  20 +--
 3 files changed, 228 insertions(+), 14 deletions(-)

diff --git a/9999/0006-Revert-PR-32391-testcase.patch b/9999/0006-Revert-PR-32391-testcase.patch
new file mode 100644
index 0000000..d847d98
--- /dev/null
+++ b/9999/0006-Revert-PR-32391-testcase.patch
@@ -0,0 +1,183 @@
+From 423c670c7d80a334fb9f10b71dcc68c022c2a2a5 Mon Sep 17 00:00:00 2001
+Message-ID: <423c670c7d80a334fb9f10b71dcc68c022c2a2a5.1735021582.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Tue, 24 Dec 2024 06:25:51 +0000
+Subject: [PATCH 1/3] Revert "PR 32391 testcase"
+
+This reverts commit c8fcfa9aad211dfd8296ae6e978a356797936c61.
+---
+ gas/testsuite/gas/macros/nesting.s | 120 ++++++++++++++---------------
+ 1 file changed, 60 insertions(+), 60 deletions(-)
+
+diff --git a/gas/testsuite/gas/macros/nesting.s b/gas/testsuite/gas/macros/nesting.s
+index 9746ca183ef..438d5af8d00 100644
+--- a/gas/testsuite/gas/macros/nesting.s
++++ b/gas/testsuite/gas/macros/nesting.s
+@@ -1,104 +1,104 @@
+- .text
++
++	.text
+ /* PR 32391: Automatic counters inside macros should increment when nested
+-   macros finish execution.  */
+- .macro o1
+- .global before_at_\@
++	macros finish execution.  */
++.macro o1
++.global before_at_\@
+ before_at_\@:
+- .global before_plus_\+
++.global before_plus_\+
+ before_plus_\+:
+ 
+- .macro i1
+- .global inside_at_\@
++	.macro i1
++.global inside_at_\@
+ inside_at_\@:
+- .global inside_plus_\+
++.global inside_plus_\+
+ inside_plus_\+:
+- .endm
++	.endm
+ 
+- i1
+- i1
++	i1
++	i1
+ 
+- .global after_at_\@
++.global after_at_\@
+ after_at_\@:
+- .global after_plus_\+
++.global after_plus_\+
+ after_plus_\+:
+ 
+- .endm
++.endm
+ 
+ /* Invoking o1 should produce these symbols in this order:
+ 
+-   before_at_0
+-   before_plus_0
+-   inside_at_1
+-   inside_plus_0
+-   inside_at_2
+-   inside_plus_1
+-   after_at_0
+-   after_plus_0  */
+- o1
+-
++	before_at_0
++	before_plus_0
++	inside_at_1
++	inside_plus_0
++	inside_at_2
++	inside_plus_1
++	after_at_0
++	after_plus_0  */
++o1
++	
+ /* A second invocation of o1 should not produce any errors about
+-   symbols or macros being redefined.  */
+- o1
+-
++	symbols or macros being redefined.  */
++o1
++	
+ /* This definition should not collide with the definition inside o1.  */
+- .macro i1
+- .global other_inner_\@
++.macro i1
++.global other_inner_\@
+ other_inner_\@:
+- .endm
++.endm 
+ 
+-/* And invoking it should invoke the second defintion of i1, not the first.  */
+- i1
+-
+- .macro o2
+- .global _m\@_
++/* And invoking it should invoke the second defintion of i1, not the first.  */	
++i1
++		
++.macro o2
++.global _m\@_
+ _m\@_:
+- .macro i2
+- .global _m\@_
++.macro i2
++.global _m\@_
+ _m\@_:
+- .endm
+- i2
+- .endm
++.endm
++i2
++.endm
+ 
+ /* This should not generate conflicting symbols because the assembler
+    inserts the contents of o2 into the input buffer as pure text (ie
+    without evaluating i2).  The first use of \@ is evaluated at this
+    time, creating _m4_.  But the second use is not evaluated because
+    it is inside a .macro definition.
+-
++	
+    This finishes the evaluation of o2, so the \@ counter is incremented.
+-
++	
+    Next the input buffer is re-evaluated and the i2 macro definition
+    and invocation are encounterd.  The text from i2 are inserted into
+    the input buffer and at this point the second use of \@ is evaluated
+    resulting in the creation of a symbol called _m5_.  */
+- o2
++o2
+ 
+ /* Macro arguments should be independent of nesting.  */
+- .macro O3 arg
+- .global o3_\arg
++.macro O3 arg
++.global o3_\arg
+ o3_\arg:
+ 
+- .macro I3 arg
+- .global i3_\arg
++	.macro I3 arg
++.global i3_\arg
+ i3_\arg:
+- .endm
++       .endm
+ 
+- i3 bar		/* Macro names are case insensitive.  */
+- .endm
++	i3 bar		/* Macro names are case insensitive.  */
++.endm
+ 
+- o3 foo		/* Should produce two labels: o3_foo and i3_bar.  */
++o3 foo	/* Should produce two labels: o3_foo and i3_bar.  */
+ 
+ /* Nested macros can access the arguments of their parents.
+    In addition their arguments can be substituted into the arguments
+    that are substited from their parents:  */
+- .macro OUTER arg1, arg2, arg3:vararg
+- .macro INNER arg4 arg2
++.macro OUTER arg1, arg2, arg3:vararg
++     .macro INNER arg4 arg2
+         .dc.a \arg2
+- .dc.a \arg3
+- .endm
+- INNER \arg1 bert
+- .dc.a \arg2
+- .endm
++	.dc.a \arg3
++     .endm
++     INNER \arg1 bert
++	.dc.a \arg2
++.endm
+ 
+-/* This produces references to "jim", "bert" and "harryfred".  */
+- OUTER fred, jim, harry\arg4
++OUTER fred, jim, harry\arg4 /* This produces references to "jim", "bert" and "harryfred".  */
+-- 
+2.47.1
+

diff --git a/9999/0007-Revert-Fix-error-macro-may-be-used-uninitialized.patch b/9999/0007-Revert-Fix-error-macro-may-be-used-uninitialized.patch
new file mode 100644
index 0000000..410cf76
--- /dev/null
+++ b/9999/0007-Revert-Fix-error-macro-may-be-used-uninitialized.patch
@@ -0,0 +1,39 @@
+From bbdfc672d363ee12f00ce6fc6c7660032cdf4f88 Mon Sep 17 00:00:00 2001
+Message-ID: <bbdfc672d363ee12f00ce6fc6c7660032cdf4f88.1735021582.git.sam@gentoo.org>
+In-Reply-To: <423c670c7d80a334fb9f10b71dcc68c022c2a2a5.1735021582.git.sam@gentoo.org>
+References: <423c670c7d80a334fb9f10b71dcc68c022c2a2a5.1735021582.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Tue, 24 Dec 2024 06:25:57 +0000
+Subject: [PATCH 2/3] Revert "Fix error: macro may be used uninitialized"
+
+This reverts commit f404dc565a4ccfe6922b45cf5526c319aedf75d6.
+---
+ gas/macro.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/gas/macro.c b/gas/macro.c
+index 3d5a9f14341..a0f2a5c764c 100644
+--- a/gas/macro.c
++++ b/gas/macro.c
+@@ -1411,6 +1411,7 @@ check_macro (const char *line, sb *expand,
+ {
+   const char *s;
+   char *copy, *cls;
++  macro_entry *macro;
+   sb line_sb;
+ 
+   if (! macros_defined)
+@@ -1430,8 +1431,8 @@ check_macro (const char *line, sb *expand,
+   for (cls = copy; *cls != '\0'; cls ++)
+     *cls = TOLOWER (*cls);
+ 
+-  macro_entry *macro = NULL;
+-  for (int i = macro_nesting_depth; i >= 0; i--)
++  int i;
++  for (i = macro_nesting_depth; i >= 0; i--)
+     {
+       macro = str_hash_find (macro_hash[i], copy);
+       if (macro != NULL)
+-- 
+2.47.1
+

diff --git a/9999/0006-Revert-Fix-the-handling-or-arguments-and-macro-pseud.patch b/9999/0008-Revert-Fix-the-handling-or-arguments-and-macro-pseud.patch
similarity index 98%
rename from 9999/0006-Revert-Fix-the-handling-or-arguments-and-macro-pseud.patch
rename to 9999/0008-Revert-Fix-the-handling-or-arguments-and-macro-pseud.patch
index 3eff67e..ab3210d 100644
--- a/9999/0006-Revert-Fix-the-handling-or-arguments-and-macro-pseud.patch
+++ b/9999/0008-Revert-Fix-the-handling-or-arguments-and-macro-pseud.patch
@@ -1,19 +1,13 @@
-From 35123215fe882c439955a644a715b23d31c4174d Mon Sep 17 00:00:00 2001
-Message-ID: <35123215fe882c439955a644a715b23d31c4174d.1734739720.git.sam@gentoo.org>
+From 6bb8e5ad25557fc476ccc64ee925d9c1d199a39a Mon Sep 17 00:00:00 2001
+Message-ID: <6bb8e5ad25557fc476ccc64ee925d9c1d199a39a.1735021582.git.sam@gentoo.org>
+In-Reply-To: <423c670c7d80a334fb9f10b71dcc68c022c2a2a5.1735021582.git.sam@gentoo.org>
+References: <423c670c7d80a334fb9f10b71dcc68c022c2a2a5.1735021582.git.sam@gentoo.org>
 From: Sam James <sam@gentoo.org>
-Date: Sat, 21 Dec 2024 00:07:29 +0000
-Subject: [PATCH] Revert "Fix the handling or arguments and macro
+Date: Tue, 24 Dec 2024 06:26:16 +0000
+Subject: [PATCH 3/3] Revert "Fix the handling or arguments and macro
  pseudo-variables inside nested assembler macros."
 
 This reverts commit 9f2e3c21f6506f081f1360f02b847606e0e00995.
-
-Breaks kernel build on amd64 and some multimedia bits on arm*, revert
-for now.
-
-Bug: https://sourceware.org/PR32484
-Bug: https://sourceware.org/PR32486
-Bug: https://sourceware.org/PR32487
-Signed-off-by: Sam James <sam@gentoo.org>
 ---
  gas/config/tc-iq2000.c              |   6 +-
  gas/doc/as.texi                     |  60 +------
@@ -901,8 +895,6 @@ index 438d5af8d00..00000000000
 -.endm
 -
 -OUTER fred, jim, harry\arg4 /* This produces references to "jim", "bert" and "harryfred".  */
-
-base-commit: 14848fc2b22e6e718abadcfbcc0491688df19a8e
 -- 
 2.47.1