forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

{main,cross}/gcc*: sync makedeps with Alpine (remove paxmark) (MR 2421)

Browse source 
[ci:skip-build] gcc never builds on CI, let alone 11 gccs
[ci:skip-vercheck]
This commit is contained in:
afeuerstein 2021-08-10 00:44:06 +02:00 committed by Alexey Minnekhanov
parent 8e3224d1f0
commit 8e6824c6e0
No known key found for this signature in database
GPG key ID: EBF5ECFFFEE34DED
14 changed files with 193 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cross/gcc-aarch64/APKBUILD
View file

@ -38,7 +38,7 @@ arch="x86_64"
license="GPL-2.0-or-later LGPL-2.1-or-later" license="GPL-2.0-or-later LGPL-2.1-or-later"
_gccrel=$pkgver-r$pkgrel _gccrel=$pkgver-r$pkgrel
depends="isl binutils-aarch64 mpc1" depends="isl binutils-aarch64 mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
subpackages="g++-aarch64:gpp" subpackages="g++-aarch64:gpp"
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"

2
cross/gcc-armhf/APKBUILD
View file

@ -38,7 +38,7 @@ arch="x86_64"
license="GPL-2.0-or-later LGPL-2.1-or-later" license="GPL-2.0-or-later LGPL-2.1-or-later"
_gccrel=$pkgver-r$pkgrel _gccrel=$pkgver-r$pkgrel
depends="isl binutils-armhf mpc1" depends="isl binutils-armhf mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
subpackages="g++-armhf:gpp" subpackages="g++-armhf:gpp"
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"

2
cross/gcc-armv7/APKBUILD
View file

@ -38,7 +38,7 @@ arch="x86_64"
license="GPL-2.0-or-later LGPL-2.1-or-later" license="GPL-2.0-or-later LGPL-2.1-or-later"
_gccrel=$pkgver-r$pkgrel _gccrel=$pkgver-r$pkgrel
depends="isl binutils-armv7 mpc1" depends="isl binutils-armv7 mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
subpackages="g++-armv7:gpp" subpackages="g++-armv7:gpp"
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"

6
cross/gcc4-aarch64/APKBUILD
View file

@ -4,6 +4,7 @@
CTARGET_ARCH=aarch64 CTARGET_ARCH=aarch64
CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})" CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
LANG_D=false
LANG_OBJC=false LANG_OBJC=false
LANG_JAVA=false LANG_JAVA=false
LANG_GO=false LANG_GO=false
@ -22,7 +23,7 @@ CBUILDROOT="/"
_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
pkgname="gcc4-aarch64" pkgname=gcc4-aarch64
pkgver=9999 pkgver=9999
_pkgver=4.9.2 _pkgver=4.9.2
pkgrel=2 pkgrel=2
@ -32,9 +33,8 @@ arch="x86_64"
license="GPL LGPL" license="GPL LGPL"
_gccrel=$_pkgver-r$pkgrel _gccrel=$_pkgver-r$pkgrel
depends="isl binutils-aarch64 mpc1" depends="isl binutils-aarch64 mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
subpackages=""
options="!strip !tracedeps" options="!strip !tracedeps"
# We only care about C, so we can compile old Linux kernels # We only care about C, so we can compile old Linux kernels

6
cross/gcc4-armhf/APKBUILD
View file

@ -4,6 +4,7 @@
CTARGET_ARCH=armhf CTARGET_ARCH=armhf
CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})" CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
LANG_D=false
LANG_OBJC=false LANG_OBJC=false
LANG_JAVA=false LANG_JAVA=false
LANG_GO=false LANG_GO=false
@ -22,7 +23,7 @@ CBUILDROOT="/"
_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
pkgname="gcc4-armhf" pkgname=gcc4-armhf
pkgver=9999 pkgver=9999
_pkgver=4.9.2 _pkgver=4.9.2
pkgrel=2 pkgrel=2
@ -32,9 +33,8 @@ arch="x86_64"
license="GPL LGPL" license="GPL LGPL"
_gccrel=$_pkgver-r$pkgrel _gccrel=$_pkgver-r$pkgrel
depends="isl binutils-armhf mpc1" depends="isl binutils-armhf mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
subpackages=""
options="!strip !tracedeps" options="!strip !tracedeps"
# We only care about C, so we can compile old Linux kernels # We only care about C, so we can compile old Linux kernels

6
cross/gcc4-armv7/APKBUILD
View file

@ -4,6 +4,7 @@
CTARGET_ARCH=armv7 CTARGET_ARCH=armv7
CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})" CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
LANG_D=false
LANG_OBJC=false LANG_OBJC=false
LANG_JAVA=false LANG_JAVA=false
LANG_GO=false LANG_GO=false
@ -22,7 +23,7 @@ CBUILDROOT="/"
_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
pkgname="gcc4-armv7" pkgname=gcc4-armv7
pkgver=9999 pkgver=9999
_pkgver=4.9.2 _pkgver=4.9.2
pkgrel=2 pkgrel=2
@ -32,9 +33,8 @@ arch="x86_64"
license="GPL LGPL" license="GPL LGPL"
_gccrel=$_pkgver-r$pkgrel _gccrel=$_pkgver-r$pkgrel
depends="isl binutils-armv7 mpc1" depends="isl binutils-armv7 mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
subpackages=""
options="!strip !tracedeps" options="!strip !tracedeps"
# We only care about C, so we can compile old Linux kernels # We only care about C, so we can compile old Linux kernels

54
cross/gcc6-aarch64/0014-fix-missing-includes-isl-0.20.patch Normal file
View file

@ -0,0 +1,54 @@
From e31e485e7b453cd6cddf5a0a137b9c98bc797ea5 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 14 Aug 2018 15:15:39 +0000
Subject: [PATCH] backport: re PR tree-optimization/86724 (Compilation error
with new isl 0.20 (missing includes))
2018-08-14 Matthias Klose <doko@ubuntu.com>
Backport from mainline
2018-08-01 Richard Biener <rguenther@suse.de>
PR bootstrap/86724
* graphite.h: Include isl/id.h and isl/space.h to allow build
with ISL 0.20.
From-SVN: r263539
---
gcc/ChangeLog | 9 +++++++++
gcc/graphite.h | 2 ++
2 files changed, 11 insertions(+)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7f61504757..4aaaeac328a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-14 Matthias Klose <doko@ubuntu.com>
+
+ Backport from mainline
+ 2018-08-01 Richard Biener <rguenther@suse.de>
+
+ PR bootstrap/86724
+ * graphite.h: Include isl/id.h and isl/space.h to allow build
+ with ISL 0.20.
+
2018-08-10 Segher Boessenkool <segher@kernel.crashing.org>
Backport from mainline
diff --git a/gcc/graphite.h b/gcc/graphite.h
index 578fa1a6d98..431d0ed0a5e 100644
--- a/gcc/graphite.h
+++ b/gcc/graphite.h
@@ -40,6 +40,8 @@ along with GCC; see the file COPYING3. If not see
#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
/* isl 0.15 or later. */
#include <isl/schedule_node.h>
+#include <isl/id.h>
+#include <isl/space.h>
#else
/* isl 0.14 or 0.13. */
--
2.27.0

7
cross/gcc6-aarch64/APKBUILD
View file

@ -33,7 +33,7 @@ arch="x86_64"
license="GPL LGPL" license="GPL LGPL"
_gccrel=$_pkgver-r$pkgrel _gccrel=$_pkgver-r$pkgrel
depends="isl binutils-aarch64 mpc1" depends="isl binutils-aarch64 mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
options="!strip !tracedeps" options="!strip !tracedeps"
@ -221,6 +221,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
0011-i386-Update-mfunction-return-for-return-with-pop.patch 0011-i386-Update-mfunction-return-for-return-with-pop.patch
0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch
0013-i386-Don-t-generate-alias-for-function-return-thunk.patch 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch
0014-fix-missing-includes-isl-0.20.patch
" "
# we build out-of-tree # we build out-of-tree
@ -490,4 +492,5 @@ baa27a4b912d8e27cd65a556b09cf45289a0e00e86dae3925f2923d1f3752080e80d80e159c996ef
b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch
c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch
955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch
3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch" 3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch
e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch"

54
cross/gcc6-armhf/0014-fix-missing-includes-isl-0.20.patch Normal file
View file

@ -0,0 +1,54 @@
From e31e485e7b453cd6cddf5a0a137b9c98bc797ea5 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 14 Aug 2018 15:15:39 +0000
Subject: [PATCH] backport: re PR tree-optimization/86724 (Compilation error
with new isl 0.20 (missing includes))
2018-08-14 Matthias Klose <doko@ubuntu.com>
Backport from mainline
2018-08-01 Richard Biener <rguenther@suse.de>
PR bootstrap/86724
* graphite.h: Include isl/id.h and isl/space.h to allow build
with ISL 0.20.
From-SVN: r263539
---
gcc/ChangeLog | 9 +++++++++
gcc/graphite.h | 2 ++
2 files changed, 11 insertions(+)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7f61504757..4aaaeac328a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-14 Matthias Klose <doko@ubuntu.com>
+
+ Backport from mainline
+ 2018-08-01 Richard Biener <rguenther@suse.de>
+
+ PR bootstrap/86724
+ * graphite.h: Include isl/id.h and isl/space.h to allow build
+ with ISL 0.20.
+
2018-08-10 Segher Boessenkool <segher@kernel.crashing.org>
Backport from mainline
diff --git a/gcc/graphite.h b/gcc/graphite.h
index 578fa1a6d98..431d0ed0a5e 100644
--- a/gcc/graphite.h
+++ b/gcc/graphite.h
@@ -40,6 +40,8 @@ along with GCC; see the file COPYING3. If not see
#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
/* isl 0.15 or later. */
#include <isl/schedule_node.h>
+#include <isl/id.h>
+#include <isl/space.h>
#else
/* isl 0.14 or 0.13. */
--
2.27.0

7
cross/gcc6-armhf/APKBUILD
View file

@ -33,7 +33,7 @@ arch="x86_64"
license="GPL LGPL" license="GPL LGPL"
_gccrel=$_pkgver-r$pkgrel _gccrel=$_pkgver-r$pkgrel
depends="isl binutils-armhf mpc1" depends="isl binutils-armhf mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
options="!strip !tracedeps" options="!strip !tracedeps"
@ -221,6 +221,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
0011-i386-Update-mfunction-return-for-return-with-pop.patch 0011-i386-Update-mfunction-return-for-return-with-pop.patch
0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch
0013-i386-Don-t-generate-alias-for-function-return-thunk.patch 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch
0014-fix-missing-includes-isl-0.20.patch
" "
# we build out-of-tree # we build out-of-tree
@ -490,4 +492,5 @@ baa27a4b912d8e27cd65a556b09cf45289a0e00e86dae3925f2923d1f3752080e80d80e159c996ef
b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch
c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch
955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch
3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch" 3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch
e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch"

54
cross/gcc6-armv7/0014-fix-missing-includes-isl-0.20.patch Normal file
View file

@ -0,0 +1,54 @@
From e31e485e7b453cd6cddf5a0a137b9c98bc797ea5 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 14 Aug 2018 15:15:39 +0000
Subject: [PATCH] backport: re PR tree-optimization/86724 (Compilation error
with new isl 0.20 (missing includes))
2018-08-14 Matthias Klose <doko@ubuntu.com>
Backport from mainline
2018-08-01 Richard Biener <rguenther@suse.de>
PR bootstrap/86724
* graphite.h: Include isl/id.h and isl/space.h to allow build
with ISL 0.20.
From-SVN: r263539
---
gcc/ChangeLog | 9 +++++++++
gcc/graphite.h | 2 ++
2 files changed, 11 insertions(+)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7f61504757..4aaaeac328a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-14 Matthias Klose <doko@ubuntu.com>
+
+ Backport from mainline
+ 2018-08-01 Richard Biener <rguenther@suse.de>
+
+ PR bootstrap/86724
+ * graphite.h: Include isl/id.h and isl/space.h to allow build
+ with ISL 0.20.
+
2018-08-10 Segher Boessenkool <segher@kernel.crashing.org>
Backport from mainline
diff --git a/gcc/graphite.h b/gcc/graphite.h
index 578fa1a6d98..431d0ed0a5e 100644
--- a/gcc/graphite.h
+++ b/gcc/graphite.h
@@ -40,6 +40,8 @@ along with GCC; see the file COPYING3. If not see
#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
/* isl 0.15 or later. */
#include <isl/schedule_node.h>
+#include <isl/id.h>
+#include <isl/space.h>
#else
/* isl 0.14 or 0.13. */
--
2.27.0

7
cross/gcc6-armv7/APKBUILD
View file

@ -33,7 +33,7 @@ arch="x86_64"
license="GPL LGPL" license="GPL LGPL"
_gccrel=$_pkgver-r$pkgrel _gccrel=$_pkgver-r$pkgrel
depends="isl binutils-armv7 mpc1" depends="isl binutils-armv7 mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
options="!strip !tracedeps" options="!strip !tracedeps"
@ -221,6 +221,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
0011-i386-Update-mfunction-return-for-return-with-pop.patch 0011-i386-Update-mfunction-return-for-return-with-pop.patch
0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch
0013-i386-Don-t-generate-alias-for-function-return-thunk.patch 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch
0014-fix-missing-includes-isl-0.20.patch
" "
# we build out-of-tree # we build out-of-tree
@ -490,4 +492,5 @@ baa27a4b912d8e27cd65a556b09cf45289a0e00e86dae3925f2923d1f3752080e80d80e159c996ef
b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch
c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch
955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch
3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch" 3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch
e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch"

4
main/gcc4/APKBUILD
View file

@ -1,14 +1,14 @@
pkgname=gcc4 pkgname=gcc4
pkgver=9999 pkgver=9999
_pkgver=4.9.2 _pkgver=4.9.2
pkgrel=2 pkgrel=3
pkgdesc="Old GCC for old vendor kernels (C compiler only)" pkgdesc="Old GCC for old vendor kernels (C compiler only)"
url="http://gcc.gnu.org" url="http://gcc.gnu.org"
arch="all" arch="all"
license="GPL LGPL" license="GPL LGPL"
_gccrel=$_pkgver-r$pkgrel _gccrel=$_pkgver-r$pkgrel
depends="binutils isl mpc1" depends="binutils isl mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev"
subpackages=" " subpackages=" "
options="!tracedeps" options="!tracedeps"

4
main/gcc6/APKBUILD
View file

@ -1,14 +1,14 @@
pkgname=gcc6 pkgname=gcc6
pkgver=9999 pkgver=9999
_pkgver=6.4.0 _pkgver=6.4.0
pkgrel=7 pkgrel=8
pkgdesc="Old GCC for old vendor kernels (C compiler only)" pkgdesc="Old GCC for old vendor kernels (C compiler only)"
url="http://gcc.gnu.org" url="http://gcc.gnu.org"
arch="all" arch="all"
license="GPL LGPL" license="GPL LGPL"
_gccrel=$_pkgver-r$pkgrel _gccrel=$_pkgver-r$pkgrel
depends="binutils isl mpc1" depends="binutils isl mpc1"
makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev"
subpackages=" " subpackages=" "
options="!tracedeps" options="!tracedeps"