diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-06-22 15:03:15 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-11 15:57:42 +0000 |
commit | 79f7745e2fddcd00b080fa48d200c82d9c5bbfdf (patch) | |
tree | 30ce90ea4f4f63f2a7eb42410ef15d333752e5fe /strata | |
parent | b7d2220639dc4266fffbe0a3c5912011f3e8d585 (diff) | |
download | definitions-79f7745e2fddcd00b080fa48d200c82d9c5bbfdf.tar.gz |
build-essential: Update to GCC 7.1 and GLIBC 2.25
These need to be upgraded together:
- GCC 5.3 fails to build against GLIBC 2.25 due to use of putc() which
triggeres a compile warning. As we seem to build with -Werror this
causes the build to break.
- GLIBC 2.22 fails to build with GCC 7.1 due to int-in-bool-context
errors.
Note that GLIBC 2.22 also fails to build against GLIBC 2.25, failing
with this error:
/tools/include/limits.h:145:17: error: missing binary operator before token "("
#if __GLIBC_USE (IEC_60559_BFP_EXT)
^
Diffstat (limited to 'strata')
-rw-r--r-- | strata/build-essential.morph | 28 | ||||
-rw-r--r-- | strata/build-essential/stage1-gcc.morph | 1 | ||||
-rw-r--r-- | strata/build-essential/stage2-libstdc++.morph | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 7ce0c6c1..1dd9cd35 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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8 - unpetrify-ref: baserock/gcc-5.3.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 + unpetrify-ref: baserock/gcc-7.1.0 build-depends: - stage1-binutils build-mode: bootstrap @@ -80,8 +80,8 @@ chunks: - name: stage2-glibc morph: strata/build-essential/stage2-glibc.morph repo: upstream:glibc - ref: fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2 - unpetrify-ref: glibc-2.24 + ref: db0242e3023436757bbc7c488a779e6e3343db04 + unpetrify-ref: glibc-2.25 build-depends: - stage1-binutils - stage1-gcc @@ -92,8 +92,8 @@ chunks: - name: stage2-libstdc++ morph: strata/build-essential/stage2-libstdc++.morph repo: upstream:gcc-tarball - ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8 - unpetrify-ref: baserock/gcc-5.3.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 + unpetrify-ref: baserock/gcc-7.1.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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8 - unpetrify-ref: baserock/gcc-5.3.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 + unpetrify-ref: baserock/gcc-7.1.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: 7ccad68acf3805b35721e861fb9bc5a9e40effc8 - unpetrify-ref: baserock/gcc-5.3.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 + unpetrify-ref: baserock/gcc-7.1.0 build-depends: - stage1-binutils - stage1-gcc @@ -247,8 +247,8 @@ chunks: - name: glibc morph: strata/build-essential/glibc.morph repo: upstream:glibc - ref: fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2 - unpetrify-ref: glibc-2.24 + ref: db0242e3023436757bbc7c488a779e6e3343db04 + unpetrify-ref: glibc-2.25 build-depends: - stage2-binutils - stage2-busybox @@ -357,8 +357,8 @@ chunks: - name: gcc morph: strata/build-essential/gcc.morph repo: upstream:gcc-tarball - ref: 7ccad68acf3805b35721e861fb9bc5a9e40effc8 - unpetrify-ref: baserock/gcc-5.3.0 + ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 + unpetrify-ref: baserock/gcc-7.1.0 build-depends: - stage2-binutils - stage2-busybox diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph index 175cfdee..f5d828f7 100644 --- a/strata/build-essential/stage1-gcc.morph +++ b/strata/build-essential/stage1-gcc.morph @@ -54,6 +54,7 @@ configure-commands: `# [5]` --disable-libatomic \ `# [5]` --disable-libgomp \ `# [5]` --disable-libitm \ + `# [5]` --disable-libmpx \ `# [5]` --disable-libquadmath \ `# [5]` --disable-libsanitizer \ `# [5]` --disable-libssp \ diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph index 7ebd2da3..79a40308 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++/7.1.0 build-commands: - cd o && make |