From 06ee6a4394e5a32d111fa655f53cab5a5386ebca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 4 Oct 2016 17:14:47 +0100
Subject: Upgrade to GCC 6.2

Change-Id: I6ca25ae83626756532504c0319c2a2fe678f877a
---
 strata/armv7lhf-cross-toolchain.morph         |  6 +++---
 strata/build-essential.morph                  | 10 +++++-----
 strata/build-essential/stage2-libstdc++.morph |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index b60aa61e..0a629446 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -19,7 +19,7 @@ chunks:
 - name: armv7lhf-cross-gcc-nolibc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
   repo: upstream:gcc-tarball
-  ref: baserock/pedroalvarez/gcc6-experimental
+  ref: baserock/jjardon/gcc6.2
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - armv7lhf-cross-binutils
@@ -37,7 +37,7 @@ chunks:
 - name: armv7lhf-cross-gcc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
   repo: upstream:gcc-tarball
-  ref: baserock/pedroalvarez/gcc6-experimental
+  ref: baserock/jjardon/gcc6.2
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - armv7lhf-cross-binutils
@@ -46,7 +46,7 @@ chunks:
 - name: armv7lhf-cross-libstdc++
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph
   repo: upstream:gcc-tarball
-  ref: baserock/pedroalvarez/gcc6-experimental
+  ref: baserock/jjardon/gcc6.2
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - armv7lhf-cross-binutils
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index f5b71935..cf87684b 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -59,7 +59,7 @@ chunks:
 - name: stage1-gcc
   morph: strata/build-essential/stage1-gcc.morph
   repo: upstream:gcc-tarball
-  ref: baserock/pedroalvarez/gcc6-experimental
+  ref: baserock/jjardon/gcc6.2
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage1-binutils
@@ -92,7 +92,7 @@ chunks:
 - name: stage2-libstdc++
   morph: strata/build-essential/stage2-libstdc++.morph
   repo: upstream:gcc-tarball
-  ref: baserock/pedroalvarez/gcc6-experimental
+  ref: baserock/jjardon/gcc6.2
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage1-binutils
@@ -118,7 +118,7 @@ chunks:
 - name: stage2-gcc-fixed-headers
   morph: strata/build-essential/stage2-gcc-fixed-headers.morph
   repo: upstream:gcc-tarball
-  ref: baserock/pedroalvarez/gcc6-experimental
+  ref: baserock/jjardon/gcc6.2
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage1-binutils
@@ -131,7 +131,7 @@ chunks:
 - name: stage2-gcc
   morph: strata/build-essential/stage2-gcc.morph
   repo: upstream:gcc-tarball
-  ref: baserock/pedroalvarez/gcc6-experimental
+  ref: baserock/jjardon/gcc6.2
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage1-binutils
@@ -356,7 +356,7 @@ chunks:
 - name: gcc
   morph: strata/build-essential/gcc.morph
   repo: upstream:gcc-tarball
-  ref: baserock/pedroalvarez/gcc6-experimental
+  ref: baserock/jjardon/gcc6.2
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage2-binutils
diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph
index 031731fc..ee64d198 100644
--- a/strata/build-essential/stage2-libstdc++.morph
+++ b/strata/build-essential/stage2-libstdc++.morph
@@ -27,7 +27,7 @@ configure-commands:
             --disable-multilib                                \
     `# [1]` --disable-libstdcxx-threads                       \
     `# [2]` --disable-libstdcxx-pch                           \
-    `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/6.1.0
+    `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/6.2.0
 
 build-commands:
 - cd o && make
-- 
cgit v1.2.1