Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

gcc: update to 13.2.0

Browse Source
This commit is contained in:
مهدي شينون (Mehdi Chinoune) 2023-09-09 07:13:28 +01:00
parent 89c1ed6b6f
commit 11c72b19b2
17 changed files with 702 additions and 1613 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/0001-Cygwin-use-SysV-ABI-on-x86_64.patch
View File

@ -1,7 +1,7 @@
From ac0fc2aa3e950e90b75254edb7f5ac73d3c8e440 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 01/11] Cygwin: use SysV ABI on x86_64
Subject: [PATCH 01/13] Cygwin: use SysV ABI on x86_64
# Conflicts:
# libitm/libitm.h
@ -88,5 +88,5 @@ index 4e415ef53a0..ff3ae90df76 100644
extern "C" void GTM_LB (const void *, size_t) ITM_REGPARM;
--
2.31.1
2.39.0

6
gcc/0002-Cygwin-add-dummy-pthread-tsaware-and-large-address-a.patch
View File

@ -1,7 +1,7 @@
From 6a9cba89d748b0d9b6faef736a86da89c1b1dcbd 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 02/11] Cygwin: add dummy -pthread, -tsaware and
Subject: [PATCH 02/13] Cygwin: add dummy -pthread, -tsaware and
--large-address-aware for executables only
---
@ -55,5 +55,5 @@ index fcec11db6ad..4062e41a780 100644
+
; Retain blank line above
--
2.31.1
2.39.0

8
gcc/0003-Cygwin-handle-dllimport-properly-in-medium-model-V2.patch
View File

@ -1,14 +1,14 @@
From 02b0d17cffc53ccc5f8a6d37d0023dea4698db88 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 03/11] 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 b1df8548af6..ceb648b8f56 100644
index b815aca0da7..c71eed7f60c 100644
--- a/gcc/config/i386/predicates.md
+++ b/gcc/config/i386/predicates.md
@@ -202,6 +202,7 @@
@ -31,5 +31,5 @@ index b1df8548af6..ceb648b8f56 100644
return (ix86_cmodel == CM_SMALL
|| (ix86_cmodel == CM_MEDIUM
--
2.31.1
2.39.0

6
gcc/0004-Cygwin-MinGW-skip-test.patch
View File

@ -1,7 +1,7 @@
From c19eebe317edbdc29924be1e58ba9db6fd1e020c 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 04/11] 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.31.1
2.39.0

6
gcc/0005-Cygwin-define-RTS_CONTROL_ENABLE-and-DTR_CONTROL_ENA.patch
View File

@ -1,7 +1,7 @@
From 36da0aff82f9f7e03351ad757fd372866360c513 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 05/11] Cygwin: define RTS_CONTROL_ENABLE and
Subject: [PATCH 05/13] Cygwin: define RTS_CONTROL_ENABLE and
DTR_CONTROL_ENABLE
---
@ -25,5 +25,5 @@ index 582c35ef7db..0832c6aed15 100644
CNU(DTR_CONTROL_ENABLE, "Enable DTR flow ctrl")
CNU(RTS_CONTROL_ENABLE, "Enable RTS flow ctrl")
--
2.31.1
2.39.0

30
gcc/0006-Cygwin-fix-some-implicit-declaration-warnings-and-re.patch
View File

@ -1,7 +1,7 @@
From 81dd139464851507ecdc4da2a86d802e098998c3 Mon Sep 17 00:00:00 2001
From 0172e3fb2da05cf7a89b4c363dd386593d808a42 Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Sat, 28 Jun 2014 10:08:25 +0800
Subject: [PATCH 06/11] Cygwin: fix some implicit declaration warnings and
Subject: [PATCH 06/13] Cygwin: fix some implicit declaration warnings and
regenerate configure
# Conflicts:
@ -24,19 +24,8 @@ index 6db0e508517..dfa4c6cac10 100644
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
@@ -157,7 +159,9 @@ if test $ac_cv_os_cray = yes; then
fi
AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
-[AC_TRY_RUN([find_stack_direction ()
+[AC_TRY_RUN([
+#include <stdlib.h>
+find_stack_direction ()
{
static char *addr = 0;
auto char dummy;
diff --git a/libiberty/configure b/libiberty/configure
index 2ea7c119809..bf899c3e463 100755
index e4d49732a09..ceb16cf16d9 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -681,6 +681,7 @@ infodir
@ -88,16 +77,7 @@ index 2ea7c119809..bf899c3e463 100755
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -6722,6 +6734,8 @@ else
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+
+#include <stdlib.h>
find_stack_direction ()
{
static char *addr = 0;
@@ -7556,6 +7570,8 @@ else
@@ -7583,6 +7597,8 @@ else
/* Test by Jim Wilson and Kaveh Ghazi.
Check whether strncmp reads past the end of its string parameters. */
#include <sys/types.h>
@ -107,5 +87,5 @@ index 2ea7c119809..bf899c3e463 100755
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
--
2.31.1
2.39.0

18
gcc/0007-Cygwin-__cxa-atexit.patch
View File

@ -1,7 +1,7 @@
From e83f365cde50e5566b270efd9b69ddc6eb900979 Mon Sep 17 00:00:00 2001
From c4dd31d2a2c6dfa1f68393e6b57d2e4f9dd19a62 Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Thu, 30 Oct 2014 17:15:02 +0800
Subject: [PATCH 07/11] Cygwin: __cxa-atexit
Subject: [PATCH 07/13] Cygwin: __cxa-atexit
---
gcc/config.gcc | 2 ++
@ -9,10 +9,10 @@ Subject: [PATCH 07/11] Cygwin: __cxa-atexit
2 files changed, 6 insertions(+)
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 357b0bed067..d67edad6df3 100644
index 5636acc2270..7a654f18923 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2130,6 +2130,7 @@ i[34567]86-*-cygwin*)
@@ -2135,6 +2135,7 @@ i[34567]86-*-cygwin*)
fi
default_use_cxa_atexit=yes
use_gcc_stdint=wrap
@ -20,14 +20,6 @@ index 357b0bed067..d67edad6df3 100644
;;
x86_64-*-cygwin*)
need_64bit_isa=yes
@@ -2744,6 +2745,7 @@ mipstx39-*-elf* | mipstx39el-*-elf*)
mmix-knuth-mmixware)
tm_file="${tm_file} newlib-stdint.h"
use_gcc_stdint=wrap
+ default_use_cxa_atexit=yes
;;
mn10300-*-*)
tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
diff --git a/libgcc/config/i386/cygming-crtbegin.c b/libgcc/config/i386/cygming-crtbegin.c
index a89dfedca76..76fd3907ec5 100644
--- a/libgcc/config/i386/cygming-crtbegin.c
@ -45,5 +37,5 @@ index a89dfedca76..76fd3907ec5 100644
}
--
2.31.1
2.39.0

10
gcc/0008-Cygwin-libgomp-soname.patch
View File

@ -1,7 +1,7 @@
From dd48146333726ea442a0f8faab3a76480723142f Mon Sep 17 00:00:00 2001
From 7a645349468c61bb1b843ffac6a06d22a61d243c Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Tue, 8 Sep 2020 15:05:44 +0200
Subject: [PATCH 08/11] Cygwin: libgomp soname
Subject: [PATCH 08/13] Cygwin: libgomp soname
---
libgomp/config/cygwin/plugin-suffix.h | 2 ++
@ -55,7 +55,7 @@ diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
index fe2bf1dac51..f539a6b9302 100644
--- a/libgomp/configure.tgt
+++ b/libgomp/configure.tgt
@@ -137,6 +137,10 @@ case "${target}" in
@@ -141,6 +141,10 @@ case "${target}" in
esac
;;
@ -70,7 +70,7 @@ diff --git a/libgomp/target.c b/libgomp/target.c
index 4a4e1f80745..05264438992 100644
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -3299,7 +3299,7 @@ gomp_target_fini (void)
@@ -3844,7 +3844,7 @@ gomp_target_fini (void)
static void
gomp_target_init (void)
{
@ -80,5 +80,5 @@ index 4a4e1f80745..05264438992 100644
const char *cur, *next;
char *plugin_name;
--
2.31.1
2.39.0

14
gcc/0009-Cygwin-g-time.patch
View File

@ -1,7 +1,7 @@
From dea21ec4ce182bc5061bbc82e2f3ac59b4423412 Mon Sep 17 00:00:00 2001
From 0daaffabbb1de0118b09170e54611329c61f95ba Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Tue, 8 Sep 2020 15:21:56 +0200
Subject: [PATCH 09/11] Cygwin: g++ time
Subject: [PATCH 09/13] Cygwin: g++ time
---
libstdc++-v3/acinclude.m4 | 3 +++
@ -9,10 +9,10 @@ Subject: [PATCH 09/11] Cygwin: g++ time
2 files changed, 6 insertions(+)
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 1c0a4c13052..2f348df1986 100644
index 15c975ff86e..b5b80ad43a3 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1418,7 +1418,10 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
@@ -1350,7 +1350,10 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
case "${target_os}" in
cygwin*)
@ -24,10 +24,10 @@ index 1c0a4c13052..2f348df1986 100644
darwin*)
ac_has_nanosleep=yes
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 326a279c54f..7a461b53c88 100755
index 3120d5855f6..cfc9d5f8ceb 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -20519,7 +20519,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -20487,7 +20487,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
case "${target_os}" in
cygwin*)
@ -39,5 +39,5 @@ index 326a279c54f..7a461b53c88 100755
darwin*)
ac_has_nanosleep=yes
--
2.31.1
2.39.0

6
gcc/0010-Cygwin-newlib-ftm.patch
View File

@ -1,7 +1,7 @@
From 4720c7647c3e1a8c5cf29201ab3c715227649053 Mon Sep 17 00:00:00 2001
From 7b152583446b4c4762f0af4c51a8f73d7d6e2d6a Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Tue, 8 Sep 2020 15:24:34 +0200
Subject: [PATCH 10/11] Cygwin: newlib ftm
Subject: [PATCH 10/13] Cygwin: newlib ftm
---
gcc/glimits.h | 2 +-
@ -21,5 +21,5 @@ index 3cd7cf64e63..3905d7bedd2 100644
# undef LONG_LONG_MIN
# define LONG_LONG_MIN (-LONG_LONG_MAX - 1LL)
--
2.31.1
2.39.0

6
gcc/0011-Cygwin-define-STD_UNIX.patch
View File

@ -1,7 +1,7 @@
From d765745e9fd657ba1b0661cb3dac997a091bcaf1 Mon Sep 17 00:00:00 2001
From 1c0c870dd97ab95688ba703122d4fe42b12ec240 Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Tue, 8 Sep 2020 15:26:02 +0200
Subject: [PATCH 11/11] Cygwin: define STD_UNIX
Subject: [PATCH 11/13] Cygwin: define STD_UNIX
---
gcc/config/i386/cygwin.h | 4 +---
@ -30,5 +30,5 @@ index c42224a7824..e4e668fbba9 100644
%{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ %{!ansi:-DWINNT}} \
%{!nostdinc:%{!mno-win32:-idirafter ../include/w32api%s -idirafter ../../include/w32api%s}}\
--
2.31.1
2.39.0

48
gcc/0101-Cygwin-enable-libgccjit-not-just-for-MingW.patch
View File

@ -1,7 +1,7 @@
From 38fae7faa3405611b2cce41de639aa3351dbc048 Mon Sep 17 00:00:00 2001
From 120e9b293a8e9495a90d7b316e027a6286e7a5fc Mon Sep 17 00:00:00 2001
From: Achim Gratz <Achim.Gratz@Stromeko.DE>
Date: Sun, 25 Apr 2021 11:33:55 +0200
Subject: [PATCH 1/2] Cygwin: enable libgccjit not just for MingW
Subject: [PATCH 12/13] Cygwin: enable libgccjit not just for MingW
---
configure | 17 +++++++++++++++--
@ -12,10 +12,10 @@ Subject: [PATCH 1/2] Cygwin: enable libgccjit not just for MingW
5 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 504f6410274..fc0dd15f3e9 100755
index e218a19e333..b43d5b8124d 100755
--- a/configure
+++ b/configure
@@ -756,6 +756,7 @@ infodir
@@ -766,6 +766,7 @@ infodir
docdir
oldincludedir
includedir
@ -23,7 +23,7 @@ index 504f6410274..fc0dd15f3e9 100755
localstatedir
sharedstatedir
sysconfdir
@@ -922,6 +923,7 @@ datadir='${datarootdir}'
@@ -934,6 +935,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
@ -31,7 +31,7 @@ index 504f6410274..fc0dd15f3e9 100755
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1174,6 +1176,15 @@ do
@@ -1186,6 +1188,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@ -47,7 +47,7 @@ index 504f6410274..fc0dd15f3e9 100755
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1311,7 +1322,7 @@ fi
@@ -1323,7 +1334,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
@ -56,7 +56,7 @@ index 504f6410274..fc0dd15f3e9 100755
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1471,6 +1482,7 @@ Fine tuning of the installation directories:
@@ -1483,6 +1494,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
@ -64,7 +64,7 @@ index 504f6410274..fc0dd15f3e9 100755
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -8492,6 +8504,7 @@ $as_echo "$as_me: WARNING: GNAT is required to build $language" >&2;}
@@ -8900,6 +8912,7 @@ $as_echo "$as_me: WARNING: GNAT is required to build $language" >&2;}
# is position independent code (PIC).
case $target in
*mingw*) ;;
@ -72,7 +72,7 @@ index 504f6410274..fc0dd15f3e9 100755
*)
case ${add_this_lang}:${language}:${host_shared} in
yes:jit:no)
@@ -8516,7 +8529,7 @@ $as_echo "$as_me: WARNING: --enable-host-shared required to build $language" >&2
@@ -8924,7 +8937,7 @@ $as_echo "$as_me: WARNING: --enable-host-shared required to build $language" >&2
# Silently disable.
add_this_lang=unsupported
;;
@ -82,10 +82,10 @@ index 504f6410274..fc0dd15f3e9 100755
esac
diff --git a/configure.ac b/configure.ac
index 088e735c5db..7f452989b82 100644
index 7e8e628b325..a688d4ae24a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2089,6 +2089,7 @@ if test -d ${srcdir}/gcc; then
@@ -2166,6 +2166,7 @@ if test -d ${srcdir}/gcc; then
# is position independent code (PIC).
case $target in
*mingw*) ;;
@ -93,7 +93,7 @@ index 088e735c5db..7f452989b82 100644
*)
case ${add_this_lang}:${language}:${host_shared} in
yes:jit:no)
@@ -2112,7 +2113,7 @@ directories, to avoid imposing the performance cost of
@@ -2189,7 +2190,7 @@ directories, to avoid imposing the performance cost of
# Silently disable.
add_this_lang=unsupported
;;
@ -106,7 +106,7 @@ diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 155be74efdb..b750114185c 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -285,7 +285,7 @@ c++.install-plugin: installdirs
@@ -286,7 +286,7 @@ c++.install-plugin: installdirs
# Install import library.
ifeq ($(plugin_implib),yes)
$(mkinstalldirs) $(DESTDIR)$(plugin_resourcesdir)
@ -115,9 +115,11 @@ index 155be74efdb..b750114185c 100644
endif
c++.uninstall:
--- gcc-11.3.0/gcc/jit/Make-lang.in.orig 2022-04-21 09:58:53.343586600 +0200
+++ gcc-11.3.0/gcc/jit/Make-lang.in 2022-05-13 19:47:18.555238500 +0200
@@ -44,8 +44,13 @@
diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in
index 2a774d7feb1..6bd882c5ddf 100644
--- a/gcc/jit/Make-lang.in
+++ b/gcc/jit/Make-lang.in
@@ -44,8 +44,13 @@ LIBGCCJIT_VERSION_NUM = 0
LIBGCCJIT_MINOR_NUM = 0
LIBGCCJIT_RELEASE_NUM = 1
@ -133,7 +135,7 @@ index 155be74efdb..b750114185c 100644
LIBGCCJIT_IMPORT_LIB = libgccjit.dll.a
jit: $(LIBGCCJIT_FILENAME) \
@@ -139,7 +144,7 @@
@@ -139,7 +144,7 @@ endif
# Use strict warnings for this front end.
jit-warn = $(STRICT_WARN)
@ -142,7 +144,7 @@ index 155be74efdb..b750114185c 100644
# Create import library
LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB)
else
@@ -173,7 +178,7 @@
@@ -173,7 +178,7 @@ $(LIBGCCJIT_FILENAME): $(jit_OBJS) \
@$(call LINK_PROGRESS,$(INDEX.jit),end)
# Create symlinks when not building for Windows
@ -151,7 +153,7 @@ index 155be74efdb..b750114185c 100644
ifeq (,$(findstring darwin,$(host)))
# but only one level for Darwin, version info is embedded.
@@ -359,7 +364,7 @@
@@ -359,7 +364,7 @@ jit.install-headers: installdirs
$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
$(DESTDIR)$(includedir)/libgccjit++.h
@ -161,10 +163,10 @@ index 155be74efdb..b750114185c 100644
# Install import library
$(INSTALL_PROGRAM) $(LIBGCCJIT_IMPORT_LIB) \
diff --git a/gcc/system.h b/gcc/system.h
index a3f5948aaee..97b91b33afa 100644
index b13e9429577..42ccb48e671 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -688,8 +688,9 @@ extern int vsnprintf (char *, size_t, const char *, va_list);
@@ -693,8 +693,9 @@ extern int vsnprintf (char *, size_t, const char *, va_list);
# endif
#endif
@ -177,5 +179,5 @@ index a3f5948aaee..97b91b33afa 100644
#endif
--
2.31.1
2.39.0

32
gcc/0102-Cygwin-testsuite-fixes-for-libgccjit.patch
View File

@ -1,24 +1,24 @@
From 068dd234b9c42fdb7b8a44c66c186a8f5059d43e Mon Sep 17 00:00:00 2001
From 13b3250e3680ff72440506fba78e65cb83db1477 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Achim.Gratz@Stromeko.DE>
Date: Sun, 25 Apr 2021 11:57:09 +0200
Subject: [PATCH 2/2] Cygwin: testsuite fixes for libgccjit
Date: Sat, 30 Apr 2022 15:48:50 +0200
Subject: [PATCH 13/13] Cygwin: testsuite fixes for libgccjit
The .exe suffix is handled specially by Cygwin, so using that for JIT
objects make the testsuite fail almost all tests. Changing the suffix
doesn't quite work everywhere unfortunately.
---
gcc/testsuite/jit.dg/jit.exp | 12 ++++++------
gcc/testsuite/jit.dg/test-compile-to-assembler.c | 2 +-
.../jit.dg/test-compile-to-dynamic-library.c | 2 +-
gcc/testsuite/jit.dg/test-compile-to-executable.c | 4 ++--
gcc/testsuite/jit.dg/test-compile-to-object.c | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
gcc/testsuite/jit.dg/jit.exp | 10 +++++-----
gcc/testsuite/jit.dg/test-compile-to-assembler.c | 2 +-
gcc/testsuite/jit.dg/test-compile-to-dynamic-library.c | 2 +-
gcc/testsuite/jit.dg/test-compile-to-executable.c | 4 ++--
gcc/testsuite/jit.dg/test-compile-to-object.c | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/gcc/testsuite/jit.dg/jit.exp b/gcc/testsuite/jit.dg/jit.exp
index 9af87f9c6ad..f261a25d2f5 100644
index 90e5122b346..a5072027677 100644
--- a/gcc/testsuite/jit.dg/jit.exp
+++ b/gcc/testsuite/jit.dg/jit.exp
@@ -449,7 +449,7 @@ proc jit-dg-test { prog do_what extra_tool_flags } {
@@ -521,7 +521,7 @@ proc jit-dg-test { prog do_what extra_tool_flags } {
# This also ensures that the source name makes it into the
# pass/fail output, so that we can distinguish e.g. which test-foo
# is failing.
@ -27,7 +27,7 @@ index 9af87f9c6ad..f261a25d2f5 100644
verbose "output_file: $output_file"
# Create the test executable:
@@ -590,7 +590,7 @@ proc jit-dg-test { prog do_what extra_tool_flags } {
@@ -662,7 +662,7 @@ proc jit-dg-test { prog do_what extra_tool_flags } {
# Verify that a reproducer was generated
if { [file exists $generated_reproducer] == 1} {
pass "found generated reproducer: $generated_reproducer"
@ -36,7 +36,7 @@ index 9af87f9c6ad..f261a25d2f5 100644
# (this overwrites output_file)
# Try to compile the generated reproducer
@@ -764,7 +764,7 @@ proc jit-verify-assembler { args } {
@@ -836,7 +836,7 @@ proc jit-verify-assembler { args } {
# Name the built executable as OUTPUT_FILENAME with
# ".exe" appended.
@ -45,7 +45,7 @@ index 9af87f9c6ad..f261a25d2f5 100644
verbose " executable_from_asm: ${executable_from_asm}"
# Invoke the driver to assemble/link the .s file to the .exe
@@ -812,7 +812,7 @@ proc jit-verify-object { args } {
@@ -917,7 +917,7 @@ proc jit-verify-object { args } {
# Name the linked executable as OUTPUT_FILENAME with
# ".exe" appended.
@ -54,7 +54,7 @@ index 9af87f9c6ad..f261a25d2f5 100644
verbose " executable_from_obj: ${executable_from_obj}"
# Invoke the driver to link the .o file to the .exe
@@ -864,7 +864,7 @@ proc jit-verify-dynamic-library { args } {
@@ -969,7 +969,7 @@ proc jit-verify-dynamic-library { args } {
# Build a test executable from
# verify-dynamic-library.c
set test_src "verify-dynamic-library.c"
@ -110,5 +110,5 @@ index 81d41c21d40..56914cf9e20 100644
-/* { dg-final { jit-verify-object "hello from ./output-of-test-compile-to-object.c.o.exe" } } */
+/* { dg-final { jit-verify-object "hello from ./output-of-test-compile-to-object.c.o.xox" } } */
--
2.31.1
2.39.0

1808
gcc/0950-11.2.0-configure-msys2.patch
View File

File diff suppressed because it is too large Load Diff

98
gcc/0951-11.2.0-msys2-spec.patch
View File

@ -1,10 +1,10 @@
diff -Naur gcc-11.2.0-orig/gcc/config/i386/msys.h gcc-11.2.0/gcc/config/i386/msys.h
--- gcc-11.2.0-orig/gcc/config/i386/msys.h 1970-01-01 01:00:00.000000000 +0100
+++ gcc-11.2.0/gcc/config/i386/msys.h 2021-11-29 18:38:05.978448000 +0100
@@ -0,0 +1,169 @@
diff -Naur gcc-13.2.0-orig/gcc/config/i386/msys.h gcc-13.2.0/gcc/config/i386/msys.h
--- gcc-13.2.0-orig/gcc/config/i386/msys.h 1970-01-01 01:00:00.000000000 +0100
+++ gcc-13.2.0/gcc/config/i386/msys.h 2023-09-12 13:31:33.348712400 +0100
@@ -0,0 +1,160 @@
+/* Operating system specific defines to be used when targeting GCC for
+ hosting on Windows32, using a Unix style C library and tools.
+ Copyright (C) 1995-2021 Free Software Foundation, Inc.
+ Copyright (C) 1995-2023 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
@ -33,15 +33,6 @@ diff -Naur gcc-11.2.0-orig/gcc/config/i386/msys.h gcc-11.2.0/gcc/config/i386/msy
+ } \
+ while (0)
+
+#define EXTRA_TARGET_D_OS_VERSIONS() \
+ do \
+ { \
+ builtin_version ("Cygwin"); \
+ builtin_version ("Posix"); \
+ builtin_version ("CRuntime_Newlib"); \
+ } \
+ while (0)
+
+#undef CPP_SPEC
+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
+ %{pthread:-D_REENTRANT} \
@ -60,7 +51,7 @@ diff -Naur gcc-11.2.0-orig/gcc/config/i386/msys.h gcc-11.2.0/gcc/config/i386/msy
+
+#undef ENDFILE_SPEC
+#define ENDFILE_SPEC \
+ "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s}\
+ "%{mdaz-ftz:crtfastmath.o%s;Ofast|ffast-math|funsafe-math-optimizations:%{!shared:%{!mno-daz-ftz:crtfastmath.o%s}}} \
+ %{!shared:%:if-exists(default-manifest.o%s)}\
+ %{fvtable-verify=none:%s; \
+ fvtable-verify=preinit:vtv_end.o%s; \
@ -171,14 +162,14 @@ diff -Naur gcc-11.2.0-orig/gcc/config/i386/msys.h gcc-11.2.0/gcc/config/i386/msy
+#define HAVE_ENABLE_EXECUTE_STACK
+#undef CHECK_EXECUTE_STACK_ENABLED
+#define CHECK_EXECUTE_STACK_ENABLED flag_setstackexecutable
diff -Naur gcc-11.2.0-orig/gcc/config/i386/msys-w64.h gcc-11.2.0/gcc/config/i386/msys-w64.h
--- gcc-11.2.0-orig/gcc/config/i386/msys-w64.h 1970-01-01 01:00:00.000000000 +0100
+++ gcc-11.2.0/gcc/config/i386/msys-w64.h 2021-11-29 18:38:32.980656600 +0100
@@ -0,0 +1,84 @@
diff -Naur gcc-13.2.0-orig/gcc/config/i386/msys-w64.h gcc-13.2.0/gcc/config/i386/msys-w64.h
--- gcc-13.2.0-orig/gcc/config/i386/msys-w64.h 1970-01-01 01:00:00.000000000 +0100
+++ gcc-13.2.0/gcc/config/i386/msys-w64.h 2023-09-12 13:11:45.732746500 +0100
@@ -0,0 +1,85 @@
+/* Operating system specific defines to be used when targeting GCC for
+ hosting on Windows 32/64 via MSYS runtime, using GNU tools and
+ the Windows API Library.
+ Copyright (C) 2013-2021 Free Software Foundation, Inc.
+ Copyright (C) 2013-2023 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
@ -249,6 +240,7 @@ diff -Naur gcc-11.2.0-orig/gcc/config/i386/msys-w64.h gcc-11.2.0/gcc/config/i386
+
+/* MSYS64 will have a 64-bit long type. */
+#undef LONG_TYPE_SIZE
+#undef LONG_TYPE_SIZE
+#define LONG_TYPE_SIZE (TARGET_64BIT ? 64 : 32)
+
+/* Override default "long long unsigned int" from cygming.h. */
@ -259,17 +251,17 @@ diff -Naur gcc-11.2.0-orig/gcc/config/i386/msys-w64.h gcc-11.2.0/gcc/config/i386
+
+#undef LIBGCC_SONAME
+#define LIBGCC_SONAME "msys-gcc_s-seh-1.dll"
diff -Naur gcc-11.2.0-orig/gcc/config/i386/t-msys-w64 gcc-11.2.0/gcc/config/i386/t-msys-w64
--- gcc-11.2.0-orig/gcc/config/i386/t-msys-w64 1970-01-01 01:00:00.000000000 +0100
+++ gcc-11.2.0/gcc/config/i386/t-msys-w64 2021-11-29 18:12:45.673915500 +0100
diff -Naur gcc-13.2.0-orig/gcc/config/i386/t-msys-w64 gcc-13.2.0/gcc/config/i386/t-msys-w64
--- gcc-13.2.0-orig/gcc/config/i386/t-msys-w64 1970-01-01 01:00:00.000000000 +0100
+++ gcc-13.2.0/gcc/config/i386/t-msys-w64 2023-09-12 13:12:22.066839500 +0100
@@ -0,0 +1,3 @@
+MULTILIB_OPTIONS = m64/m32
+MULTILIB_DIRNAMES = 64
+MULTILIB_OSDIRNAMES = ../lib ../lib32
diff -Naur gcc-11.2.0-orig/gcc/config.build gcc-11.2.0/gcc/config.build
--- gcc-11.2.0-orig/gcc/config.build 2021-11-29 18:10:13.181836300 +0100
+++ gcc-11.2.0/gcc/config.build 2021-11-29 18:14:10.848892300 +0100
@@ -60,6 +60,10 @@
diff -Naur gcc-13.2.0-orig/gcc/config.build gcc-13.2.0/gcc/config.build
--- gcc-13.2.0-orig/gcc/config.build 2023-09-12 12:53:16.894699700 +0100
+++ gcc-13.2.0/gcc/config.build 2023-09-12 13:00:15.495551700 +0100
@@ -57,6 +57,10 @@
build_xm_file=i386/xm-cygwin.h
build_exeext=.exe
;;
@ -280,23 +272,23 @@ diff -Naur gcc-11.2.0-orig/gcc/config.build gcc-11.2.0/gcc/config.build
i[34567]86-*-mingw32* | x86_64-*-mingw*)
build_xm_file=i386/xm-mingw32.h
build_exeext=.exe
diff -Naur gcc-11.2.0-orig/gcc/config.gcc gcc-11.2.0/gcc/config.gcc
--- gcc-11.2.0-orig/gcc/config.gcc 2021-11-29 18:10:12.684013600 +0100
+++ gcc-11.2.0/gcc/config.gcc 2021-11-29 18:17:03.841123600 +0100
@@ -2151,6 +2151,43 @@
diff -Naur gcc-13.2.0-orig/gcc/config.gcc gcc-13.2.0/gcc/config.gcc
--- gcc-13.2.0-orig/gcc/config.gcc 2023-09-12 12:53:16.600217500 +0100
+++ gcc-13.2.0/gcc/config.gcc 2023-09-12 13:44:28.139343300 +0100
@@ -2122,6 +2122,43 @@
use_gcc_stdint=wrap
tm_defines="${tm_defines} TARGET_CYGWIN64=1"
;;
+i[34567]86-*-msys*)
+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/msys.h i386/cygwin-stdint.h"
+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h i386/msys.h i386/cygwin-stdint.h"
+ xm_file=i386/xm-cygwin.h
+ tmake_file="${tmake_file} i386/t-cygming t-slibgcc"
+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.c"
+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc"
+ extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
+ extra_objs="${extra_objs} winnt.o winnt-stubs.o"
+ c_target_objs="${c_target_objs} msformat-c.o"
+ cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
+ d_target_objs="${d_target_objs} winnt-d.o"
+ d_target_objs="${d_target_objs} cygwin-d.o"
+ target_has_targetdm="yes"
+ if test x$enable_threads = xyes; then
+ thread_file='posix'
@ -307,15 +299,15 @@ diff -Naur gcc-11.2.0-orig/gcc/config.gcc gcc-11.2.0/gcc/config.gcc
+ ;;
+x86_64-*-msys*)
+ need_64bit_isa=yes
+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/msys.h i386/msys-w64.h i386/cygwin-stdint.h"
+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h i386/msys.h i386/msys-w64.h i386/cygwin-stdint.h"
+ xm_file=i386/xm-cygwin.h
+ tmake_file="${tmake_file} i386/t-cygming t-slibgcc i386/t-msys-w64"
+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.c"
+ tmake_file="${tmake_file} i386/t-cygming t-slibgcc"
+ target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.cc"
+ extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
+ extra_objs="${extra_objs} winnt.o winnt-stubs.o"
+ c_target_objs="${c_target_objs} msformat-c.o"
+ cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
+ d_target_objs="${d_target_objs} winnt-d.o"
+ d_target_objs="${d_target_objs} cygwin-d.o"
+ target_has_targetdm="yes"
+ if test x$enable_threads = xyes; then
+ thread_file='posix'
@ -325,9 +317,9 @@ diff -Naur gcc-11.2.0-orig/gcc/config.gcc gcc-11.2.0/gcc/config.gcc
+ tm_defines="${tm_defines} TARGET_CYGWIN64=1"
+ ;;
i[34567]86-*-mingw* | x86_64-*-mingw*)
tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h"
tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/cygming.h"
xm_file=i386/xm-mingw32.h
@@ -5323,6 +5360,8 @@
@@ -5672,6 +5709,8 @@
;;
i[34567]86-*-cygwin* | x86_64-*-cygwin*)
;;
@ -336,10 +328,10 @@ diff -Naur gcc-11.2.0-orig/gcc/config.gcc gcc-11.2.0/gcc/config.gcc
i[34567]86-*-mingw* | x86_64-*-mingw*)
;;
i[34567]86-*-dragonfly* | x86_64-*-dragonfly*)
diff -Naur gcc-11.2.0-orig/gcc/config.host gcc-11.2.0/gcc/config.host
--- gcc-11.2.0-orig/gcc/config.host 2021-11-29 18:09:13.057177000 +0100
+++ gcc-11.2.0/gcc/config.host 2021-11-29 18:28:12.291886400 +0100
@@ -234,6 +234,13 @@
diff -Naur gcc-13.2.0-orig/gcc/config.host gcc-13.2.0/gcc/config.host
--- gcc-13.2.0-orig/gcc/config.host 2023-09-12 12:53:13.960945500 +0100
+++ gcc-13.2.0/gcc/config.host 2023-09-12 13:02:58.203239500 +0100
@@ -230,6 +230,13 @@
host_exeext=.exe
host_lto_plugin_soname=cyglto_plugin.dll
;;
@ -352,10 +344,10 @@ diff -Naur gcc-11.2.0-orig/gcc/config.host gcc-11.2.0/gcc/config.host
+ ;;
i[34567]86-*-mingw32*)
host_xm_file=i386/xm-mingw32.h
host_xmake_file="${host_xmake_file} i386/x-mingw32"
diff -Naur gcc-11.2.0-orig/libgcc/config/i386/t-msys gcc-11.2.0/libgcc/config/i386/t-msys
--- gcc-11.2.0-orig/libgcc/config/i386/t-msys 1970-01-01 01:00:00.000000000 +0100
+++ gcc-11.2.0/libgcc/config/i386/t-msys 2021-11-29 18:26:44.557989800 +0100
host_xmake_file="${host_xmake_file} i386/x-mingw32 i386/x-mingw32-utf8"
diff -Naur gcc-13.2.0-orig/libgcc/config/i386/t-msys gcc-13.2.0/libgcc/config/i386/t-msys
--- gcc-13.2.0-orig/libgcc/config/i386/t-msys 1970-01-01 01:00:00.000000000 +0100
+++ gcc-13.2.0/libgcc/config/i386/t-msys 2023-09-12 13:14:31.324573000 +0100
@@ -0,0 +1,19 @@
+# If we are building next to winsup, this will let us find the real
+# limits.h when building libgcc2. Otherwise, winsup must be installed
@ -376,10 +368,10 @@ diff -Naur gcc-11.2.0-orig/libgcc/config/i386/t-msys gcc-11.2.0/libgcc/config/i3
+# We'd like to use SHLIB_SONAME here too, and we can, since
+# we don't rely on shlib_base_name substitution for it.
+SHLIB_MKMAP_OPTS = -v pe_dll=$(SHLIB_SONAME)
diff -Naur gcc-11.2.0-orig/libgcc/config.host gcc-11.2.0/libgcc/config.host
--- gcc-11.2.0-orig/libgcc/config.host 2021-11-29 18:10:34.010264000 +0100
+++ gcc-11.2.0/libgcc/config.host 2021-11-29 18:20:16.479939100 +0100
@@ -350,6 +350,9 @@
diff -Naur gcc-13.2.0-orig/libgcc/config.host gcc-13.2.0/libgcc/config.host
--- gcc-13.2.0-orig/libgcc/config.host 2023-09-12 12:51:10.404290400 +0100
+++ gcc-13.2.0/libgcc/config.host 2023-09-12 13:37:04.237380300 +0100
@@ -380,6 +380,9 @@
i[34567]86-*-cygwin* | x86_64-*-cygwin*)
enable_execute_stack=config/i386/enable-execute-stack-mingw32.c
;;
@ -389,7 +381,7 @@ diff -Naur gcc-11.2.0-orig/libgcc/config.host gcc-11.2.0/libgcc/config.host
*)
enable_execute_stack=enable-execute-stack-empty.c;
;;
@@ -819,6 +822,48 @@
@@ -837,6 +840,48 @@
# FIXME - dj - t-chkstk used to be in here, need a 64-bit version of that
tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-cygwin t-crtfm t-dfprules i386/t-chkstk"
;;

85
gcc/0953-11.2.0-testsuite-msys2.patch
View File

@ -53,8 +53,8 @@ diff -Naur gcc-11.2.0-orig/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C gcc-1
// Test for conversion from stateless lambda to function pointer.
// { dg-do compile { target c++11_only } }
-// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-hpux10* } } } } }
+// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-msys *-*-hpux10* } } } } }
-// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin } } } } }
+// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-msys } } } } }
inline void f()
{
@ -580,75 +580,6 @@ diff -Naur gcc-11.2.0-orig/gcc/testsuite/gcc.target/x86_64/abi/ms-sysv/ms-sysv.e
runtest_ms_sysv "-mcall-ms2sysv-xlogues$cflags" "$gen_opts"
}
}
diff -Naur gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/bind_c_array_params_2.f90 gcc-11.2.0/gcc/testsuite/gfortran.dg/bind_c_array_params_2.f90
--- gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/bind_c_array_params_2.f90 2021-11-29 16:31:42.999824700 +0100
+++ gcc-11.2.0/gcc/testsuite/gfortran.dg/bind_c_array_params_2.f90 2021-11-29 16:43:00.089273200 +0100
@@ -16,9 +16,9 @@
call test(aa)
end
-! { dg-final { scan-assembler-times "\[ \t\]\[$,_0-9\]*myBindC" 1 { target { ! { hppa*-*-* s390*-*-* *-*-cygwin* amdgcn*-*-* } } } } }
+! { dg-final { scan-assembler-times "\[ \t\]\[$,_0-9\]*myBindC" 1 { target { ! { hppa*-*-* s390*-*-* *-*-cygwin* *-*-msys* amdgcn*-*-* } } } } }
! { dg-final { scan-assembler-times "myBindC,%r2" 1 { target { hppa*-*-* } } } }
-! { dg-final { scan-assembler-times "call\tmyBindC" 1 { target { *-*-cygwin* } } } }
+! { dg-final { scan-assembler-times "call\tmyBindC" 1 { target { *-*-cygwin* *-*-msys* } } } }
! { dg-final { scan-assembler-times "brasl\t%r\[0-9\]*,myBindC" 1 { target { s390*-*-* } } } }
! { dg-final { scan-assembler-times "add_u32\t\[sv\]\[0-9\]*, \[sv\]\[0-9\]*, myBindC@rel32@lo" 1 { target { amdgcn*-*-* } } } }
! { dg-final { scan-tree-dump-times "cfi_desc_to_gfc_desc \\\(&parm\\." 1 "original" } }
diff -Naur gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/chmod_1.f90 gcc-11.2.0/gcc/testsuite/gfortran.dg/chmod_1.f90
--- gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/chmod_1.f90 2021-11-29 16:31:44.378902000 +0100
+++ gcc-11.2.0/gcc/testsuite/gfortran.dg/chmod_1.f90 2021-11-29 16:43:00.089273200 +0100
@@ -1,4 +1,4 @@
-! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* } } } }
+! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* } } } }
! { dg-options "-std=gnu" }
! See PR38956. Test fails on cygwin when user has Administrator rights
implicit none
diff -Naur gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/chmod_2.f90 gcc-11.2.0/gcc/testsuite/gfortran.dg/chmod_2.f90
--- gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/chmod_2.f90 2021-11-29 16:31:44.253931700 +0100
+++ gcc-11.2.0/gcc/testsuite/gfortran.dg/chmod_2.f90 2021-11-29 16:43:00.089273200 +0100
@@ -1,4 +1,4 @@
-! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* } } } }
+! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* } } } }
! { dg-options "-std=gnu" }
! See PR38956. Test fails on cygwin when user has Administrator rights
implicit none
diff -Naur gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/chmod_3.f90 gcc-11.2.0/gcc/testsuite/gfortran.dg/chmod_3.f90
--- gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/chmod_3.f90 2021-11-29 16:31:44.332037600 +0100
+++ gcc-11.2.0/gcc/testsuite/gfortran.dg/chmod_3.f90 2021-11-29 16:43:00.089273200 +0100
@@ -1,4 +1,4 @@
-! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* } } } }
+! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* } } } }
! { dg-options "-std=gnu -fdefault-integer-8" }
! See PR38956. Test fails on cygwin when user has Administrator rights
implicit none
diff -Naur gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90 gcc-11.2.0/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90
--- gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90 2021-11-29 16:31:44.378902000 +0100
+++ gcc-11.2.0/gcc/testsuite/gfortran.dg/default_format_denormal_1.f90 2021-11-29 16:43:00.089273200 +0100
@@ -1,4 +1,4 @@
-! { dg-do run { xfail *-*-darwin[89]* *-*-cygwin* } }
+! { dg-do run { xfail *-*-darwin[89]* *-*-cygwin* *-*-msys* } }
! Test XFAILed on these platforms because the system's printf() lacks
! proper support for denormals.
!
diff -Naur gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/open_errors.f90 gcc-11.2.0/gcc/testsuite/gfortran.dg/open_errors.f90
--- gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/open_errors.f90 2021-11-29 16:31:43.849460800 +0100
+++ gcc-11.2.0/gcc/testsuite/gfortran.dg/open_errors.f90 2021-11-29 16:43:00.089273200 +0100
@@ -1,4 +1,4 @@
-! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* } } } }
+! { dg-do run { target { ! { *-*-mingw* *-*-cygwin* *-*-msys* } } } }
! PR30005 Enhanced error messages for OPEN
! Submitted by Jerry DeLisle <jvdelisle@gcc.gnu.org>
! See PR38956. Test fails on cygwin when user has Administrator rights
diff -Naur gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/winapi.f90 gcc-11.2.0/gcc/testsuite/gfortran.dg/winapi.f90
--- gcc-11.2.0-orig/gcc/testsuite/gfortran.dg/winapi.f90 2021-11-29 16:31:44.144580400 +0100
+++ gcc-11.2.0/gcc/testsuite/gfortran.dg/winapi.f90 2021-11-29 16:43:00.090274000 +0100
@@ -1,4 +1,4 @@
-! { dg-do run { target *-*-cygwin* *-*-mingw* } }
+! { dg-do run { target *-*-cygwin* *-*-msys* *-*-mingw* } }
! { dg-options "-lkernel32" }
! Test case provided by Dennis Wassel.
diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/g++.exp gcc-11.2.0/gcc/testsuite/lib/g++.exp
--- gcc-11.2.0-orig/gcc/testsuite/lib/g++.exp 2021-11-29 16:31:41.218990500 +0100
+++ gcc-11.2.0/gcc/testsuite/lib/g++.exp 2021-11-29 17:13:44.996201200 +0100
@ -673,18 +604,6 @@ diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/gcc-dg.exp gcc-11.2.0/gcc/testsuite
setenv LC_ALL C.ASCII
setenv LANG C.ASCII
}
diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/gfortran.exp gcc-11.2.0/gcc/testsuite/lib/gfortran.exp
--- gcc-11.2.0-orig/gcc/testsuite/lib/gfortran.exp 2021-11-29 16:31:41.187747200 +0100
+++ gcc-11.2.0/gcc/testsuite/lib/gfortran.exp 2021-11-29 16:41:26.248499200 +0100
@@ -161,7 +161,7 @@
# Many hosts now default to a non-ASCII C locale, however, so
# they can set a charset encoding here if they need.
- if { [ishost "*-*-cygwin*"] } {
+ if { [ishost "*-*-cygwin*"] || [ishost "*-*-msys*"] } {
setenv LC_ALL C.ASCII
setenv LANG C.ASCII
}
diff -Naur gcc-11.2.0-orig/gcc/testsuite/lib/objc.exp gcc-11.2.0/gcc/testsuite/lib/objc.exp
--- gcc-11.2.0-orig/gcc/testsuite/lib/objc.exp 2021-11-29 16:31:41.203368700 +0100
+++ gcc-11.2.0/gcc/testsuite/lib/objc.exp 2021-11-29 16:41:26.248499200 +0100

128
gcc/PKGBUILD
View File

@ -6,21 +6,17 @@
# NOTE: libtool requires rebuilt with each new gcc version
pkgbase=gcc
pkgname=('gcc' 'gcc-libs' 'gcc-fortran')
pkgver=11.3.0
pkgrel=4
pkgname=('gcc' 'gcc-libs')
pkgver=13.2.0
pkgrel=1
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL' 'custom')
license=('spdx:GPL-2.0-or-later' 'spdx:GPL-3.0-or-later' 'spdx:LGPL-2.1-or-later' 'spdx:LGPL-3.0-or-later' 'spdx:GCC-exception-3.1' 'spdx:GFDL-1.3-or-later')
url="https://gcc.gnu.org/"
makedepends=('binutils' 'mpc-devel' 'gmp-devel'
'mpfr-devel' 'isl-devel' 'zlib-devel'
'windows-default-manifest' 'autotools' 'gcc' 'gperf')
STRIP_OPTION="strip"
#STRIP_OPTION="!strip"
#DEBUG_OPTION="debug"
DEBUG_OPTION="!debug"
options=('!emptydirs' "$STRIP_OPTION" "$DEBUG_OPTION")
makedepends=('gcc' 'binutils' 'autotools'
'mpc-devel' 'gmp-devel' 'mpfr-devel' 'isl-devel' 'zlib-devel'
'windows-default-manifest' 'gperf')
options=('!emptydirs') # '!strip' 'debug')
source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.xz
0001-Cygwin-use-SysV-ABI-on-x86_64.patch
0002-Cygwin-add-dummy-pthread-tsaware-and-large-address-a.patch
@ -38,23 +34,23 @@ source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.xz
0950-11.2.0-configure-msys2.patch
0951-11.2.0-msys2-spec.patch
0953-11.2.0-testsuite-msys2.patch)
sha256sums=('b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39'
'b6b141864e1ad82779e809608c6eed61addb09c6ff7249d1a4a5db807cc5b9be'
'cfc44c9747980ef8a5dc87a654340ccf25cf4ebb4103e544fb4fc1e5a26e6120'
'9475f8b4b92d5fe2af9538c2b036a5d7528b23ae07e4c684cf84be2e7f8482cf'
'7bb81430f4f4eafa8d85bbb06ac8ec7d8d4edd937a985fa35ad05b1ff753d79a'
'838ea22edd69c86dc3e511fb162201633ac742a25f365c42be522fca57461541'
'6df1928b931de247022dd60d26b42dfb3baef3307243c657bec5f0f6c35f3074'
'a477f0acc271a05a8acf2293de38d7509672012c19b95c07d5b093bf711863a9'
'6a7a8425db0f3001c587f4f7722a6c634ef29a51fdf1990aed1c2afe253db812'
'89c239285de06224a6bf056a620b0a0defae788d194893cd39eadc06ee171e62'
'7839d88eb3cea821f51b9778c62e63bf5cc831c810ab2cc12f15e7a1633c3cb3'
'2269e9c2438e21b082ca0d136519a08a0853b896dd559a3946bd9b9e6b94fc5e'
'cfcd07c86ac35aaa41c6f60e2089a8ee9552f9e705de3aba3c7cfa7223f66cb0'
'84efaa23be80c0ccf5e0f5da0a34b17c26948bfb7c2cc89b17b455df6df5c1e4'
'2d294f4467b5afa1c3f250243ca64953d237c9826414600b26894b0f1d5aef5c'
'c949d1a10231c5f9cecf3f09319afb290f66fe012e545fd70cd7bdfadddfcf56'
'593f41e1f1265171ecc5377226dc76a3a4d92d7c3cc4f0b0afe6c4a6578cc5e3')
sha256sums=('e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da'
'bc788aa466a83184d285cc2f6c1ffc40c6ed416dd08c6999015262a53f1ab1b5'
'704acfaeb11d24d3fe5aab34bc883c184ca93aff03d752016c9a50fdd82c5655'
'c5676fd62d5f7f69be26062b95d42ef47f28151af83b83efa3998ecd8e939e19'
'03ecf29419119286ebcef35864f9bd26d3bf3eaa355945856953204ed727e173'
'06214859ae4030ce30bb68aa35aa4a9ac92d1e79e34133089dcbfeb7cc8066e8'
'a843c038042811265d6ce5917b0c76b709e2591822e5cab53a32b7e9c806da29'
'e27f82af1eb7a4aad955ec36d5fd7d9a4c24575845bcf718372df9bc2b099eb6'
'de5692673731f90b888bf301a547481ab8e3cc0029713b6fd5abaabd860250f0'
'a40e7025507130a2a5d2eb2eea8ba4b053398c307cd55b3c9421a8507bd315ed'
'2658eb376f7829179963978b69a048ed105a41508adc55d0fc0d607c14181926'
'83b6aea4a462ae80121fd68d42c6234d02e20865132197a10575bbf95fd33b7e'
'c5aeab9609f90a8430c43bb50172b63c3155eb10082369f81fac58a395d2e2ee'
'3707b0aab99b203cbd9e513be46c7d4600de06e6c8344160b7fb1779061d08da'
'8a29a40ee426ee786da97656c35d2e9c17838b12c1b750cecf857760da273381'
'959ef644853398fe6f2c291a43e5e5bfac4dc973ce6ae7ff23734135cb9a5b60'
'adb8baaa35dcfbea9ab60694262d0958e090495146d50df1a0844a977832aef9')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@ -114,21 +110,18 @@ prepare() {
echo ${pkgver} > gcc/BASE-VER
# hack! - some configure tests for header files using "$CPP $CPPFLAGS"
sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
[[ -d ${srcdir}/build-$(arch) ]] && rm -rf ${srcdir}/build-$(arch)
mkdir ${srcdir}/build-$(arch)
}
build() {
cd ${srcdir}/build-$(arch)
mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
case ${CARCH} in
i686)
_arch=i686
_arch=pentium4
_arch_conf="--disable-sjlj-exceptions"
;;
x86_64)
_arch=x86-64
_arch=nocona
_arch_conf=
;;
esac
@ -144,11 +137,6 @@ build() {
CFLAGS=${CFLAGS/-pipe/}
CXXFLAGS=${CXXFLAGS/-pipe/}
# use built-in SSP with Cygwin 2.10
# FIXME: --disable-libssp should suffice in GCC 8
export gcc_cv_libc_provides_ssp=yes
# libssp: conflicts with builtin SSP
export lt_cv_deplibs_check_method='pass_all'
${srcdir}/gcc-${pkgver}/configure \
@ -164,7 +152,7 @@ build() {
${_arch_conf} \
--enable-__cxa_atexit \
--with-dwarf2 \
--enable-languages=c,c++,fortran,lto \
--enable-languages=c,c++,lto \
--enable-graphite \
--enable-threads=posix \
--enable-libatomic \
@ -183,7 +171,6 @@ build() {
--without-libintl-prefix \
--with-system-zlib \
--enable-linker-build-id \
--with-default-libstdcxx-abi=gcc4-compatible \
--enable-libstdcxx-filesystem-ts
make
@ -194,7 +181,7 @@ build() {
}
#check() {
# cd ${srcdir}/build-$(arch)
# cd ${srcdir}/build-${CARCH}
# # do not abort on error as some are "expected"
# make -k check || true
@ -205,7 +192,7 @@ package_gcc-libs()
{
pkgdesc="Runtime libraries shipped by GCC"
cd ${srcdir}/build-$(arch)
cd ${srcdir}/build-${CARCH}
make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
for lib in libgomp libstdc++-v3/src; do
make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
@ -216,7 +203,6 @@ package_gcc-libs()
make -j1 -C $CHOST/libquadmath DESTDIR=${pkgdir} install-info
make -j1 DESTDIR=${pkgdir} install-target-libquadmath
make -j1 DESTDIR=${pkgdir} install-target-libgfortran
#make -j1 DESTDIR=${pkgdir} install-target-libssp
make -j1 DESTDIR=${pkgdir} install-target-libatomic
#make -j1 DESTDIR=${pkgdir} install-target-libcilkrts
@ -238,39 +224,28 @@ package_gcc()
{
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
depends=("gcc-libs=${pkgver}-${pkgrel}" 'binutils' 'gmp' 'isl' 'mpc' 'mpfr' 'msys2-runtime-devel' 'msys2-w32api-headers' 'msys2-w32api-runtime' 'windows-default-manifest')
options=('staticlibs' "$STRIP_OPTION" "$DEBUG_OPTION")
#options=("!strip")
provides=('msys2-devel')
cd ${srcdir}/build-$(arch)
cd ${srcdir}/build-${CARCH}
if check_option "strip" "n"; then
export STRIP=true
fi
make -j1 DESTDIR=${pkgdir} install
if [ "$CARCH" = "x86_64" ]
then
mv ${pkgdir}/usr/lib/gcc/${CHOST}/lib/libgcc_s.dll.a ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver/-*/.*}/
rm -rf ${pkgdir}/usr/lib/gcc/${CHOST}/lib
fi
# install -d ${pkgdir}/usr/share/gdb/auto-load/usr/lib
# mv $pkg{pkgdir}dir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
# unfortunately it is much, much easier to install the lot and clean-up the mess...
rm ${pkgdir}/usr/bin/{$CHOST-,}gfortran
# remove all DLLs
rm -f ${pkgdir}/usr/bin/*.dll
rm -f ${pkgdir}/usr/lib/libiberty.a
# rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/libatomic{.dll,}.a
rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/libgfortran{.dll,}.a
rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/libgfortran.spec
rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/finclude
rm -f ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/f951.exe
rm -f ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
rm -f ${pkgdir}/usr/share/info/{gfortran,libgomp,libquadmath}.info
rm -f ${pkgdir}/usr/share/info/{libgomp,libquadmath}.info
rm -f ${pkgdir}/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
rm -f ${pkgdir}/usr/share/man/man1/gfortran.1
# remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite
#rm ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/lib{gomp,quadmath}{.dll,}.a
@ -317,36 +292,3 @@ EOF
install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
}
package_gcc-fortran()
{
pkgdesc="Fortran front-end for GCC"
depends=("gcc=$pkgver-$pkgrel")
options=('staticlibs' '!emptydirs' "$STRIP_OPTION" "$DEBUG_OPTION")
cd ${srcdir}/build-$(arch)
if check_option "strip" "n"; then
export STRIP=true
fi
make -j1 DESTDIR=${pkgdir} install-target-libgfortran
make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_fincludeHEADERS
make -j1 -C gcc DESTDIR=${pkgdir} fortran.install-{common,man,info}
install -Dm755 gcc/f951 ${pkgdir}/usr/lib/gcc/$CHOST/$pkgver/f951
ln -s gfortran ${pkgdir}/usr/bin/f95
rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/lib/libgcc_s.dll.a
# remove files included in gcc-libs or gcc and unnneeded static lib
rm ${pkgdir}/usr/bin/*.dll
rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/libquadmath.{dll.a,a}
rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*}
rm ${pkgdir}/usr/share/info/libquadmath.info
rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include
# rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/libgfortran.a
# Install Runtime Library Exception
install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
}