commit: 0aa44894bc4eebe0069a1355bfb600b150f776b8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Aug 27 04:19:49 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Aug 27 04:19:49 2025 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=0aa44894
16.0.0: drop 1 TLS patch merged upstream Signed-off-by: Sam James <sam <AT> gentoo.org> ...6-64-Emit-the-TLS-call-after-debug-marker.patch | 105 --------------------- 16.0.0/gentoo/README.history | 1 - 2 files changed, 106 deletions(-) diff --git a/16.0.0/gentoo/87_all_PR121668-x86-64-Emit-the-TLS-call-after-debug-marker.patch b/16.0.0/gentoo/87_all_PR121668-x86-64-Emit-the-TLS-call-after-debug-marker.patch deleted file mode 100644 index ace990f..0000000 --- a/16.0.0/gentoo/87_all_PR121668-x86-64-Emit-the-TLS-call-after-debug-marker.patch +++ /dev/null @@ -1,105 +0,0 @@ -From ca5a4b3eea207904c64e638a4ecefd347f386abb Mon Sep 17 00:00:00 2001 -Message-ID: <ca5a4b3eea207904c64e638a4ecefd347f386abb.1756251629.git....@gentoo.org> -From: "H.J. Lu" <[email protected]> -Date: Tue, 26 Aug 2025 15:29:25 -0700 -Subject: [PATCH 1/2] x86-64: Emit the TLS call after debug marker - -For a basic block with only a debug marker: - -(note 3 0 2 2 [bb 2] NOTE_INSN_BASIC_BLOCK) -(note 2 3 5 2 NOTE_INSN_FUNCTION_BEG) -(debug_insn 5 2 16 2 (debug_marker) "x.c":6:3 -1 (nil)) - -emit the TLS call after debug marker. - -gcc/ - - PR target/121668 - * config/i386/i386-features.cc (ix86_emit_tls_call): Emit the - TLS call after debug marker. - -gcc/testsuite/ - - PR target/121668 - * gcc.target/i386/pr121668-1a.c: New test. - -Signed-off-by: H.J. Lu <[email protected]> ---- - gcc/config/i386/i386-features.cc | 26 +++++++++++++++++---- - gcc/testsuite/gcc.target/i386/pr121668-1a.c | 13 +++++++++++ - 2 files changed, 34 insertions(+), 5 deletions(-) - create mode 100644 gcc/testsuite/gcc.target/i386/pr121668-1a.c - -diff --git a/gcc/config/i386/i386-features.cc b/gcc/config/i386/i386-features.cc -index cdb2a0b34b27..93e20947edf3 100644 ---- a/gcc/config/i386/i386-features.cc -+++ b/gcc/config/i386/i386-features.cc -@@ -3806,10 +3806,19 @@ ix86_emit_tls_call (rtx tls_set, x86_cse_kind kind, basic_block bb, - (code_label 78 11 77 3 14 (nil) [1 uses]) - (note 77 78 54 3 [bb 3] NOTE_INSN_BASIC_BLOCK) - -+ or a basic block with only a debug marker: -+ -+ (note 3 0 2 2 [bb 2] NOTE_INSN_BASIC_BLOCK) -+ (note 2 3 5 2 NOTE_INSN_FUNCTION_BEG) -+ (debug_insn 5 2 16 2 (debug_marker) "x.c":6:3 -1 (nil)) -+ - */ -- gcc_assert (NOTE_P (insn) -- && (NOTE_KIND (insn) == NOTE_INSN_FUNCTION_BEG -- || NOTE_KIND (insn) == NOTE_INSN_BASIC_BLOCK)); -+ gcc_assert (DEBUG_INSN_P (insn) -+ || (NOTE_P (insn) -+ && ((NOTE_KIND (insn) -+ == NOTE_INSN_FUNCTION_BEG) -+ || (NOTE_KIND (insn) -+ == NOTE_INSN_BASIC_BLOCK)))); - insn = NULL; - break; - } -@@ -3854,12 +3863,19 @@ ix86_emit_tls_call (rtx tls_set, x86_cse_kind kind, basic_block bb, - (note 4 0 2 2 [bb 2] NOTE_INSN_BASIC_BLOCK) - (note 2 4 26 2 NOTE_INSN_FUNCTION_BEG) - -- or after NOTE_INSN_BASIC_BLOCK a basic block with only -- a label: -+ or after NOTE_INSN_BASIC_BLOCK in a basic block with -+ only a label: - - (code_label 78 11 77 3 14 (nil) [1 uses]) - (note 77 78 54 3 [bb 3] NOTE_INSN_BASIC_BLOCK) - -+ or after debug marker in a basic block with only a -+ debug marker: -+ -+ (note 3 0 2 2 [bb 2] NOTE_INSN_BASIC_BLOCK) -+ (note 2 3 5 2 NOTE_INSN_FUNCTION_BEG) -+ (debug_insn 5 2 16 2 (debug_marker) "x.c":6:3 -1 (nil)) -+ - */ - insn = insn ? PREV_INSN (insn) : BB_END (bb); - *after_p = insn; -diff --git a/gcc/testsuite/gcc.target/i386/pr121668-1a.c b/gcc/testsuite/gcc.target/i386/pr121668-1a.c -new file mode 100644 -index 000000000000..eb553081eb31 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/i386/pr121668-1a.c -@@ -0,0 +1,13 @@ -+/* { dg-do compile { target *-*-linux* } } */ -+/* { dg-options "-Og -g -fpic -fplt -mtls-dialect=gnu" } */ -+ -+typedef int caml_domain_state; -+thread_local caml_domain_state caml_state; -+void -+caml_empty_mark_stack () -+{ -+ while (caml_state) -+ caml_state = 0; -+} -+ -+/* { dg-final { scan-assembler-times "call\[ \t\]__tls_get_addr@PLT" 1 { target { ! ia32 } } } } */ - -base-commit: a43c30cb6f451d60b7e19be09da075ab0ff5830f --- -2.51.0 - diff --git a/16.0.0/gentoo/README.history b/16.0.0/gentoo/README.history index 3ea56ff..a98dbcb 100644 --- a/16.0.0/gentoo/README.history +++ b/16.0.0/gentoo/README.history @@ -1,7 +1,6 @@ 13 ???? U 86_all_PR120933-i386-default-to-mtls-dialect-gnu2-if-appropriate.patch - + 87_all_PR121668-x86-64-Emit-the-TLS-call-after-debug-marker.patch + 88_all-x86-64-Better-compare-source-operands-of-tls_dynamic.patch 12 24 August 2025
