Merge mozilla-central to autoland. a=merge CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Thu, 31 Oct 2019 00:13:32 +0200
changeset 499858 79947a8fd084fb8022cbabda91c69629b11049d1
parent 499856 b0d44d8a83e5e5c9f0ad8d36763f15f29cc73995 (current diff)
parent 499857 58bb9946f9ec43c3ffa7931a69b333a67ee6e904 (diff)
child 499859 4cf580c4f693ab2557324d85dc2a579d55a28688
push id114163
push useraiakab@mozilla.com
push dateThu, 31 Oct 2019 10:03:38 +0000
treeherdermozilla-inbound@5fe1e03dbfbc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland. a=merge CLOSED TREE
--- a/build/unix/stdc++compat/stdc++compat.cpp
+++ b/build/unix/stdc++compat/stdc++compat.cpp
@@ -11,16 +11,17 @@
 
 /* GLIBCXX_3.4.16 is from gcc 4.6.1 (172240)
    GLIBCXX_3.4.17 is from gcc 4.7.0 (174383)
    GLIBCXX_3.4.18 is from gcc 4.8.0 (190787)
    GLIBCXX_3.4.19 is from gcc 4.8.1 (199309)
    GLIBCXX_3.4.20 is from gcc 4.9.0 (199307)
    GLIBCXX_3.4.21 is from gcc 5.0 (210290)
    GLIBCXX_3.4.22 is from gcc 6.0 (222482)
+   GLIBCXX_3.4.23 is from gcc 7.0
 
 This file adds the necessary compatibility tricks to avoid symbols with
 version GLIBCXX_3.4.17 and bigger, keeping binary compatibility with
 libstdc++ 4.7.
 
 WARNING: all symbols from this file must be defined weak when they
 overlap with libstdc++.
 */
@@ -139,8 +140,16 @@ struct StateWrapper : public thread::_Im
 
 #if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 21)
 namespace std {
 /* Instantiate this template to avoid GLIBCXX_3.4.21 symbol versions
  * depending on optimization level */
 template basic_ios<char, char_traits<char> >::operator bool() const;
 }  // namespace std
 #endif
+
+#if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 23)
+namespace std {
+/* Instantiate this template to avoid GLIBCXX_3.4.23 symbol versions
+ * depending on optimization level */
+template basic_string<char, char_traits<char>, allocator<char>>::basic_string(const basic_string&, size_t, const allocator<char>&);
+} // namespace std
+#endif
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@@ -21,17 +21,17 @@ linux64-clang-4.0:
             - 'build/build-clang/clang-4.0-linux64.json'
         resources:
             - 'build/build-clang/clang-4.0-linux64.json'
         toolchain-artifact: public/build/clang.tar.xz
     fetches:
         fetch:
             - clang-4.0
         toolchain:
-            - linux64-gcc-6
+            - linux64-gcc-7
 
 linux64-clang-7:
     description: "Clang 7 toolchain build"
     treeherder:
         symbol: TL(clang7)
     run:
         using: toolchain-script
         script: build-clang.sh
@@ -39,17 +39,17 @@ linux64-clang-7:
             - 'build/build-clang/clang-7-linux64.json'
         resources:
             - 'build/build-clang/clang-7-linux64.json'
         toolchain-artifact: public/build/clang.tar.xz
     fetches:
         fetch:
             - clang-7
         toolchain:
-            - linux64-gcc-6
+            - linux64-gcc-7
 
 linux64-clang-9:
     description: "Clang 9 toolchain build"
     treeherder:
         symbol: TL(clang9)
     run:
         using: toolchain-script
         script: build-clang.sh
@@ -59,17 +59,17 @@ linux64-clang-9:
             - 'build/build-clang/clang-linux64.json'
         toolchain-alias: linux64-clang
         toolchain-artifact: public/build/clang.tar.xz
     fetches:
         fetch:
             - clang-9
         toolchain:
             - linux64-binutils
-            - linux64-gcc-6
+            - linux64-gcc-7
 
 linux64-clang-9-cross:
     description: "Clang 9 toolchain with patches to cross-compile to windows"
     treeherder:
         symbol: TL(clang9-cross)
     run:
         using: toolchain-script
         script: build-clang.sh
@@ -78,17 +78,17 @@ linux64-clang-9-cross:
         resources:
             - 'build/build-clang/clang-linux64-cross.json'
         toolchain-artifact: public/build/clang.tar.xz
     fetches:
         fetch:
             - clang-9
         toolchain:
             - linux64-binutils
-            - linux64-gcc-6
+            - linux64-gcc-7
 
 linux64-clang-8-mingw-x86:
     description: "MinGW-Clang Trunk x86 toolchain build"
     treeherder:
         symbol: TMW(clang-x86)
     run:
         script: build-clang-8-mingw.sh
         arguments:
@@ -100,17 +100,17 @@ linux64-clang-8-mingw-x86:
         toolchain-artifact: public/build/clangmingw.tar.xz
     fetches:
         fetch:
             - clang-8
             - mingw-w64
             - libunwind
             - llvm-mingw
         toolchain:
-            - linux64-gcc-6
+            - linux64-gcc-7
 
 linux64-clang-8-mingw-x64:
     description: "MinGW-Clang Trunk x64 toolchain build"
     treeherder:
         symbol: TMW(clang-x64)
         tier: 1
     run:
         script: build-clang-8-mingw.sh
@@ -123,17 +123,17 @@ linux64-clang-8-mingw-x64:
         toolchain-artifact: public/build/clangmingw.tar.xz
     fetches:
         fetch:
             - clang-8
             - mingw-w64
             - libunwind
             - llvm-mingw
         toolchain:
-            - linux64-gcc-6
+            - linux64-gcc-7
 
 linux64-clang-9-android-cross:
     description: "Clang 9 toolchain build"
     treeherder:
         symbol: TL(clang9-android)
     run:
         using: toolchain-script
         script: build-clang.sh
@@ -143,17 +143,17 @@ linux64-clang-9-android-cross:
             - 'build/build-clang/clang-android.json'
         toolchain-alias: linux64-clang-android-cross
         toolchain-artifact: public/build/clang.tar.xz
     fetches:
         fetch:
             - clang-9
         toolchain:
             - linux64-binutils
-            - linux64-gcc-6
+            - linux64-gcc-7
             - linux64-android-ndk-linux-repack
 
 linux64-clang-9-aarch64-cross:
     description: "Clang 9 toolchain build with aarch64 runtime"
     treeherder:
         symbol: TL(clang9-aarch64)
     worker-type: b-linux
     worker:
@@ -168,17 +168,17 @@ linux64-clang-9-aarch64-cross:
             - 'build/build-clang/clang-linux64-aarch64-cross.json'
         toolchain-alias: linux64-clang-aarch64-cross
         toolchain-artifact: public/build/clang.tar.xz
     fetches:
         fetch:
             - clang-9
         toolchain:
             - linux64-binutils
-            - linux64-gcc-6
+            - linux64-gcc-7
 
 linux64-clang-9-macosx-cross:
     description: "Clang 9 toolchain build with MacOS Compiler RT libs"
     treeherder:
         symbol: TL(clang9-macosx-cross)
     worker-type: b-linux
     worker:
         max-run-time: 3600
@@ -196,17 +196,17 @@ linux64-clang-9-macosx-cross:
         tooltool-downloads: internal
     fetches:
         fetch:
             - clang-9
         toolchain:
             - linux64-binutils
             - linux64-cctools-port
             - linux64-clang-9
-            - linux64-gcc-6
+            - linux64-gcc-7
 
 macosx64-clang:
     description: "Clang toolchain build"
     treeherder:
         symbol: TM(clang)
     worker-type: b-linux-large
     worker:
         max-run-time: 3600
@@ -226,17 +226,17 @@ macosx64-clang:
         toolchain-artifact: public/build/clang.tar.xz
     fetches:
         fetch:
             - clang-9
         toolchain:
             - linux64-binutils
             - linux64-cctools-port
             - linux64-clang-9
-            - linux64-gcc-6
+            - linux64-gcc-7
             - linux64-node
 
 win64-clang-cl:
     description: "Clang-cl toolchain build"
     treeherder:
         symbol: TW64(clang-cl)
     worker-type: b-win2012
     worker: