summaryrefslogtreecommitdiffstats
path: root/source/d/gcc
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-06-11 01:56:19 +0000
committer Eric Hameleers <alien@slackware.com>2022-06-11 07:00:11 +0200
commitfc0c0fd79b7d1b26b943062e3ed31327e01829cd (patch)
tree0d840f743d3d53e4492b4d4e0e0369a0c7ec4f98 /source/d/gcc
parent4932eebc956b5ec8edf05adfe2443d4671278b6f (diff)
downloadcurrent-fc0c0fd79b7d1b26b943062e3ed31327e01829cd.tar.gz
current-fc0c0fd79b7d1b26b943062e3ed31327e01829cd.tar.xz
Sat Jun 11 01:56:19 UTC 202220220611015619
a/kernel-firmware-20220610_7b71b75-noarch-1.txz: Upgraded. a/kernel-generic-5.18.3-x86_64-1.txz: Upgraded. a/kernel-huge-5.18.3-x86_64-1.txz: Upgraded. a/kernel-modules-5.18.3-x86_64-1.txz: Upgraded. d/gcc-12.1.0-x86_64-1.txz: Upgraded. d/gcc-brig-11.3.0-x86_64-1.txz: Removed. d/gcc-g++-12.1.0-x86_64-1.txz: Upgraded. d/gcc-gdc-12.1.0-x86_64-1.txz: Upgraded. d/gcc-gfortran-12.1.0-x86_64-1.txz: Upgraded. d/gcc-gnat-12.1.0-x86_64-1.txz: Upgraded. d/gcc-go-12.1.0-x86_64-1.txz: Upgraded. d/gcc-objc-12.1.0-x86_64-1.txz: Upgraded. d/kernel-headers-5.18.3-x86-1.txz: Upgraded. d/libtool-2.4.7-x86_64-2.txz: Rebuilt. Recompiled to update embedded GCC version number. k/kernel-source-5.18.3-noarch-1.txz: Upgraded. x/libX11-1.8.1-x86_64-1.txz: Upgraded. xap/blueman-2.2.5-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/d/gcc')
-rwxr-xr-xsource/d/gcc/gcc.SlackBuild39
-rw-r--r--source/d/gcc/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch59
-rw-r--r--source/d/gcc/patches/gfortran.deferred-shape-vs-assumed-shape.patch40
-rw-r--r--source/d/gcc/slack-desc.gcc-brig19
4 files changed, 3 insertions, 154 deletions
diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild
index a1a6c4c6c..c892a5701 100755
--- a/source/d/gcc/gcc.SlackBuild
+++ b/source/d/gcc/gcc.SlackBuild
@@ -83,7 +83,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "gcc-gnat-$VERSION-$ARCH-$BUILD.txz"
echo "gcc-objc-$VERSION-$ARCH-$BUILD.txz"
echo "gcc-go-$VERSION-$ARCH-$BUILD.txz"
- echo "gcc-brig-$VERSION-$ARCH-$BUILD.txz"
echo "gcc-gdc-$VERSION-$ARCH-$BUILD.txz"
exit 0
fi
@@ -142,14 +141,12 @@ PKG2=$TMP/package-gcc-g++
PKG3=$TMP/package-gcc-gfortran
PKG4=$TMP/package-gcc-gnat
PKG6=$TMP/package-gcc-objc
-#PKG7=$TMP/package-gcc-g++-gch
PKG8=$TMP/package-gcc-go
-PKG9=$TMP/package-gcc-brig
PKG10=$TMP/package-gcc-gdc
# Clear the build locations:
-rm -rf $PKG{1,2,3,4,6,8,9,10}
-mkdir -p $PKG{1,2,3,4,6,8,9,10}/usr/doc/gcc-$VERSION
+rm -rf $PKG{1,2,3,4,6,8,10}
+mkdir -p $PKG{1,2,3,4,6,8,10}/usr/doc/gcc-$VERSION
# Insert package descriptions:
mkdir -p $PKG{1,2,3,4,6,8,9,10}/install
@@ -158,9 +155,7 @@ cat $CWD/slack-desc.gcc-g++ > $PKG2/install/slack-desc
cat $CWD/slack-desc.gcc-gfortran > $PKG3/install/slack-desc
cat $CWD/slack-desc.gcc-gnat > $PKG4/install/slack-desc
cat $CWD/slack-desc.gcc-objc > $PKG6/install/slack-desc
-#cat $CWD/slack-desc.gcc-g++-gch > $PKG7/install/slack-desc
cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc
-cat $CWD/slack-desc.gcc-brig > $PKG9/install/slack-desc
cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc
cd gcc-$SRCVER || exit 1
@@ -168,12 +163,6 @@ cd gcc-$SRCVER || exit 1
# Smite the fixincludes:
zcat $CWD/patches/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-# Fix a gfortran bug:
-zcat $CWD/patches/gfortran.deferred-shape-vs-assumed-shape.patch.gz | patch -p0 --verbose --backup --suffix=.orig || exit 1
-
-# Fix regressions in 10.3.0 (and presumably 11.1.0 since they still apply cleanly):
-zcat $CWD/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-
# Fix perms/owners:
chown -R root:root .
find . \
@@ -262,14 +251,6 @@ mkdir -p $PKG8/usr/doc/gcc-${VERSION}/gcc/go
$PKG8/usr/doc/gcc-${VERSION}/gcc/go
)
-mkdir -p $PKG9/usr/doc/gcc-${VERSION}/gcc/brig
-( cd gcc/brig || exit 0
- if [ -r ChangeLog ]; then
- cat ChangeLog | head -n 1000 > $PKG9/usr/doc/gcc-${VERSION}/gcc/brig/ChangeLog
- touch -r ChangeLog $PKG9/usr/doc/gcc-${VERSION}/gcc/brig/ChangeLog
- fi
-)
-
mkdir -p $PKG10/usr/doc/gcc-${VERSION}/gcc/d
( cd gcc/d || exit 0
if [ -r ChangeLog ]; then
@@ -350,7 +331,7 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3
--infodir=/usr/info \
--enable-shared \
--enable-bootstrap \
- --enable-languages=ada,brig,c,c++,d,fortran,go,lto,objc,obj-c++ \
+ --enable-languages=ada,c,c++,d,fortran,go,lto,objc,obj-c++ \
--enable-threads=posix \
--enable-checking=release \
--enable-objc-gc \
@@ -598,18 +579,6 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la
mv $PKG1/usr/man/man1/gofmt.1.gz usr/man/man1
) || exit 1
-# gcc-brig:
-( cd $PKG9
- mkdir -p usr/bin
- mv $PKG1/usr/bin/*brig* usr/bin
- mkdir -p usr/lib${LIBDIRSUFFIX}
- mv $PKG1/usr/lib${LIBDIRSUFFIX}/libhsail* usr/lib${LIBDIRSUFFIX}
- mkdir -p usr/libexec/gcc/$TARGET/$VERSION
- mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/brig1 usr/libexec/gcc/$TARGET/$VERSION
- mkdir -p usr/man/man1
- mv $PKG1/usr/man/man1/gccbrig.1.gz usr/man/man1
-) || exit 1
-
# gcc-gdc:
( cd $PKG10
mkdir -p usr/bin
@@ -646,8 +615,6 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la
makepkg -l y -c n $TMP/gcc-objc-$VERSION-$ARCH-$BUILD.txz )
( cd $PKG8
makepkg -l y -c n $TMP/gcc-go-$VERSION-$ARCH-$BUILD.txz )
-( cd $PKG9
- makepkg -l y -c n $TMP/gcc-brig-$VERSION-$ARCH-$BUILD.txz )
( cd $PKG10
makepkg -l y -c n $TMP/gcc-gdc-$VERSION-$ARCH-$BUILD.txz )
diff --git a/source/d/gcc/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch b/source/d/gcc/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch
deleted file mode 100644
index 56394fc3f..000000000
--- a/source/d/gcc/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a1b3484a8e6c53c8084723e3f1738d402374198e Mon Sep 17 00:00:00 2001
-From: Jason Merrill <jason@redhat.com>
-Date: Mon, 31 May 2021 12:56:34 -0400
-Subject: [PATCH] c++: alias member template [PR100102]
-
-Patrick already fixed the primary cause of this bug. But while I was
-looking at this testcase I noticed that with the qualified name k::o we
-ended up with a plain FUNCTION_DECL, whereas without the k:: we got a
-BASELINK. There seems to be no good reason not to return the BASELINK
-in this case as well.
-
- PR c++/100102
-
-gcc/cp/ChangeLog:
-
- * init.c (build_offset_ref): Return the BASELINK for a static
- member function.
-
-gcc/testsuite/ChangeLog:
-
- * g++.dg/cpp0x/alias-decl-73.C: New test.
----
- gcc/cp/init.c | 2 +-
- gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C
-
-diff --git a/gcc/cp/init.c b/gcc/cp/init.c
-index b1123287300..1b161d526f6 100644
---- a/gcc/cp/init.c
-+++ b/gcc/cp/init.c
-@@ -2214,7 +2214,7 @@ build_offset_ref (tree type, tree member, bool address_p,
- if (!ok)
- return error_mark_node;
- if (DECL_STATIC_FUNCTION_P (t))
-- return t;
-+ return member;
- member = t;
- }
- else
-diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C
-new file mode 100644
-index 00000000000..aae778646dc
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C
-@@ -0,0 +1,9 @@
-+// PR c++/100102
-+// { dg-do compile { target c++11 } }
-+
-+template <bool B1> using a = int;
-+template <class T3, class T4> struct k {
-+ static long o();
-+ template <class T5> using n = a<bool(k::o)>;
-+ n<int> q;
-+};
---
-2.27.0
-
-
diff --git a/source/d/gcc/patches/gfortran.deferred-shape-vs-assumed-shape.patch b/source/d/gcc/patches/gfortran.deferred-shape-vs-assumed-shape.patch
deleted file mode 100644
index f695b969e..000000000
--- a/source/d/gcc/patches/gfortran.deferred-shape-vs-assumed-shape.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-[PATCH] deferred-shape vs assumed-shape
-Steve Kargl sgk@troutmask.apl.washington.edu
-Wed Apr 1 20:04:43 GMT 2020
-
-See
-https://stackoverflow.com/questions/60972134/whats-wrong-with-the-following-fortran-code-gfortran-dtio-dummy-argument-at
-
-Is A(:) a deferred-shape array or an assumed-shape array? The
-answer of course depends on context.
-
-This patch fixes the issue found at the above URL.
-
-Index: gcc/fortran/interface.c
-===================================================================
---- gcc/fortran/interface.c (revision 280157)
-+++ gcc/fortran/interface.c (working copy)
-@@ -4916,10 +4916,15 @@ check_dtio_arg_TKR_intent (gfc_symbol *fsym, bool type
- || ((type != BT_CLASS) && fsym->attr.dimension)))
- gfc_error ("DTIO dummy argument at %L must be a scalar",
- &fsym->declared_at);
-- else if (rank == 1
-- && (fsym->as == NULL || fsym->as->type != AS_ASSUMED_SHAPE))
-- gfc_error ("DTIO dummy argument at %L must be an "
-- "ASSUMED SHAPE ARRAY", &fsym->declared_at);
-+ else if (rank == 1)
-+ {
-+ if (fsym->as == NULL
-+ || !(fsym->as->type == AS_ASSUMED_SHAPE
-+ || (fsym->as->type == AS_DEFERRED && fsym->attr.dummy
-+ && !fsym->attr.allocatable && !fsym->attr.pointer)))
-+ gfc_error ("DTIO dummy argument at %L must be an "
-+ "ASSUMED-SHAPE ARRAY", &fsym->declared_at);
-+ }
-
- if (type == BT_CHARACTER && fsym->ts.u.cl->length != NULL)
- gfc_error ("DTIO character argument at %L must have assumed length",
-
---
-Steve
-
diff --git a/source/d/gcc/slack-desc.gcc-brig b/source/d/gcc/slack-desc.gcc-brig
deleted file mode 100644
index e9496b8bd..000000000
--- a/source/d/gcc/slack-desc.gcc-brig
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-gcc-brig: gcc-brig (BRIG support for GCC)
-gcc-brig:
-gcc-brig: BRIG support for the GNU Compiler Collection.
-gcc-brig:
-gcc-brig: BRIG is the binary form of the Heterogeneous System Architecture
-gcc-brig: Intermediate Language (HSA IL), which is a virtual instruction set for
-gcc-brig: parallel programs. While similar in some ways to OpenCL or CUDA, HSA
-gcc-brig: is designed to ease the burden on the programmer by automatically
-gcc-brig: handling the offloading of tasks and moving of data.
-gcc-brig:
-gcc-brig: