From 6e91388c87ef4304e8c552eee972ff74c58b9e7f Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 2 Jun 2016 16:07:50 +0000
Subject: WIP: upgrade to gcc 6.1.0

Also disable some things when cross-compiling gcc in stage1-gcc to sync
with LFS instructions: these things don't cross-compile.

WIP!!: Some python programs won't work with core-dumps.. It looks like
libffi when compiled is wrong. If you recompile it on top of the final
system (once running) it works.

A simple example of what won't work is `glance --version`.

Change-Id: I340fd4c7fd005807132d178d4ea8183770820926
---
 strata/armv7lhf-cross-toolchain.morph         |  6 +++---
 strata/build-essential.morph                  | 10 +++++-----
 strata/build-essential/stage1-gcc.morph       |  6 ++----
 strata/build-essential/stage2-libstdc++.morph |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 4a105f2d..b60aa61e 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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  ref: baserock/pedroalvarez/gcc6-experimental
   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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  ref: baserock/pedroalvarez/gcc6-experimental
   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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  ref: baserock/pedroalvarez/gcc6-experimental
   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 c1b09172..f5b71935 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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  ref: baserock/pedroalvarez/gcc6-experimental
   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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  ref: baserock/pedroalvarez/gcc6-experimental
   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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  ref: baserock/pedroalvarez/gcc6-experimental
   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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  ref: baserock/pedroalvarez/gcc6-experimental
   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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  ref: baserock/pedroalvarez/gcc6-experimental
   unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage2-binutils
diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph
index c439a912..d60bee6e 100644
--- a/strata/build-essential/stage1-gcc.morph
+++ b/strata/build-essential/stage1-gcc.morph
@@ -53,13 +53,11 @@ configure-commands:
     `# [5]` --disable-threads                                 \
     `# [5]` --disable-libatomic                               \
     `# [5]` --disable-libgomp                                 \
-    `# [5]` --disable-libitm                                  \
+    `# [5]` --disable-libmpx                                  \
     `# [5]` --disable-libquadmath                             \
-    `# [5]` --disable-libsanitizer                            \
     `# [5]` --disable-libssp                                  \
     `# [5]` --disable-libvtv                                  \
-    `# [5]` --disable-libcilkrts                              \
-    `# [5]` --disable-libstdc++-v3                            \
+    `# [5]` --disable-libstdcxx                               \
             --enable-languages=c,c++
 
 build-commands:
diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph
index 7ebd2da3..031731fc 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++/5.3.0
+    `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/6.1.0
 
 build-commands:
 - cd o && make
-- 
cgit v1.2.1