Merged with official ABS gcc PKGBUILD

8 files changed, 461 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8dde898c68e3..67107445f9a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gcc-git
 	pkgdesc = The GNU Compiler Collection
-	pkgver = 12.0.0.r185046.56103737f17
+	pkgver = 12.0.0_r187145.g929f2cf4105
 	pkgrel = 1
 	url = https://gcc.gnu.org
 	arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = gcc-git
 	license = custom
 	checkdepends = dejagnu
 	checkdepends = inetutils
+	makedepends = git
 	makedepends = binutils
 	makedepends = libmpc
 	makedepends = gcc-ada
@@ -18,93 +19,115 @@ pkgbase = gcc-git
 	makedepends = lib32-gcc-libs
 	makedepends = python
 	makedepends = git
+	makedepends = libxcrypt
+	provides = gcc
+	conflicts = gcc
 	options = !emptydirs
-	source = git+https://gcc.gnu.org/git/gcc.git
+	source = git://gcc.gnu.org/git/gcc.git
 	source = http://isl.gforge.inria.fr/isl-0.24.tar.xz
 	source = c89
 	source = c99
-	b2sums = SKIP
-	b2sums = 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d
-	b2sums = 2c64090b879d6faea7f20095eff1b9bd6a09fe3b15b3890783d3715171678ab62d32c91af683b878746fb14441dbe09768474417840f96a561443415f76afb63
-	b2sums = 3cf318835b9833ac7c5d3a6026fff8b4f18b098e18c9649d00e32273688ff06ec3af41f0d0aee9d2261725e0ff08f47a224ccfe5ebb06646aaf318ff8ac9a0d1
+	source = gdc_phobos_path.patch
+	source = fs64270.patch
+	source = ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch
+	source = ipa-fix-ICE-in-get_default_value.patch
+	source = gcc-ada-repro.patch
+	source = gcc11-Wno-format-security.patch
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931
+	sha256sums = 2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a
+	sha256sums = c86372c207d174c0918d4aedf1cb79f7fc093649eb1ad8d9450dccc46849d308
+	sha256sums = 1ef190ed4562c4db8c1196952616cd201cfdd788b65f302ac2cc4dabb4d72cee
+	sha256sums = fcb11c9bcea320afd202b031b48f8750aeaedaa4b0c5dddcd2c0a16381e927e4
+	sha256sums = 42865f2af3f48140580c4ae70b6ea03b5bdca0f29654773ef0d42ce00d60ea16
+	sha256sums = 1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f
+	sha256sums = 504e4b5a08eb25b6c35f19fdbe0c743ae4e9015d0af4759e74150006c283585e
 
 pkgname = gcc-git
 	pkgdesc = The GNU Compiler Collection - C and C++ frontends
-	groups = base-devel
-	depends = gcc-libs=12.0.0.r185046.56103737f17-1
+	groups = base-devel-git
+	depends = gcc-libs-git=12.0.0_r187145.g929f2cf4105-1
 	depends = binutils>=2.28
 	depends = libmpc
-	optdepends = lib32-gcc-libs: for generating code for 32-bit ABI
-	provides = gcc-multilib=12.0.0.r185046.56103737f17-1
-	provides = gcc=12.0.0.r185046.56103737f17-1
+	optdepends = lib32-gcc-libs-git: for generating code for 32-bit ABI
+	provides = gcc-git-multilib
+	provides = gcc-git-multilib-git
 	conflicts = gcc
+	replaces = gcc-git-multilib-git
 	options = !emptydirs
 	options = staticlibs
 
 pkgname = gcc-libs-git
 	pkgdesc = Runtime libraries shipped by GCC
-	depends = glibc>=2.27
-	provides = gcc-libs-multilib=12.0.0.r185046.56103737f17-1
-	provides = libgo.so=12.0.0.r185046.56103737f17-1
-	provides = libgfortran.so=12.0.0.r185046.56103737f17-1
-	provides = libgphobos.so=12.0.0.r185046.56103737f17-1
-	provides = libubsan.so=12.0.0.r185046.56103737f17-1
-	provides = libasan.so=12.0.0.r185046.56103737f17-1
-	provides = libtsan.so=12.0.0.r185046.56103737f17-1
-	provides = liblsan.so=12.0.0.r185046.56103737f17-1
-	provides = gcc-libs=12.0.0.r185046.56103737f17-1
-	conflicts = gcc-libs
+	depends = glibc
+	provides = gcc-git-multilib
+	provides = libgo.so
+	provides = libgfortran.so
+	provides = libgphobos.so
+	provides = libubsan.so
+	provides = libasan.so
+	provides = libtsan.so
+	provides = liblsan.so
+	replaces = gcc-git-multilib
+	replaces = libgphobos
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-fortran-git
 	pkgdesc = Fortran front-end for GCC
-	depends = gcc=12.0.0.r185046.56103737f17-1
-	provides = gcc-fortran-multilib=12.0.0.r185046.56103737f17-1
-	provides = gcc-fortran=12.0.0.r185046.56103737f17-1
+	depends = gcc-git=12.0.0_r187145.g929f2cf4105-1
+	provides = gcc-git-multilib
+	provides = gcc-git-multilib-git
 	conflicts = gcc-fortran
+	replaces = gcc-git-multilib-git
 
 pkgname = gcc-objc-git
 	pkgdesc = Objective-C front-end for GCC
-	depends = gcc=12.0.0.r185046.56103737f17-1
-	provides = gcc-objc-multilib=12.0.0.r185046.56103737f17-1
-	provides = gcc-objc=12.0.0.r185046.56103737f17-1
+	depends = gcc-git=12.0.0_r187145.g929f2cf4105-1
+	provides = gcc-git-multilib
+	provides = gcc-git-multilib-git
 	conflicts = gcc-objc
+	replaces = gcc-git-multilib-git
 
 pkgname = gcc-ada-git
 	pkgdesc = Ada front-end for GCC (GNAT)
-	depends = gcc=12.0.0.r185046.56103737f17-1
-	provides = gcc-ada-multilib=12.0.0.r185046.56103737f17-1
-	provides = gcc-ada=12.0.0.r185046.56103737f17-1
+	depends = gcc-git=12.0.0_r187145.g929f2cf4105-1
+	provides = gcc-git-multilib
+	provides = gcc-git-multilib-git
 	conflicts = gcc-ada
+	replaces = gcc-git-multilib-git
 	options = !emptydirs
 	options = staticlibs
 
 pkgname = gcc-go-git
 	pkgdesc = Go front-end for GCC
-	depends = gcc=12.0.0.r185046.56103737f17-1
+	depends = gcc-git=12.0.0_r187145.g929f2cf4105-1
 	provides = go=1.12.2
-	provides = gcc-go-multilib=12.0.0.r185046.56103737f17-1
-	provides = gcc-go=12.0.0.r185046.56103737f17-1
-	conflicts = go
+	provides = gcc-git-multilib
+	provides = gcc-git-multilib-git
 	conflicts = gcc-go
+	conflicts = go
+	conflicts = go-git
+	replaces = gcc-git-multilib-git
 
-pkgname = lib32-gcc-libs-gitb
+pkgname = lib32-gcc-libs-git
 	pkgdesc = 32-bit runtime libraries shipped by GCC
+	groups = multilib-devel-git
 	depends = lib32-glibc>=2.27
-	provides = libgo.so=12.0.0.r185046.56103737f17-1
-	provides = libgfortran.so=12.0.0.r185046.56103737f17-1
-	provides = libubsan.so=12.0.0.r185046.56103737f17-1
-	provides = libasan.so=12.0.0.r185046.56103737f17-1
-	provides = lib32-gcc-libs=12.0.0.r185046.56103737f17-1
+	provides = libgo.so
+	provides = libgfortran.so
+	provides = libubsan.so
+	provides = libasan.so
 	conflicts = lib32-gcc-libs
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-d-git
 	pkgdesc = D frontend for GCC
-	depends = gcc=12.0.0.r185046.56103737f17-1
-	provides = gdc=12.0.0.r185046.56103737f17-1
-	provides = gcc-d=12.0.0.r185046.56103737f17-1
+	depends = gcc-git=12.0.0_r187145.g929f2cf4105-1
+	provides = gdc
+	provides = gdc-git
 	conflicts = gcc-d
+	replaces = gdc-git
 	options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index 7b54a1d439c1..9e7840cd199e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,58 @@
+# Merged with official ABS gcc PKGBUILD by João, 2021/08/03 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
+# NOTE: libtool requires rebuilding with each new gcc version
 
-pkgname=(gcc-git gcc-libs-git gcc-fortran-git gcc-objc-git gcc-ada-git gcc-go-git lib32-gcc-libs-gitb gcc-d-git)
-pkgver=12.0.0.r185046.56103737f17
+# You probably don't need support for all the languages, feel free to remove the ones you don't
+# Just edit the --enable-languages option as well as the pkgname array
+
+pkgbase=gcc-git
+pkgname=(gcc-git gcc-libs-git gcc-fortran-git gcc-objc-git gcc-ada-git gcc-go-git lib32-gcc-libs-git gcc-d-git)
+pkgver=12.0.0_r187145.g929f2cf4105
 _majorver=${pkgver%%.*}
-_islver=0.24
+_isl=$(curl -s "http://isl.gforge.inria.fr/?C=M;O=A" | grep tar.xz | tail -1 | sed -e 's/.*href="//' -e 's/">isl.*//')
 pkgrel=1
 pkgdesc='The GNU Compiler Collection'
-arch=(x86_64)
+arch=($CARCH)
 license=(GPL LGPL FDL custom)
 url='https://gcc.gnu.org'
-makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python git)
+makedepends=(git binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python git libxcrypt)
+conflicts=(${pkgbase%-git})
+provides=(${pkgbase%-git})
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
-_libdir=usr/lib/gcc/$CHOST/12.0.0
-source=("git+https://gcc.gnu.org/git/gcc.git"
-        "http://isl.gforge.inria.fr/isl-${_islver}.tar.xz"
+_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
+
+source=(git://gcc.gnu.org/git/gcc.git
+        http://isl.gforge.inria.fr/$_isl
         c89 c99
-)
-b2sums=('SKIP'
-        '39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d'
-        '2c64090b879d6faea7f20095eff1b9bd6a09fe3b15b3890783d3715171678ab62d32c91af683b878746fb14441dbe09768474417840f96a561443415f76afb63'
-        '3cf318835b9833ac7c5d3a6026fff8b4f18b098e18c9649d00e32273688ff06ec3af41f0d0aee9d2261725e0ff08f47a224ccfe5ebb06646aaf318ff8ac9a0d1')
+        gdc_phobos_path.patch
+        fs64270.patch
+        ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch
+        ipa-fix-ICE-in-get_default_value.patch
+        gcc-ada-repro.patch
+        gcc11-Wno-format-security.patch)
+sha256sums=('SKIP'
+            'SKIP'
+            'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
+            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
+            'c86372c207d174c0918d4aedf1cb79f7fc093649eb1ad8d9450dccc46849d308'
+            '1ef190ed4562c4db8c1196952616cd201cfdd788b65f302ac2cc4dabb4d72cee'
+            'fcb11c9bcea320afd202b031b48f8750aeaedaa4b0c5dddcd2c0a16381e927e4'
+            '42865f2af3f48140580c4ae70b6ea03b5bdca0f29654773ef0d42ce00d60ea16'
+            '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f'
+            '504e4b5a08eb25b6c35f19fdbe0c743ae4e9015d0af4759e74150006c283585e')
 
 pkgver() {
-  cd gcc
-  echo $(cat gcc/BASE-VER).r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  cd ${pkgbase%-git}
+  echo "$(cat gcc/BASE-VER)_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 prepare() {
   cd gcc
 
   # link isl for in-tree build
-  ln -s ../isl-${_islver} isl
+  ln -s ../${_isl%.tar.xz} isl
 
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@ -43,6 +63,15 @@ prepare() {
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
+  # D hacks
+  patch -p1 -i "$srcdir/gdc_phobos_path.patch"
+
+  # Reproducible gcc-ada
+  patch -Np0 < "$srcdir/gcc-ada-repro.patch"
+
+  # configure.ac: When adding -Wno-format, also add -Wno-format-security
+  patch -Np0 < "$srcdir/gcc11-Wno-format-security.patch"
+
   mkdir -p "$srcdir/gcc-build"
 }
 
@@ -94,6 +123,9 @@ build() {
 check() {
   cd gcc-build
 
+  # disable libphobos test to avoid segfaults and other unfunny ways to waste my time  
+  sed -i '/maybe-check-target-libphobos \\/d' Makefile 
+
   # do not abort on error as some are "expected"
   make -k check || true
   "$srcdir/gcc/contrib/test_summary"
@@ -101,11 +133,11 @@ check() {
 
 package_gcc-libs-git() {
   pkgdesc='Runtime libraries shipped by GCC'
-  depends=('glibc>=2.27')
+  depends=(glibc)
   options+=(!strip)
-  provides=(gcc-libs-multilib=${pkgver}-${pkgrel} libgo.so=${pkgver}-${pkgrel} libgfortran.so=${pkgver}-${pkgrel} libgphobos.so=${pkgver}-${pkgrel}
-            libubsan.so=${pkgver}-${pkgrel} libasan.so=${pkgver}-${pkgrel} libtsan.so=${pkgver}-${pkgrel} liblsan.so=${pkgver}-${pkgrel} gcc-libs=${pkgver}-${pkgrel})
-  conflicts=(gcc-libs)
+  provides=($pkgbase-multilib libgo.so libgfortran.so libgphobos.so
+            libubsan.so libasan.so libtsan.so liblsan.so)
+  replaces=($pkgbase-multilib libgphobos)
 
   cd gcc-build
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
@@ -136,7 +168,7 @@ package_gcc-libs-git() {
     make -C $CHOST/$lib DESTDIR="$pkgdir" install-info
   done
 
-  # remove files provided by lib32-gcc-libs-gitb
+  # remove files provided by lib32-gcc-libs
   rm -rf "$pkgdir"/usr/lib32/
 
   # Install Runtime Library Exception
@@ -146,11 +178,12 @@ package_gcc-libs-git() {
 
 package_gcc-git() {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc)
-  groups=('base-devel')
-  optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
-  provides=(gcc-multilib=${pkgver}-${pkgrel} gcc=${pkgver}-${pkgrel})
+  depends=("gcc-libs-git=$pkgver-$pkgrel" "binutils>=2.28" libmpc)
+  groups=(base-devel-git)
+  optdepends=('lib32-gcc-libs-git: for generating code for 32-bit ABI')
+  provides=($pkgbase-multilib{,-git})
   conflicts=(gcc)
+  replaces=($pkgbase-multilib-git)
   options+=(staticlibs)
 
   cd gcc-build
@@ -219,7 +252,7 @@ package_gcc-git() {
   # install the libstdc++ man pages
   make -C $CHOST/libstdc++-v3/doc DESTDIR="$pkgdir" doc-install-man
 
-  # remove files provided by lib32-gcc-libs-gitb
+  # remove files provided by lib32-gcc-libs
   rm -f "$pkgdir"/usr/lib32/lib{stdc++,gcc_s}.so
 
   # byte-compile python libraries
@@ -234,14 +267,15 @@ package_gcc-git() {
 
 package_gcc-fortran-git() {
   pkgdesc='Fortran front-end for GCC'
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=(gcc-fortran-multilib=${pkgver}-${pkgrel} gcc-fortran=${pkgver}-${pkgrel})
+  depends=("gcc-git=$pkgver-$pkgrel")
+  provides=($pkgbase-multilib{,-git})
   conflicts=(gcc-fortran)
+  replaces=($pkgbase-multilib-git)
 
   cd gcc-build
   make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
     install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
-  make -C $CHOST/32/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
+  make -C $CHOST/32/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
     install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
   make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
   make -C gcc DESTDIR="$pkgdir" fortran.install-{common,man,info}
@@ -257,9 +291,10 @@ package_gcc-fortran-git() {
 
 package_gcc-objc-git() {
   pkgdesc='Objective-C front-end for GCC'
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=(gcc-objc-multilib=${pkgver}-${pkgrel} gcc-objc=${pkgver}-${pkgrel})
+  depends=("gcc-git=$pkgver-$pkgrel")
+  provides=($pkgbase-multilib{,-git})
   conflicts=(gcc-objc)
+  replaces=($pkgbase-multilib-git)
 
   cd gcc-build
   make DESTDIR="$pkgdir" -C $CHOST/libobjc install-headers
@@ -274,9 +309,10 @@ package_gcc-objc-git() {
 
 package_gcc-ada-git() {
   pkgdesc='Ada front-end for GCC (GNAT)'
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=(gcc-ada-multilib=${pkgver}-${pkgrel} gcc-ada=${pkgver}-${pkgrel})
+  depends=("gcc-git=$pkgver-$pkgrel")
+  provides=($pkgbase-multilib{,-git})
   conflicts=(gcc-ada)
+  replaces=($pkgbase-multilib-git)
   options+=(staticlibs)
 
   cd gcc-build/gcc
@@ -284,11 +320,11 @@ package_gcc-ada-git() {
   install -m755 gnat1 "$pkgdir/${_libdir}"
 
   cd "$srcdir"/gcc-build/$CHOST/libada
-  make DESTDIR=${pkgdir} INSTALL="install" \
+  make DESTDIR="${pkgdir}" INSTALL="install" \
     INSTALL_DATA="install -m644" install-libada
 
   cd "$srcdir"/gcc-build/$CHOST/32/libada
-  make DESTDIR=${pkgdir} INSTALL="install" \
+  make DESTDIR="${pkgdir}" INSTALL="install" \
     INSTALL_DATA="install -m644" install-libada
 
   ln -s gcc "$pkgdir/usr/bin/gnatgcc"
@@ -313,9 +349,10 @@ package_gcc-ada-git() {
 
 package_gcc-go-git() {
   pkgdesc='Go front-end for GCC'
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=("go=1.12.2" gcc-go-multilib=${pkgver}-${pkgrel} gcc-go=${pkgver}-${pkgrel})
-  conflicts=(go gcc-go)
+  depends=("gcc-git=$pkgver-$pkgrel")
+  provides=("go=1.12.2" $pkgbase-multilib{,-git})
+  conflicts=(gcc-go go{,-git})
+  replaces=($pkgbase-multilib-git)
 
   cd gcc-build
   make -C $CHOST/libgo DESTDIR="$pkgdir" install-exec-am
@@ -332,11 +369,12 @@ package_gcc-go-git() {
     "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
-package_lib32-gcc-libs-gitb() {
+package_lib32-gcc-libs-git() {
   pkgdesc='32-bit runtime libraries shipped by GCC'
-  depends=('lib32-glibc>=2.27')
-  provides=(libgo.so=${pkgver}-${pkgrel} libgfortran.so=${pkgver}-${pkgrel} libubsan.so=${pkgver}-${pkgrel} libasan.so=${pkgver}-${pkgrel} lib32-gcc-libs=${pkgver}-${pkgrel})
+  depends=("lib32-glibc>=2.27")
+  provides=(libgo.so libgfortran.so libubsan.so libasan.so)
   conflicts=(lib32-gcc-libs)
+  groups=(multilib-devel-git)
   options=(!emptydirs !strip)
 
   cd gcc-build
@@ -361,7 +399,7 @@ package_lib32-gcc-libs-gitb() {
   make -C $CHOST/libphobos DESTDIR="$pkgdir" install
   rm -f "$pkgdir"/usr/lib32/libgphobos.spec
 
-  # remove files provided by gcc-libs-git
+  # remove files provided by gcc-libs
   rm -rf "$pkgdir"/usr/lib
 
   # Install Runtime Library Exception
@@ -371,10 +409,11 @@ package_lib32-gcc-libs-gitb() {
 
 package_gcc-d-git() {
   pkgdesc="D frontend for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  provides=(gdc=${pkgver}-${pkgrel} gcc-d=${pkgver}-${pkgrel})
+  depends=("gcc-git=$pkgver-$pkgrel")
+  provides=(gdc{,-git})
   conflicts=(gcc-d)
-  options=('staticlibs')
+  replaces=(gdc-git)
+  options=(staticlibs)
 
   cd gcc-build
   make -C gcc DESTDIR="$pkgdir" d.install-{common,man,info}
diff --git a/fs64270.patch b/fs64270.patch
new file mode 100644
index 000000000000..7b9e142c6be8
--- /dev/null
+++ b/fs64270.patch
@@ -0,0 +1,26 @@
+Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding 
+
+--- a/gcc/gcc.c	2017-07-04 09:15:57.740793000 +0200
++++ b/gcc/gcc.c	2018-03-02 13:58:44.387741114 +0100
+@@ -857,6 +857,12 @@ proper position among the other output f
+ #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
+ #endif
+ 
++#ifdef ENABLE_DEFAULT_SSP
++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
++#else
++#define NO_SSP_SPEC ""
++#endif
++
+ #ifndef LINK_SSP_SPEC
+ #ifdef TARGET_LIBC_PROVIDES_SSP
+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+@@ -1131,7 +1148,7 @@ static const char *cc1_options =
+  %{-version:--version}\
+  %{-help=*:--help=%*}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
+- %{fsyntax-only:-o %j} %{-param*}\
++ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
+  %{coverage:-fprofile-arcs -ftest-coverage}\
+  %{fprofile-arcs|fprofile-generate*|coverage:\
+    %{!fprofile-update=singel:\
diff --git a/gcc-ada-repro.patch b/gcc-ada-repro.patch
new file mode 100644
index 000000000000..66256369fac1
--- /dev/null
+++ b/gcc-ada-repro.patch
@@ -0,0 +1,15 @@
+Avoid leaking current data on generated file for Ada.
+
+Index: gcc/ada/gcc-interface/Makefile.in
+===================================================================
+--- gcc/ada/gcc-interface/Makefile.in	(revision 268977)
++++ gcc/ada/gcc-interface/Makefile.in	(working copy)
+@@ -2407,6 +2407,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
+ 	    $(OSCONS_CPP) ; \
+ 	    $(OSCONS_EXTRACT) ; \
+ 	    ../bldtools/oscons/xoscons s-oscons)
++	touch -r $(fsrcpfx)ada/gsocket.h $@
+ 
+ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads
+ 	test -f $(RTSDIR)/s-oscons.ads || exit 1
+
diff --git a/gcc11-Wno-format-security.patch b/gcc11-Wno-format-security.patch
new file mode 100644
index 000000000000..974ea44d0f85
--- /dev/null
+++ b/gcc11-Wno-format-security.patch
@@ -0,0 +1,27 @@
+2017-02-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.ac: When adding -Wno-format, also add -Wno-format-security.
+	* configure: Regenerated.
+
+--- gcc/configure.ac.jj	2017-02-13 12:20:53.000000000 +0100
++++ gcc/configure.ac	2017-02-25 12:42:32.859175403 +0100
+@@ -480,7 +480,7 @@ AC_ARG_ENABLE(build-format-warnings,
+   AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
+   [],[enable_build_format_warnings=yes])
+ AS_IF([test $enable_build_format_warnings = no],
+-      [wf_opt=-Wno-format],[wf_opt=])
++      [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=])
+ ACX_PROG_CXX_WARNING_OPTS(
+ 	m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ],
+ 		       [-Wcast-qual -Wno-error=format-diag $wf_opt])),
+--- gcc/configure.jj	2017-02-13 12:20:52.000000000 +0100
++++ gcc/configure	2017-02-25 12:42:50.041946391 +0100
+@@ -6647,7 +6647,7 @@ else
+ fi
+ 
+ if test $enable_build_format_warnings = no; then :
+-  wf_opt=-Wno-format
++  wf_opt="-Wno-format -Wno-format-security"
+ else
+   wf_opt=
+ fi
diff --git a/gdc_phobos_path.patch b/gdc_phobos_path.patch
new file mode 100644
index 000000000000..6f43b6ee7a96
--- /dev/null
+++ b/gdc_phobos_path.patch
@@ -0,0 +1,14 @@
+diff -Naur a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
+--- a/gcc/d/d-incpath.cc	2019-01-01 13:31:55.000000000 +0100
++++ b/gcc/d/d-incpath.cc	2019-06-28 08:32:00.326241502 +0200
+@@ -140,7 +140,7 @@
+ 	    path = xstrdup (p->fname);
+ 
+ 	  /* Add D-specific suffix.  */
+-	  path = concat (path, "/d", NULL);
++	  path = concat (path, "/dlang/gdc", NULL);
+ 
+ 	  /* Ignore duplicate entries.  */
+ 	  bool found = false;
+
+ 
diff --git a/ipa-fix-ICE-in-get_default_value.patch b/ipa-fix-ICE-in-get_default_value.patch
new file mode 100644
index 000000000000..572299462ff4
--- /dev/null
+++ b/ipa-fix-ICE-in-get_default_value.patch
@@ -0,0 +1,80 @@
+From f91770216eade83f068528c1e4f00e2ac3b23044 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Thu, 13 Aug 2020 09:38:41 +0200
+Subject: [PATCH] ipa: fix ICE in get_default_value
+
+The patch aligns code with ipcp_bits_lattice::set_to_constant
+where we properly mask m_value with m_mask. The same should
+be done here.
+
+gcc/ChangeLog:
+
+	PR ipa/96482
+	* ipa-cp.c (ipcp_bits_lattice::meet_with_1): Mask m_value
+	with m_mask.
+
+gcc/testsuite/ChangeLog:
+
+	PR ipa/96482
+	* gcc.dg/ipa/pr96482-2.c: New test.
+---
+ gcc/ipa-cp.c                         |  2 +-
+ gcc/testsuite/gcc.dg/ipa/pr96482-2.c | 33 ++++++++++++++++++++++++++++
+ 2 files changed, 34 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.dg/ipa/pr96482-2.c
+
+diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
+index 2b21280d919..e4910a04ffa 100644
+--- a/gcc/ipa-cp.c
++++ b/gcc/ipa-cp.c
+@@ -1048,7 +1048,7 @@ ipcp_bits_lattice::meet_with_1 (widest_int value, widest_int mask,
+ 
+   widest_int old_mask = m_mask;
+   m_mask = (m_mask | mask) | (m_value ^ value);
+-  m_value &= value;
++  m_value &= ~m_mask;
+ 
+   if (wi::sext (m_mask, precision) == -1)
+     return set_to_bottom ();
+diff --git a/gcc/testsuite/gcc.dg/ipa/pr96482-2.c b/gcc/testsuite/gcc.dg/ipa/pr96482-2.c
+new file mode 100644
+index 00000000000..54b71ac4fc0
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/ipa/pr96482-2.c
+@@ -0,0 +1,33 @@
++/* PR ipa/96482 */
++/* { dg-do compile } */
++/* { dg-options "-O2"  } */
++
++int i2c_transfer();
++void _dev_err();
++
++struct i2c_msg {
++  char bufaddr;
++  int adapterdev;
++} wdt87xx_i2c_xfer_client;
++
++int wdt87xx_i2c_xfer_client_0, wdt87xx_i2c_xfer_rxdata, wdt87xx_get_string_str_idx;
++
++void
++static wdt87xx_i2c_xfer(void *txdata, unsigned rxlen) {
++  struct i2c_msg msgs[] = {wdt87xx_i2c_xfer_client_0, rxlen,
++                           wdt87xx_i2c_xfer_rxdata};
++  int error = i2c_transfer(wdt87xx_i2c_xfer_client, msgs);
++  _dev_err("", __func__, error);
++}
++static void wdt87xx_get_string(unsigned len) {
++  char tx_buf[] = {wdt87xx_get_string_str_idx, 3};
++  int rx_len = len + 2;
++  wdt87xx_i2c_xfer(tx_buf, rx_len);
++}
++
++void
++wdt87xx_ts_probe_tx_buf() {
++  wdt87xx_get_string(34);
++  wdt87xx_get_string(8);
++  wdt87xx_i2c_xfer(wdt87xx_ts_probe_tx_buf, 2);
++}
+-- 
+2.28.0
+
diff --git a/ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch b/ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch
new file mode 100644
index 000000000000..cd812623cec3
--- /dev/null
+++ b/ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch
@@ -0,0 +1,147 @@
+From d58f078ce2d53e5dab6b3d0d5f960504268e1894 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Wed, 12 Aug 2020 09:21:51 +0200
+Subject: [PATCH] ipa: fix bit CPP when combined with IPA bit CP
+
+As mentioned in the PR, let's consider the following example:
+
+int
+__attribute__((noinline))
+foo(int arg)
+{
+  if (arg == 3)
+    return 1;
+  if (arg == 4)
+    return 123;
+
+  __builtin_unreachable ();
+}
+
+during WPA we find all calls of the function
+(yes the call with value 5 is UBSAN):
+
+  Node: foo/0:
+    param [0]: 5 [loc_time: 4, loc_size: 2, prop_time: 0, prop_size: 0]
+               3 [loc_time: 3, loc_size: 3, prop_time: 0, prop_size: 0]
+         ctxs: VARIABLE
+         Bits: value = 0x5, mask = 0x6
+
+in LTRANS we have the following VRP info:
+
+  # RANGE [3, 3] NONZERO 3
+
+when we AND masks in get_default_value we end up with 6 & 3 = 2 (0x010).
+That means the only second (least significant bit) is unknown and
+value (5 = 0x101) & ~mask gives us either 7 (0x111) or 5 (0x101).
+
+That's why if (arg_2(D) == 3) gets optimized to false.
+
+gcc/ChangeLog:
+
+	PR ipa/96482
+	* ipa-cp.c (ipcp_bits_lattice::meet_with_1): Drop value bits
+	for bits that are unknown.
+	(ipcp_bits_lattice::set_to_constant): Likewise.
+	* tree-ssa-ccp.c (get_default_value): Add sanity check that
+	IPA CP bit info has all bits set to zero in bits that
+	are unknown.
+
+gcc/testsuite/ChangeLog:
+
+	PR ipa/96482
+	* gcc.dg/ipa/pr96482.c: New test.
+---
+ gcc/ipa-cp.c                       |  3 +-
+ gcc/testsuite/gcc.dg/ipa/pr96482.c | 44 ++++++++++++++++++++++++++++++
+ gcc/tree-ssa-ccp.c                 |  3 ++
+ 3 files changed, 49 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.dg/ipa/pr96482.c
+
+diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
+index 945a69977f3..2b21280d919 100644
+--- a/gcc/ipa-cp.c
++++ b/gcc/ipa-cp.c
+@@ -1011,7 +1011,7 @@ ipcp_bits_lattice::set_to_constant (widest_int value, widest_int mask)
+ {
+   gcc_assert (top_p ());
+   m_lattice_val = IPA_BITS_CONSTANT;
+-  m_value = value;
++  m_value = wi::bit_and (wi::bit_not (mask), value);
+   m_mask = mask;
+   return true;
+ }
+@@ -1048,6 +1048,7 @@ ipcp_bits_lattice::meet_with_1 (widest_int value, widest_int mask,
+ 
+   widest_int old_mask = m_mask;
+   m_mask = (m_mask | mask) | (m_value ^ value);
++  m_value &= value;
+ 
+   if (wi::sext (m_mask, precision) == -1)
+     return set_to_bottom ();
+diff --git a/gcc/testsuite/gcc.dg/ipa/pr96482.c b/gcc/testsuite/gcc.dg/ipa/pr96482.c
+new file mode 100644
+index 00000000000..68ead798d28
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/ipa/pr96482.c
+@@ -0,0 +1,44 @@
++/* PR ipa/96482 */
++/* { dg-do run } */
++/* { dg-options "-O2 -flto"  } */
++/* { dg-require-effective-target lto } */
++
++int
++__attribute__((noinline))
++foo(int arg)
++{
++  if (arg == 3)
++    return 1;
++  if (arg == 4)
++    return 123;
++
++  __builtin_unreachable ();
++}
++
++int
++__attribute__((noinline))
++baz(int x)
++{
++  if (x != 0)
++    return foo(3); /* called */
++
++  return 1;
++}
++
++int
++__attribute__((noinline))
++bar(int x)
++{
++  if (x == 0)
++    return foo(5); /* not executed */
++
++  return 1;
++}
++
++int main(int argc, char **argv)
++{
++  if (bar(argc) != baz(argc))
++    __builtin_abort ();
++
++  return 0;
++}
+diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
+index 7e3921869b8..65dffe06530 100644
+--- a/gcc/tree-ssa-ccp.c
++++ b/gcc/tree-ssa-ccp.c
+@@ -306,6 +306,9 @@ get_default_value (tree var)
+ 		{
+ 		  val.lattice_val = CONSTANT;
+ 		  val.value = value;
++		  widest_int ipa_value = wi::to_widest (value);
++		  /* Unknown bits from IPA CP must be equal to zero.  */
++		  gcc_assert (wi::bit_and (ipa_value, mask) == 0);
+ 		  val.mask = mask;
+ 		  if (nonzero_bits != -1)
+ 		    val.mask &= extend_mask (nonzero_bits,
+-- 
+2.28.0
+