summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilken Gottwalt2024-12-08 19:02:55 +0100
committerWilken Gottwalt2024-12-08 19:02:55 +0100
commitecc6f1b443e49cc31128984e6292270f87702587 (patch)
tree8771a419fdafc80730d2c6dcf40f8be647157f77
parentb355dc75e6eac6e0ef346e8869237383a7658d4c (diff)
downloadaur-ecc6f1b443e49cc31128984e6292270f87702587.tar.gz
add some patches which are not mainlined yet
Diffstat
-rw-r--r--.SRCINFO28
-rw-r--r--0001-gm2-fix-bad-programming-practice-warning.patch191
-rw-r--r--0002-libgccjit-Remove-obsolete-texinfo-statements.patch37
-rw-r--r--PKGBUILD8
4 files changed, 251 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8039b97a0c90..bf3d04e5fe19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gcc-snapshot
pkgdesc = The GNU Compiler Collection (snapshot)
pkgver = 15.1.0.snapshot20241124
- pkgrel = 1
+ pkgrel = 2
url = https://gcc.gnu.org
arch = x86_64
license = GPL-3.0-with-GCC-exception
@@ -29,6 +29,8 @@ pkgbase = gcc-snapshot
source = https://ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz
source = https://www.mpfr.org/mpfr-4.2.1/mpfr-4.2.1.tar.xz
source = https://www.mpfr.org/mpfr-4.2.1/mpfr-4.2.1.tar.xz.asc
+ source = 0001-gm2-fix-bad-programming-practice-warning.patch
+ source = 0002-libgccjit-Remove-obsolete-texinfo-statements.patch
source = c89
source = c99
source = gcc-ada-repro.patch
@@ -45,13 +47,15 @@ pkgbase = gcc-snapshot
sha256sums = ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8
sha256sums = 277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
sha256sums = SKIP
+ sha256sums = 20c0af49ad44b7193f24560002e81cd8b8ac248a98649324ad6ca1da4c4db6ff
+ sha256sums = 08ee6d267261aeaeadc117b7fc1cdfcbb60ffb9ae76728f33d6fcc60b0e8f240
sha256sums = de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931
sha256sums = 2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a
sha256sums = 1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f
pkgname = gcc-snapshot
pkgdesc = The GNU Compiler Collection - C and C++ frontends (snapshot)
- depends = gcc-libs-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-libs-snapshot=15.1.0.snapshot20241124-2
depends = binutils>=2.40
depends = zstd
optdepends = lib32-gcc-libs-snapshot: for generating code for 32-bit ABI
@@ -71,7 +75,7 @@ pkgname = gcc-libs-snapshot
depends = glibc>=2.36
provides = gcc-libs-snapshot-multilib
provides = gcc-libs-multilib
- provides = gcc-libs=15.1.0.snapshot20241124-1
+ provides = gcc-libs=15.1.0.snapshot20241124-2
provides = libgo.so
provides = libgfortran.so
provides = libgphobos.so
@@ -103,7 +107,7 @@ pkgname = lib32-gcc-libs-snapshot
pkgname = gcc-ada-snapshot
pkgdesc = Ada front-end for GCC (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = gcc-ada-snapshot-multilib
provides = gcc-ada-multilib
provides = gcc-ada
@@ -117,7 +121,7 @@ pkgname = gcc-ada-snapshot
pkgname = gcc-d-snapshot
pkgdesc = D frontend for GCC (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = gcc-d
provides = gdc
conflicts = gcc-d
@@ -128,7 +132,7 @@ pkgname = gcc-d-snapshot
pkgname = gcc-fortran-snapshot
pkgdesc = Fortran front-end for GCC (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = gcc-fortran-snapshot-multilib
provides = gcc-fortran-multilib
provides = gcc-fortran
@@ -141,7 +145,7 @@ pkgname = gcc-fortran-snapshot
pkgname = gcc-go-snapshot
pkgdesc = Go front-end for GCC (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = go=1.18
provides = gcc-go-snapshot-multilib
provides = gcc-go-multilib
@@ -154,7 +158,7 @@ pkgname = gcc-go-snapshot
pkgname = gcc-m2-snapshot
pkgdesc = Modula-2 frontend for GCC (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = gcc-m2-snapshot-multilib
provides = gcc-m2-multilib
provides = gcc-m2
@@ -167,7 +171,7 @@ pkgname = gcc-m2-snapshot
pkgname = gcc-objc-snapshot
pkgdesc = Objective-C front-end for GCC (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = gcc-objc-snapshot-multilib
provides = gcc-objc-multilib
provides = gcc-objc
@@ -180,7 +184,7 @@ pkgname = gcc-objc-snapshot
pkgname = gcc-rust-snapshot
pkgdesc = Rust frontend for GCC (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = gcc-rust-snapshot-multilib
provides = gcc-rust-multilib
provides = gcc-rust
@@ -193,7 +197,7 @@ pkgname = gcc-rust-snapshot
pkgname = lto-dump-snapshot
pkgdesc = Dump link time optimization object files (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = lto-dump
conflicts = lto-dump
replaces = lto-dump
@@ -201,7 +205,7 @@ pkgname = lto-dump-snapshot
pkgname = libgccjit-snapshot
pkgdesc = Just-In-Time Compilation with GCC backend (snapshot)
- depends = gcc-snapshot=15.1.0.snapshot20241124-1
+ depends = gcc-snapshot=15.1.0.snapshot20241124-2
provides = libgccjit
conflicts = libgccjit
replaces = libgccjit
diff --git a/0001-gm2-fix-bad-programming-practice-warning.patch b/0001-gm2-fix-bad-programming-practice-warning.patch
new file mode 100644
index 000000000000..55c0fba830e4
--- /dev/null
+++ b/0001-gm2-fix-bad-programming-practice-warning.patch
@@ -0,0 +1,191 @@
+From da04c5f72dfae5cbbaae54f0b0a6d94fbcdfd1bb Mon Sep 17 00:00:00 2001
+From: Wilken Gottwalt <wilken.gottwalt@posteo.net>
+Date: Sun, 8 Dec 2024 14:46:52 +0100
+Subject: [PATCH] gm2: fix bad programming practice warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+To: gcc-patches@gcc.gnu.org
+Cc: Gaius Mulley <gaiusmod2@gmail.com>, Gerald Pfeifer <gerald@pfeifer.com>
+
+Fix identifier names to be too similar to Modula-2 keywords and causing
+warnings coming from Modula-2's own libraries.
+
+m2/m2log/InOut.mod:51:18: note: In implementation module ‘InOut’:
+either the identifier has the same name as a keyword or alternatively a
+keyword has the wrong case (‘IN’ and ‘in’)
+ 51 | in, out: File ;
+
+m2/m2log/InOut.mod:51:18: note: the symbol name ‘in’ is legal as an
+identifier, however as such it might cause confusion and is considered
+bad programming practice
+
+gcc/gm2:
+ * gm2-libs-log/InOut.mod: Fix bad identifier warning.
+
+Signed-off-by: Wilken Gottwalt <wilken.gottwalt@posteo.net>
+---
+ gcc/m2/gm2-libs-log/InOut.mod | 53 +++++++++++++++++------------------
+ 1 file changed, 26 insertions(+), 27 deletions(-)
+
+diff --git a/gcc/m2/gm2-libs-log/InOut.mod b/gcc/m2/gm2-libs-log/InOut.mod
+index 6e21fdcb6c1..12fdfe6b753 100644
+--- a/gcc/m2/gm2-libs-log/InOut.mod
++++ b/gcc/m2/gm2-libs-log/InOut.mod
+@@ -48,9 +48,8 @@ TYPE
+ CharSet = SET OF CHAR ;
+
+ VAR
+- in, out: File ;
+- inUsed,
+- outUsed: BOOLEAN ;
++ inFile, outFile: File ;
++ inUsed, outUsed: BOOLEAN ;
+
+
+ (*
+@@ -71,8 +70,8 @@ BEGIN
+ END ;
+ IF SFIO.Exists(s)
+ THEN
+- in := SFIO.OpenToRead(s) ;
+- Done := FIO.IsNoError(in) ;
++ inFile := SFIO.OpenToRead(s) ;
++ Done := FIO.IsNoError(inFile) ;
+ inUsed := TRUE
+ ELSE
+ Done := FALSE ;
+@@ -91,8 +90,8 @@ PROCEDURE CloseInput ;
+ BEGIN
+ IF inUsed
+ THEN
+- FIO.Close(in) ;
+- in := StdIn ;
++ FIO.Close(inFile) ;
++ inFile := StdIn ;
+ inUsed := FALSE
+ END
+ END CloseInput ;
+@@ -116,8 +115,8 @@ BEGIN
+ END ;
+ IF SFIO.Exists(s)
+ THEN
+- out := SFIO.OpenToWrite(s) ;
+- Done := FIO.IsNoError(out) ;
++ outFile := SFIO.OpenToWrite(s) ;
++ Done := FIO.IsNoError(outFile) ;
+ outUsed := TRUE
+ ELSE
+ Done := FALSE ;
+@@ -136,8 +135,8 @@ PROCEDURE CloseOutput ;
+ BEGIN
+ IF outUsed
+ THEN
+- FIO.Close(out) ;
+- out := StdOut ;
++ FIO.Close(outFile) ;
++ outFile := StdOut ;
+ outUsed := FALSE
+ END
+ END CloseOutput ;
+@@ -149,8 +148,8 @@ END CloseOutput ;
+
+ PROCEDURE LocalRead (VAR ch: CHAR) ;
+ BEGIN
+- ch := FIO.ReadChar(in) ;
+- Done := FIO.IsNoError(in) AND (NOT FIO.EOF(in))
++ ch := FIO.ReadChar(inFile) ;
++ Done := FIO.IsNoError(inFile) AND (NOT FIO.EOF(inFile))
+ END LocalRead ;
+
+
+@@ -246,8 +245,8 @@ END ReadString ;
+
+ PROCEDURE WriteString (s: ARRAY OF CHAR) ;
+ BEGIN
+- FIO.WriteString(out, s) ;
+- Done := FIO.IsNoError(out)
++ FIO.WriteString(outFile, s) ;
++ Done := FIO.IsNoError(outFile)
+ END WriteString ;
+
+
+@@ -257,13 +256,13 @@ END WriteString ;
+
+ PROCEDURE LocalWrite (ch: CHAR) ;
+ BEGIN
+- FIO.WriteChar(out, ch) ;
+- Done := FIO.IsNoError(out)
++ FIO.WriteChar(outFile, ch) ;
++ Done := FIO.IsNoError(outFile)
+ (*
+ IF outUsed
+ THEN
+- FIO.WriteChar(out, ch) ;
+- Done := FIO.IsNoError(out)
++ FIO.WriteChar(outFile, ch) ;
++ Done := FIO.IsNoError(outFile)
+ ELSE
+ Done := (write(stdout, ADR(ch), 1) = 1)
+ END
+@@ -308,8 +307,8 @@ PROCEDURE WriteLn ;
+ BEGIN
+ IF outUsed
+ THEN
+- FIO.WriteLine(out) ;
+- Done := FIO.IsNoError(out)
++ FIO.WriteLine(outFile) ;
++ Done := FIO.IsNoError(outFile)
+ ELSE
+ Terminal.WriteLn
+ END
+@@ -366,7 +365,7 @@ END ReadCard ;
+
+ PROCEDURE WriteCard (x, n: CARDINAL) ;
+ BEGIN
+- IF KillString(SFIO.WriteS(out, ctos(x, n, ' ')))=NIL
++ IF KillString(SFIO.WriteS(outFile, ctos(x, n, ' ')))=NIL
+ THEN
+ END
+ END WriteCard ;
+@@ -380,7 +379,7 @@ END WriteCard ;
+
+ PROCEDURE WriteInt (x: INTEGER; n: CARDINAL) ;
+ BEGIN
+- IF KillString(SFIO.WriteS(out, itos(x, n, ' ', FALSE)))=NIL
++ IF KillString(SFIO.WriteS(outFile, itos(x, n, ' ', FALSE)))=NIL
+ THEN
+ END
+ END WriteInt ;
+@@ -394,7 +393,7 @@ END WriteInt ;
+
+ PROCEDURE WriteOct (x, n: CARDINAL) ;
+ BEGIN
+- IF KillString(SFIO.WriteS(out, CardinalToString(x, n, ' ', 8, FALSE)))=NIL
++ IF KillString(SFIO.WriteS(outFile, CardinalToString(x, n, ' ', 8, FALSE)))=NIL
+ THEN
+ END
+ END WriteOct ;
+@@ -408,7 +407,7 @@ END WriteOct ;
+
+ PROCEDURE WriteHex (x, n: CARDINAL) ;
+ BEGIN
+- IF KillString(SFIO.WriteS(out, CardinalToString(x, n, ' ', 16, TRUE)))=NIL
++ IF KillString(SFIO.WriteS(outFile, CardinalToString(x, n, ' ', 16, TRUE)))=NIL
+ THEN
+ END
+ END WriteHex ;
+@@ -420,8 +419,8 @@ END WriteHex ;
+
+ PROCEDURE Init ;
+ BEGIN
+- in := FIO.StdIn ;
+- out := FIO.StdOut ;
++ inFile := FIO.StdIn ;
++ outFile := FIO.StdOut ;
+ inUsed := FALSE ;
+ outUsed := FALSE ;
+ AssignRead(LocalRead, LocalStatus, Done) ;
+--
+2.47.1
+
diff --git a/0002-libgccjit-Remove-obsolete-texinfo-statements.patch b/0002-libgccjit-Remove-obsolete-texinfo-statements.patch
new file mode 100644
index 000000000000..5d8676832a0f
--- /dev/null
+++ b/0002-libgccjit-Remove-obsolete-texinfo-statements.patch
@@ -0,0 +1,37 @@
+From d738328ecf8708c2a19fa5ded415c8e87832634d Mon Sep 17 00:00:00 2001
+From: Wilken Gottwalt <wilken.gottwalt@posteo.net>
+Date: Mon, 26 Aug 2024 09:05:41 +0200
+Subject: [PATCH] libgccjit: Remove obsolete texinfo statements
+To: gcc-patches@gcc.gnu.org
+Cc: David Malcolm <dmalcolm@redhat.com>
+
+Remove texinfo statements which are obsolete for a while now.
+
+libgccjit.texi:18: warning: @definfoenclose is obsolete
+libgccjit.texi:19: warning: @definfoenclose is obsolete
+
+gcc/jit:
+ * docs/_build/texinfo/libgccjit.texi: Remove obsolete texinfo statements.
+
+Signed-off-by: Wilken Gottwalt <wilken.gottwalt@posteo.net>
+---
+ gcc/jit/docs/_build/texinfo/libgccjit.texi | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/gcc/jit/docs/_build/texinfo/libgccjit.texi b/gcc/jit/docs/_build/texinfo/libgccjit.texi
+index a69efeaa4a8..e7abc49b160 100644
+--- a/gcc/jit/docs/_build/texinfo/libgccjit.texi
++++ b/gcc/jit/docs/_build/texinfo/libgccjit.texi
+@@ -14,9 +14,6 @@
+ @direntry
+ * libgccjit: (libgccjit.info). GCC-based Just In Time compiler library.
+ @end direntry
+-
+-@definfoenclose strong,`,'
+-@definfoenclose emph,`,'
+ @c %**end of header
+
+ @copying
+--
+2.46.0
+
diff --git a/PKGBUILD b/PKGBUILD
index e64821eddcb4..5d2bf0247513 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _realver=${pkgver//.s*}
_gmpver=6.3.0
_mpcver=1.3.1
_mpfrver=4.2.1
-pkgrel=1
+pkgrel=2
pkgdesc='The GNU Compiler Collection (snapshot)'
arch=(x86_64)
license=(GPL-3.0-with-GCC-exception GFDL-1.3-or-later)
@@ -24,6 +24,8 @@ source=(https://ftp.fu-berlin.de/unix/languages/gcc/snapshots/${_pkgver}/gcc-${_
https://gmplib.org/download/gmp/gmp-${_gmpver}.tar.xz{,.sig}
https://ftp.gnu.org/gnu/mpc/mpc-${_mpcver}.tar.gz
https://www.mpfr.org/mpfr-${_mpfrver}/mpfr-${_mpfrver}.tar.xz{,.asc}
+ 0001-gm2-fix-bad-programming-practice-warning.patch
+ 0002-libgccjit-Remove-obsolete-texinfo-statements.patch
c89
c99
gcc-ada-repro.patch)
@@ -40,6 +42,8 @@ sha256sums=('4b9e0aa54a15ff3f31dd4b379e754abc37f48c73586aaf643bb3c937fd9277c4'
'ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8'
'277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2'
'SKIP'
+ '20c0af49ad44b7193f24560002e81cd8b8ac248a98649324ad6ca1da4c4db6ff'
+ '08ee6d267261aeaeadc117b7fc1cdfcbb60ffb9ae76728f33d6fcc60b0e8f240'
'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
'2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
'1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
@@ -60,6 +64,8 @@ prepare() {
sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
patch -Np0 -i ${srcdir}/gcc-ada-repro.patch
+ patch -Np1 -i ${srcdir}/0001-gm2-fix-bad-programming-practice-warning.patch
+ patch -Np1 -i ${srcdir}/0002-libgccjit-Remove-obsolete-texinfo-statements.patch
mkdir -p ${srcdir}/gcc-build ${srcdir}/libgccjit-build
}