Merge pull request msys2#4168 from lazka/cross-gcc-13.2.0

cross-gcc: Update to 13.2.0
stahta01 · Nov 13, 2023 · 48fbd3b · 48fbd3b
2 parents 47a913a + 5d0ae9f
commit 48fbd3b
Show file tree

Hide file tree

Showing 36 changed files with 2,412 additions and 6,324 deletions.
diff --git a/mingw-w64-cross-gcc/0001-Cygwin-avoid-installing-libffi-V2.patch b/mingw-w64-cross-gcc/0001-Cygwin-avoid-installing-libffi-V2.patch
diff --git a/.../0002-Cygwin-use-SysV-ABI-on-x86_64.patch → .../0001-Cygwin-use-SysV-ABI-on-x86_64.patch b/.../0002-Cygwin-use-SysV-ABI-on-x86_64.patch → .../0001-Cygwin-use-SysV-ABI-on-x86_64.patch
@@ -1,8 +1,10 @@
-From cb0598fe3c511e1d572c89db671c17838c60a2b3 Mon Sep 17 00:00:00 2001
+From 7330e79d1eaab54e91d27ff8aae1d610713383cd Mon Sep 17 00:00:00 2001
 From: Jonathan Yong <10walls@gmail.com>
 Date: Tue, 8 Sep 2020 14:50:33 +0200
-Subject: [PATCH 02/18] Cygwin: use SysV ABI on x86_64
+Subject: [PATCH 01/13] Cygwin: use SysV ABI on x86_64
 
+# Conflicts:
+#	libitm/libitm.h
 ---
  gcc/builtin-attrs.def | 3 +++
  gcc/gtm-builtins.def  | 2 +-
@@ -11,18 +13,18 @@ Subject: [PATCH 02/18] Cygwin: use SysV ABI on x86_64
  4 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/gcc/builtin-attrs.def b/gcc/builtin-attrs.def
-index 3239311b5a4..304180cffc3 100644
+index 11ce5a3d16c..a544fcf9afd 100644
 --- a/gcc/builtin-attrs.def
 +++ b/gcc/builtin-attrs.def
-@@ -117,6 +117,7 @@ DEF_ATTR_IDENT (ATTR_TYPEGENERIC, "type generic")
+@@ -119,6 +119,7 @@ DEF_ATTR_IDENT (ATTR_TYPEGENERIC, "type generic")
  DEF_ATTR_IDENT (ATTR_TM_REGPARM, "*tm regparm")
  DEF_ATTR_IDENT (ATTR_TM_TMPURE, "transaction_pure")
  DEF_ATTR_IDENT (ATTR_RETURNS_TWICE, "returns_twice")
 +DEF_ATTR_IDENT (ATTR_SYSV_ABI, "sysv_abi")
  DEF_ATTR_IDENT (ATTR_RETURNS_NONNULL, "returns_nonnull")
  DEF_ATTR_IDENT (ATTR_WARN_UNUSED_RESULT, "warn_unused_result")
 
-@@ -395,6 +396,8 @@ DEF_ATTR_TREE_LIST (ATTR_TM_CONST_NOTHROW_LIST,
+@@ -401,6 +402,8 @@ DEF_ATTR_TREE_LIST (ATTR_TM_CONST_NOTHROW_LIST,
  		    ATTR_TM_REGPARM, ATTR_NULL, ATTR_CONST_NOTHROW_LIST)
  DEF_ATTR_TREE_LIST (ATTR_TM_NOTHROW_RT_LIST,
  		    ATTR_RETURNS_TWICE, ATTR_NULL, ATTR_TM_NOTHROW_LIST)
@@ -43,18 +45,18 @@ index 6d5cfb9b406..1f47898a71a 100644
  DEF_TM_BUILTIN (BUILT_IN_TM_COMMIT, "_ITM_commitTransaction",
  		BT_FN_VOID, ATTR_TM_NOTHROW_LIST)
 diff --git a/libitm/libitm.h b/libitm/libitm.h
-index 69f551e2675..77478b115c8 100644
+index 7ecf53a93e1..5b2bf7582f1 100644
 --- a/libitm/libitm.h
 +++ b/libitm/libitm.h
 @@ -45,6 +45,7 @@ extern "C" {
 
  #define ITM_NORETURN	__attribute__((noreturn))
  #define ITM_PURE __attribute__((transaction_pure))
 +#define ITM_SYSV __attribute__((sysv_abi))
-
- /* The following are externally visible definitions and functions, though
-    only very few of these should be called by user code.  */
-@@ -145,7 +146,7 @@ typedef uint64_t _ITM_transactionId_t;	/* Transaction identifier */
+ #ifdef _GLIBCXX_NOTHROW
+ # define _ITM_NOTHROW _GLIBCXX_NOTHROW
+ #elif !defined (__cplusplus)
+@@ -154,7 +155,7 @@ typedef uint64_t _ITM_transactionId_t;	/* Transaction identifier */
 
  extern _ITM_transactionId_t _ITM_getTransactionId(void) ITM_REGPARM;
 
@@ -64,7 +66,7 @@ index 69f551e2675..77478b115c8 100644
  extern void _ITM_abortTransaction(_ITM_abortReason) ITM_REGPARM ITM_NORETURN;
 
 diff --git a/libitm/libitm_i.h b/libitm/libitm_i.h
-index c2beaf41bf3..fd3a6f9bfd9 100644
+index 4e415ef53a0..ff3ae90df76 100644
 --- a/libitm/libitm_i.h
 +++ b/libitm/libitm_i.h
 @@ -294,7 +294,7 @@ struct gtm_thread
@@ -86,5 +88,5 @@ index c2beaf41bf3..fd3a6f9bfd9 100644
  extern "C" void GTM_LB (const void *, size_t) ITM_REGPARM;
 
 -- 
-2.28.0
+2.39.0
 
diff --git a/...pthread-tsaware-and-large-address-a.patch → ...pthread-tsaware-and-large-address-a.patch b/...pthread-tsaware-and-large-address-a.patch → ...pthread-tsaware-and-large-address-a.patch
@@ -1,7 +1,7 @@
-From f7eda39d692f90d5c2c10e71ed9dc0d52a11c852 Mon Sep 17 00:00:00 2001
+From 51dd20d6225772a5d6c77076c7aee92d4d945516 Mon Sep 17 00:00:00 2001
 From: Jonathan Yong <10walls@gmail.com>
 Date: Sat, 28 Jun 2014 09:44:48 +0800
-Subject: [PATCH 04/18] Cygwin: add dummy -pthread, -tsaware and
+Subject: [PATCH 02/13] Cygwin: add dummy -pthread, -tsaware and
  --large-address-aware for executables only
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH 04/18] Cygwin: add dummy -pthread, -tsaware and
  3 files changed, 6 insertions(+)
 
 diff --git a/gcc/config/i386/cygwin-w64.h b/gcc/config/i386/cygwin-w64.h
-index 25814a32ace..3fe429379c3 100644
+index 8bac9d05ca7..75896f80d7c 100644
 --- a/gcc/config/i386/cygwin-w64.h
 +++ b/gcc/config/i386/cygwin-w64.h
 @@ -67,6 +67,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -23,18 +23,18 @@ index 25814a32ace..3fe429379c3 100644
 
  /* Cygwin64 will have a 64-bit long type. */
 diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
-index 73737f4805c..13a7d57eb65 100644
+index 71fb6135c2c..c42224a7824 100644
 --- a/gcc/config/i386/cygwin.h
 +++ b/gcc/config/i386/cygwin.h
-@@ -93,6 +93,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -102,6 +102,7 @@ along with GCC; see the file COPYING3.  If not see
 
  /* To implement C++ function replacement we always wrap the cxx
     malloc-like operators.  See N2800 #17.6.4.6 [replacement.functions] */
 +#undef CXX_WRAP_SPEC_LIST
  #define CXX_WRAP_SPEC_LIST " \
    --wrap _Znwj \
    --wrap _Znaj \
-@@ -131,6 +132,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -140,6 +141,7 @@ along with GCC; see the file COPYING3.  If not see
    %{static:-Bstatic} %{!static:-Bdynamic} \
    %{shared|mdll: --enable-auto-image-base -e __cygwin_dll_entry@12} \
    --dll-search-prefix=cyg \
@@ -43,7 +43,7 @@ index 73737f4805c..13a7d57eb65 100644
 
  /* Binutils does not handle weak symbols from dlls correctly.  For now,
 diff --git a/gcc/config/i386/cygwin.opt b/gcc/config/i386/cygwin.opt
-index 44b9c887234..d95cfe7d653 100644
+index fcec11db6ad..4062e41a780 100644
 --- a/gcc/config/i386/cygwin.opt
 +++ b/gcc/config/i386/cygwin.opt
 @@ -21,4 +21,7 @@
@@ -55,5 +55,5 @@ index 44b9c887234..d95cfe7d653 100644
 +
  ; Retain blank line above
 -- 
-2.28.0
+2.39.0
 
diff --git a/mingw-w64-cross-gcc/0003-Cygwin-MinGW-Do-not-version-lto-plugins.patch b/mingw-w64-cross-gcc/0003-Cygwin-MinGW-Do-not-version-lto-plugins.patch
diff --git a/...limport-properly-in-medium-model-V2.patch → ...limport-properly-in-medium-model-V2.patch b/...limport-properly-in-medium-model-V2.patch → ...limport-properly-in-medium-model-V2.patch
@@ -1,25 +1,25 @@
-From 6b3790d183decea78d75f8d12fe6cd9f9a09ad4b Mon Sep 17 00:00:00 2001
+From 8efd8be0cefbf4f0dff1473a4b1077c571145197 Mon Sep 17 00:00:00 2001
 From: Jonathan Yong <10walls@gmail.com>
 Date: Tue, 8 Sep 2020 14:56:50 +0200
-Subject: [PATCH 05/18] Cygwin: handle dllimport properly in medium model V2
+Subject: [PATCH 03/13] Cygwin: handle dllimport properly in medium model V2
 
 ---
  gcc/config/i386/predicates.md | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
-index 71f4cb1193c..d43708b9e90 100644
+index b815aca0da7..c71eed7f60c 100644
 --- a/gcc/config/i386/predicates.md
 +++ b/gcc/config/i386/predicates.md
-@@ -180,6 +180,7 @@
+@@ -202,6 +202,7 @@
  	switch (XINT (XEXP (op, 0), 1))
  	  {
  	  case UNSPEC_GOTPCREL:
 +	    if (TARGET_PECOFF) break;
  	  case UNSPEC_DTPOFF:
  	  case UNSPEC_GOTNTPOFF:
  	  case UNSPEC_NTPOFF:
-@@ -282,6 +283,10 @@
+@@ -307,6 +308,10 @@
        if (ix86_force_load_from_GOT_p (op))
  	return false;
 
@@ -31,5 +31,5 @@ index 71f4cb1193c..d43708b9e90 100644
        return (ix86_cmodel == CM_SMALL
  	      || (ix86_cmodel == CM_MEDIUM
 -- 
-2.28.0
+2.39.0
 
diff --git a/...oss-gcc/0006-Cygwin-MinGW-skip-test.patch → ...oss-gcc/0004-Cygwin-MinGW-skip-test.patch b/...oss-gcc/0006-Cygwin-MinGW-skip-test.patch → ...oss-gcc/0004-Cygwin-MinGW-skip-test.patch
@@ -1,7 +1,7 @@
-From fd1a87b25723a28fc90dbea6c6f614aef34f7928 Mon Sep 17 00:00:00 2001
+From f2c9bdede2258fc953958aab50a2b71502ff9a5f Mon Sep 17 00:00:00 2001
 From: Jonathan Yong <10walls@gmail.com>
 Date: Sat, 28 Jun 2014 09:54:57 +0800
-Subject: [PATCH 06/18] Cygwin/MinGW: skip test
+Subject: [PATCH 04/13] Cygwin/MinGW: skip test
 
 ---
  gcc/testsuite/gcc.target/i386/pr25993.c | 2 +-
@@ -19,5 +19,5 @@ index 1e7e933fb9a..2b12f97b1cc 100644
 
  #ifndef __ASSEMBLER__
 -- 
-2.28.0
+2.39.0
 
diff --git a/..._CONTROL_ENABLE-and-DTR_CONTROL_ENA.patch → ..._CONTROL_ENABLE-and-DTR_CONTROL_ENA.patch b/..._CONTROL_ENABLE-and-DTR_CONTROL_ENA.patch → ..._CONTROL_ENABLE-and-DTR_CONTROL_ENA.patch
@@ -1,18 +1,18 @@
-From b215f8a500ebad7a76cbdaa29ef9cf88066e1e86 Mon Sep 17 00:00:00 2001
+From ae0f4a9da588a80f05ecf75a5dfbf3a38107b9c1 Mon Sep 17 00:00:00 2001
 From: Jonathan Yong <10walls@gmail.com>
 Date: Sat, 28 Jun 2014 10:05:50 +0800
-Subject: [PATCH 07/18] Cygwin: define RTS_CONTROL_ENABLE and
+Subject: [PATCH 05/13] Cygwin: define RTS_CONTROL_ENABLE and
  DTR_CONTROL_ENABLE
 
 ---
  gcc/ada/s-oscons-tmplt.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
-index 2a1be803b41..ceaef9e7f69 100644
+index 582c35ef7db..0832c6aed15 100644
 --- a/gcc/ada/s-oscons-tmplt.c
 +++ b/gcc/ada/s-oscons-tmplt.c
-@@ -1007,6 +1007,11 @@ CND(VEOL2, "Alternative EOL")
+@@ -1044,6 +1044,11 @@ CND(VEOL2, "Alternative EOL")
 
  #endif /* HAVE_TERMIOS */
 
@@ -25,5 +25,5 @@ index 2a1be803b41..ceaef9e7f69 100644
  CNU(DTR_CONTROL_ENABLE, "Enable DTR flow ctrl")
  CNU(RTS_CONTROL_ENABLE, "Enable RTS flow ctrl")
 -- 
-2.28.0
+2.39.0