0001.patch (2035B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Mon, 20 Jun 2022 22:34:00 +0000 3 Subject: Bug 1775143 - pt2 - apply reconciling patch to match previous import 4 r=ng 5 6 tl;dr We commit extra changes when we vendored this for the v86 import, 7 so we need to do the equivalent here again. For more info see: 8 https://wiki.mozilla.org/Media/WebRTC/libwebrtc_Update_Process/automation_plan#verify_current_vendoring_scripts_cmd-line_params 9 and 10 https://wiki.mozilla.org/File:Vendor-build-fixup.patch.zip 11 12 (skip-generation) 13 14 Depends on D149807 15 16 Differential Revision: https://phabricator.services.mozilla.com/D149816 17 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/6125938ac1986d298aeb169e364d75cc8368a441 18 --- 19 config/BUILD.gn | 2 +- 20 toolchain/linux/BUILD.gn | 23 +++++++++++++++++++++++ 21 2 files changed, 24 insertions(+), 1 deletion(-) 22 23 diff --git a/config/BUILD.gn b/config/BUILD.gn 24 index d32152894..ab01bcd5a 100644 25 --- a/config/BUILD.gn 26 +++ b/config/BUILD.gn 27 @@ -128,7 +128,7 @@ config("debug") { 28 # Enable libstdc++ debugging facilities to help catch problems early, see 29 # http://crbug.com/65151 . 30 # TODO(phajdan.jr): Should we enable this for all of POSIX? 31 - defines += [ "_GLIBCXX_DEBUG=1" ] 32 + #defines += [ "_GLIBCXX_DEBUG=1" ] 33 } 34 } 35 36 diff --git a/toolchain/linux/BUILD.gn b/toolchain/linux/BUILD.gn 37 index a6e20a05c..484faaa9a 100644 38 --- a/toolchain/linux/BUILD.gn 39 +++ b/toolchain/linux/BUILD.gn 40 @@ -215,6 +215,13 @@ clang_toolchain("clang_mips64el") { 41 } 42 } 43 44 +clang_toolchain("clang_mips64") { 45 + toolchain_args = { 46 + current_cpu = "mips64" 47 + current_os = "linux" 48 + } 49 +} 50 + 51 gcc_toolchain("mipsel") { 52 toolprefix = "mipsel-linux-gnu-" 53 54 @@ -311,6 +318,22 @@ gcc_toolchain("s390x") { 55 } 56 } 57 58 +gcc_toolchain("mips64") { 59 + cc = "gcc" 60 + cxx = "g++" 61 + 62 + readelf = "readelf" 63 + nm = "nm" 64 + ar = "ar" 65 + ld = cxx 66 + 67 + toolchain_args = { 68 + current_cpu = "mips64" 69 + current_os = "linux" 70 + is_clang = false 71 + } 72 +} 73 + 74 gcc_toolchain("ppc64") { 75 cc = "gcc" 76 cxx = "g++"