diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec
index c661055..1257e53 100644
--- a/cross-aarch64-gcc7.spec
+++ b/cross-aarch64-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec
index be9f30c..b8729a1 100644
--- a/cross-arm-gcc7.spec
+++ b/cross-arm-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-arm-none-gcc7-bootstrap.changes b/cross-arm-none-gcc7-bootstrap.changes
index f343ff2..51e1ec1 100644
--- a/cross-arm-none-gcc7-bootstrap.changes
+++ b/cross-arm-none-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-none-gcc7-bootstrap.spec b/cross-arm-none-gcc7-bootstrap.spec
index ae4523a..69adf69 100644
--- a/cross-arm-none-gcc7-bootstrap.spec
+++ b/cross-arm-none-gcc7-bootstrap.spec
@@ -171,10 +171,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-arm-none-gcc7.changes b/cross-arm-none-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-arm-none-gcc7.changes
+++ b/cross-arm-none-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-none-gcc7.spec b/cross-arm-none-gcc7.spec
index dd0543b..4eccd48 100644
--- a/cross-arm-none-gcc7.spec
+++ b/cross-arm-none-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes
index f343ff2..51e1ec1 100644
--- a/cross-avr-gcc7-bootstrap.changes
+++ b/cross-avr-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec
index a9e524e..94117d5 100644
--- a/cross-avr-gcc7-bootstrap.spec
+++ b/cross-avr-gcc7-bootstrap.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec
index e791883..b68feda 100644
--- a/cross-avr-gcc7.spec
+++ b/cross-avr-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes
index f343ff2..51e1ec1 100644
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec
index 7bf1571..151603e 100644
--- a/cross-epiphany-gcc7-bootstrap.spec
+++ b/cross-epiphany-gcc7-bootstrap.spec
@@ -171,10 +171,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec
index 6e11a33..7fbf6b4 100644
--- a/cross-epiphany-gcc7.spec
+++ b/cross-epiphany-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec
index 751d2c4..9f4b570 100644
--- a/cross-hppa-gcc7.spec
+++ b/cross-hppa-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec
index ee828ba..c7831fb 100644
--- a/cross-i386-gcc7.spec
+++ b/cross-i386-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec
index a5896ce..a32e58a 100644
--- a/cross-m68k-gcc7.spec
+++ b/cross-m68k-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec
index 9ab0bec..1780467 100644
--- a/cross-mips-gcc7.spec
+++ b/cross-mips-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec
index ba6d71a..c2b51ef 100644
--- a/cross-nvptx-gcc7.spec
+++ b/cross-nvptx-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec
index 2740620..6cfaf08 100644
--- a/cross-ppc64-gcc7.spec
+++ b/cross-ppc64-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec
index 11d369e..8802734 100644
--- a/cross-ppc64le-gcc7.spec
+++ b/cross-ppc64le-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes
index f343ff2..51e1ec1 100644
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec
index 48aec30..e9dc483 100644
--- a/cross-rx-gcc7-bootstrap.spec
+++ b/cross-rx-gcc7-bootstrap.spec
@@ -171,10 +171,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec
index 6416b3a..4f17882 100644
--- a/cross-rx-gcc7.spec
+++ b/cross-rx-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec
index 4d7e39a..755bfbc 100644
--- a/cross-s390x-gcc7.spec
+++ b/cross-s390x-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec
index 351cfdf..6c8bec7 100644
--- a/cross-sparc-gcc7.spec
+++ b/cross-sparc-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec
index 0e08d0f..2f2b7b7 100644
--- a/cross-sparc64-gcc7.spec
+++ b/cross-sparc64-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes
index f343ff2..51e1ec1 100644
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec
index 49c276c..28e8735 100644
--- a/cross-x86_64-gcc7.spec
+++ b/cross-x86_64-gcc7.spec
@@ -170,10 +170,9 @@ Requires(preun): update-alternatives
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/gcc-7.3.1+r262243.tar.xz b/gcc-7.3.1+r262243.tar.xz
deleted file mode 100644
index 8f74f1e..0000000
--- a/gcc-7.3.1+r262243.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4721a15a87046d2c881f933ae68a5dbaf518809172899cf8f704747db35e209
-size 61203712
diff --git a/gcc-7.3.1+r263609.tar.xz b/gcc-7.3.1+r263609.tar.xz
new file mode 100644
index 0000000..396eb85
--- /dev/null
+++ b/gcc-7.3.1+r263609.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e846c6949957c40c6a46a019eda784aa17d7aa3b55bd6c49ebb55fb749ea8fe
+size 61216540
diff --git a/gcc.spec.in b/gcc.spec.in
index f84b07d..f56b853 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -176,7 +176,7 @@ BuildRequires: zlib-devel
 BuildRequires: isl-devel
 %endif
 %if %{build_ada}
-%if 0%{gcc_version} > 7
+%if 0%{?gcc_version:%{gcc_version}} > 7
 %define hostsuffix %{binsuffix}
 BuildRequires: gcc@base_ver@-ada
 BuildRequires: gcc@base_ver@-c++
@@ -239,10 +239,9 @@ BuildRequires: gdb
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:          http://gcc.gnu.org/
-Version: 7.3.1+r262243
+Version: 7.3.1+r263609
 Release:      1
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -@base_ver@
 # COMMON-END
diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes
index f343ff2..51e1ec1 100644
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec
index 87496cd..1d6536e 100644
--- a/gcc7-testresults.spec
+++ b/gcc7-testresults.spec
@@ -191,7 +191,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  isl-devel
 %endif
 %if %{build_ada}
-%if 0%{gcc_version} > 7
+%if 0%{?gcc_version:%{gcc_version}} > 7
 %define hostsuffix %{binsuffix}
 BuildRequires:  gcc7-ada
 BuildRequires:  gcc7-c++
@@ -253,10 +253,9 @@ BuildRequires:  gdb
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7
 
diff --git a/gcc7.changes b/gcc7.changes
index f343ff2..51e1ec1 100644
--- a/gcc7.changes
+++ b/gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 08:36:04 UTC 2018 - rguenther@suse.com
+
+- Update to gcc-7-branch head (r263609).
+  * Includes fix for build with ISL 0.20.
+
 -------------------------------------------------------------------
 Fri Jun 29 10:25:01 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc7.spec b/gcc7.spec
index f072144..40d6741 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -173,7 +173,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  isl-devel
 %endif
 %if %{build_ada}
-%if 0%{gcc_version} > 7
+%if 0%{?gcc_version:%{gcc_version}} > 7
 %define hostsuffix %{binsuffix}
 BuildRequires:  gcc7-ada
 BuildRequires:  gcc7-c++
@@ -235,10 +235,9 @@ BuildRequires:  gdb
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 Url:            http://gcc.gnu.org/
-Version:        7.3.1+r262243
+Version:        7.3.1+r263609
 Release:        0
-%define gcc_version %(echo %version | sed 's/+.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1)
+%define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
 %define binsuffix -7