From 73b5a997df550d97d3245f7e491f94cb27b01bdf Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Fri, 27 May 2016 15:27:17 +0000
Subject: Upgrade to GCC 5.3.0

Change-Id: I0e2b2c2f823e89b1bcbba6149fa6d92dce3d07cb
---
 strata/armv7lhf-cross-toolchain.morph         | 12 ++++++------
 strata/build-essential.morph                  | 20 ++++++++++----------
 strata/build-essential/stage2-glibc.morph     |  1 +
 strata/build-essential/stage2-libstdc++.morph |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 924ef746..4a105f2d 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -19,8 +19,8 @@ chunks:
 - name: armv7lhf-cross-gcc-nolibc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
   repo: upstream:gcc-tarball
-  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/build-essential
+  ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - armv7lhf-cross-binutils
 
@@ -37,8 +37,8 @@ chunks:
 - name: armv7lhf-cross-gcc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
   repo: upstream:gcc-tarball
-  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/build-essential
+  ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - armv7lhf-cross-binutils
   - armv7lhf-cross-glibc
@@ -46,8 +46,8 @@ chunks:
 - name: armv7lhf-cross-libstdc++
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph
   repo: upstream:gcc-tarball
-  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/build-essential
+  ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - armv7lhf-cross-binutils
   - armv7lhf-cross-gcc
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 81e66ecd..6ec7443e 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -59,8 +59,8 @@ chunks:
 - name: stage1-gcc
   morph: strata/build-essential/stage1-gcc.morph
   repo: upstream:gcc-tarball
-  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/build-essential
+  ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage1-binutils
   build-mode: bootstrap
@@ -92,8 +92,8 @@ chunks:
 - name: stage2-libstdc++
   morph: strata/build-essential/stage2-libstdc++.morph
   repo: upstream:gcc-tarball
-  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/build-essential
+  ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -118,8 +118,8 @@ chunks:
 - name: stage2-gcc-fixed-headers
   morph: strata/build-essential/stage2-gcc-fixed-headers.morph
   repo: upstream:gcc-tarball
-  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/build-essential
+  ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -131,8 +131,8 @@ chunks:
 - name: stage2-gcc
   morph: strata/build-essential/stage2-gcc.morph
   repo: upstream:gcc-tarball
-  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/build-essential
+  ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -356,8 +356,8 @@ chunks:
 - name: gcc
   morph: strata/build-essential/gcc.morph
   repo: upstream:gcc-tarball
-  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/build-essential
+  ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8
+  unpetrify-ref: baserock/gcc-5.3.0
   build-depends:
   - stage2-binutils
   - stage2-busybox
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index 45f22db5..ffe19120 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -21,6 +21,7 @@ configure-commands:
     $ARCH_FLAGS \
     --build=$(../scripts/config.guess) --host=$TARGET_STAGE1 \
     --prefix="$PREFIX" \
+    --enable-obsolete-rpc \
     `# [1]` --libdir="$PREFIX/lib" \
     `# [2]` --with-headers="$(pwd)/../../$PREFIX/include" \
     `# [3]` --disable-profile  --enable-kernel=2.6.25 \
diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph
index 3d89ad85..7ebd2da3 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++/4.9.2
+    `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/5.3.0
 
 build-commands:
 - cd o && make
-- 
cgit v1.2.1