- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460357 - Do not use optimized AVX for Skia convolve_vertically in MinGW. r=lsalzman, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 1d493532960f10875b52e6f42bc8813e71f54ade Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 25 22:57:58 2018 -0500 Bug 1460357 - Do not use optimized AVX for Skia convolve_vertically in MinGW. r=lsalzman, a=jcristau MozReview-Commit-ID: 8ROpiDD4xYH --HG-- extra : source : 476091dbf8c06ad7880859f302e08f637c077764 --- gfx/skia/skia/src/opts/SkOpts_hsw.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp old mode 100644 new mode 100755 index dded64776a49..58bf00a40a18 --- a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp +++ b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp @@ -12,7 +12,9 @@ #include <immintrin.h> // ODR safe #include <stdint.h> // ODR safe -#if defined(__AVX2__) +// As described in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85525, MinGW will produce +// unaligned instructions for this code, resulting in a crash. +#if defined(__AVX2__) && !defined(__MINGW32__) namespace hsw {

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460645 - Avoid the thread_local keyword for MinGW and instead use __thread. r=froydnj, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 38df603ab4b0fe9843e836b60512c4079ff15b27 Author: Tom Ritter <tom(a)mozilla.com> Date: Thu May 10 11:11:19 2018 -0500 Bug 1460645 - Avoid the thread_local keyword for MinGW and instead use __thread. r=froydnj, a=jcristau MozReview-Commit-ID: 5RPwQVatThs --HG-- extra : source : dae4adbf59b7261dd442f6a8e84beafa5ac25ec8 --- mfbt/ThreadLocal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h index 0fc2f13da61f..06ad3e9a07fb 100644 --- a/mfbt/ThreadLocal.h +++ b/mfbt/ThreadLocal.h @@ -237,7 +237,7 @@ ThreadLocal<T, Storage>::set(const T aValue) } } -#if defined(XP_WIN) || defined(MACOSX_HAS_THREAD_LOCAL) +#if (defined(XP_WIN) || defined(MACOSX_HAS_THREAD_LOCAL)) && !defined(__MINGW32__) #define MOZ_THREAD_LOCAL(TYPE) thread_local mozilla::detail::ThreadLocal<TYPE, mozilla::detail::ThreadLocalNativeStorage> #elif defined(HAVE_THREAD_TLS_KEYWORD) #define MOZ_THREAD_LOCAL(TYPE) __thread mozilla::detail::ThreadLocal<TYPE, mozilla::detail::ThreadLocalNativeStorage>

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460882 - Disable SANDBOX_EXPORTS for the MinGW Build. r=bobowen, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 1c4b6c01a9a847da77bae2a7fd090d4808b5d9da Author: Tom Ritter <tom(a)mozilla.com> Date: Fri May 11 08:16:13 2018 -0500 Bug 1460882 - Disable SANDBOX_EXPORTS for the MinGW Build. r=bobowen, a=jcristau MozReview-Commit-ID: 2muTxIYUx6F --HG-- extra : source : 4d7c95672b79599a1192419115e2b25245f7fad1 extra : intermediate-source : 79910289a1f331463d661f484c354eb0d90eb9cf --- security/sandbox/moz.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build index 5ecbc3df7297..bdc5e8492a50 100644 --- a/security/sandbox/moz.build +++ b/security/sandbox/moz.build @@ -156,9 +156,11 @@ elif CONFIG['OS_ARCH'] == 'WINNT': 'chromium/sandbox/win/src/service_resolver_32.cc', ] - for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS', + for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'): DEFINES[var] = True + if CONFIG['CC_TYPE'] != 'gcc': + DEFINES['SANDBOX_EXPORTS'] = True LOCAL_INCLUDES += ['/security/sandbox/chromium-shim'] LOCAL_INCLUDES += ['/security/sandbox/chromium']

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1457598 - Add MinGW and GCC scripts to the resources of fxc2 and nsis to ensure they get rebuilt. r=glandium, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit f00af23bb8832f6bdbfc29669a9f95730628cfeb Author: Tom Ritter <tom(a)mozilla.com> Date: Wed May 16 12:59:23 2018 -0500 Bug 1457598 - Add MinGW and GCC scripts to the resources of fxc2 and nsis to ensure they get rebuilt. r=glandium, a=jcristau --- taskcluster/ci/toolchain/linux.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml index 3b9449c89828..93274257ee56 100755 --- a/taskcluster/ci/toolchain/linux.yml +++ b/taskcluster/ci/toolchain/linux.yml @@ -546,6 +546,9 @@ linux64-mingw32-nsis: run: using: toolchain-script script: build-mingw32-nsis.sh + resources: + - 'build/unix/build-gcc/build-gcc.sh' + - 'taskcluster/scripts/misc/build-gcc-mingw32.sh' toolchain-artifact: public/build/nsis.tar.xz toolchains: - linux64-mingw32-gcc @@ -564,6 +567,9 @@ linux64-mingw32-fxc2: run: using: toolchain-script script: build-mingw32-fxc2.sh + resources: + - 'build/unix/build-gcc/build-gcc.sh' + - 'taskcluster/scripts/misc/build-gcc-mingw32.sh' toolchain-artifact: public/build/fxc2.tar.xz toolchains: - linux64-mingw32-gcc

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1449835 - Do not compile Windows x64 Crash Test Assembly for MinGW. r=ccorcoran, r=froydnj, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit cffd026e94e42915cf925a0d81fe8bd6eab9e78e Author: Tom Ritter <tom(a)mozilla.com> Date: Wed May 16 13:03:48 2018 -0500 Bug 1449835 - Do not compile Windows x64 Crash Test Assembly for MinGW. r=ccorcoran, r=froydnj, a=jcristau The assembly file uses the wrong syntax and MinGW cannot compile it. (Also, gcc doesn't recognize it, because it ends in .asm and not .s.) --- toolkit/crashreporter/test/moz.build | 7 ++++--- toolkit/crashreporter/test/nsTestCrasher.cpp | 15 ++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build old mode 100644 new mode 100755 index 34900d09f09b..5b98ff9a58d5 --- a/toolkit/crashreporter/test/moz.build +++ b/toolkit/crashreporter/test/moz.build @@ -25,9 +25,10 @@ SOURCES += [ ] if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CPU_ARCH'] == 'x86_64': - SOURCES += [ - 'win64UnwindInfoTests.asm', - ] + if CONFIG['CC_TYPE'] != 'gcc': + SOURCES += [ + 'win64UnwindInfoTests.asm', + ] if CONFIG['CC_TYPE'] == 'clang-cl': SOURCES['ExceptionThrower.cpp'].flags += [ diff --git a/toolkit/crashreporter/test/nsTestCrasher.cpp b/toolkit/crashreporter/test/nsTestCrasher.cpp old mode 100644 new mode 100755 index 3c478efa4d8a..0729382fcd10 --- a/toolkit/crashreporter/test/nsTestCrasher.cpp +++ b/toolkit/crashreporter/test/nsTestCrasher.cpp @@ -1,6 +1,7 @@ #include "mozilla/Assertions.h" #include <stdio.h> +#include <map> #include "nscore.h" #include "mozilla/Unused.h" @@ -45,7 +46,7 @@ void PureVirtualCall() } extern "C" { -#if XP_WIN && HAVE_64BIT_BUILD +#if XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__) // Implementation in win64unwindInfoTests.asm uint64_t x64CrashCFITest_NO_MANS_LAND(uint64_t returnpfn, void*); uint64_t x64CrashCFITest_Launcher(uint64_t returnpfn, void* testProc); @@ -59,7 +60,7 @@ extern "C" { uint64_t x64CrashCFITest_SAVE_XMM128_FAR(uint64_t returnpfn, void*); uint64_t x64CrashCFITest_EPILOG(uint64_t returnpfn, void*); uint64_t x64CrashCFITest_EOF(uint64_t returnpfn, void*); -#endif // XP_WIN && HAVE_64BIT_BUILD +#endif // XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__) } // Keep these in sync with CrashTestUtils.jsm! @@ -82,7 +83,7 @@ const int16_t CRASH_X64CFI_SAVE_XMM128_FAR = 18; const int16_t CRASH_X64CFI_EPILOG = 19; const int16_t CRASH_X64CFI_EOF = 20; -#if XP_WIN && HAVE_64BIT_BUILD +#if XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__) typedef decltype(&x64CrashCFITest_UnknownOpcode) win64CFITestFnPtr_t; @@ -152,7 +153,7 @@ void Crash(int16_t how) ThrowException(); break; } -#if XP_WIN && HAVE_64BIT_BUILD +#if XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__) case CRASH_X64CFI_UNKNOWN_OPCODE: case CRASH_X64CFI_PUSH_NONVOL: case CRASH_X64CFI_ALLOC_SMALL: @@ -172,7 +173,7 @@ void Crash(int16_t how) pfnLauncher(0, pfnTest); break; } -#endif // XP_WIN && HAVE_64BIT_BUILD +#endif // XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__) default: break; } @@ -211,7 +212,7 @@ void TryOverrideExceptionHandler() extern "C" NS_EXPORT uint32_t GetWin64CFITestFnAddrOffset(int16_t fnid) { -#if XP_WIN && HAVE_64BIT_BUILD +#if XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__) // fnid uses the same constants as Crash(). // Returns the RVA of the requested function. // Returns 0 on failure. @@ -223,5 +224,5 @@ GetWin64CFITestFnAddrOffset(int16_t fnid) { return ((uint64_t)m[fnid]) - moduleBase; #else return 0; -#endif // XP_WIN && HAVE_64BIT_BUILD +#endif // XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__) }

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1443823 - Apply no-keep-inline-dllexport to MinGW x64 also. r=glandium, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 934c7b276556e7060cceddd5843dbc52ce548a78 Author: Tom Ritter <tom(a)mozilla.com> Date: Fri Mar 23 14:35:30 2018 -0500 Bug 1443823 - Apply no-keep-inline-dllexport to MinGW x64 also. r=glandium, a=jcristau MozReview-Commit-ID: 2Nyw738ZHou --HG-- extra : source : cab870519a15f4c097b64f0d12295133fb5db90f --- js/src/old-configure.in | 9 +++++++-- old-configure.in | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 3fec4ece4d24..b9aa86c0d83b 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -798,11 +798,16 @@ case "$target" in ;; esac + if test -n "$GNU_CC"; then + CFLAGS="$CFLAGS -fno-keep-inline-dllexport" + CXXFLAGS="$CXXFLAGS -fno-keep-inline-dllexport" + fi + case "$target" in i*86-*) if test -n "$GNU_CC"; then - CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport" - CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport" + CFLAGS="$CFLAGS -mstackrealign" + CXXFLAGS="$CXXFLAGS -mstackrealign" LDFLAGS="$LDFLAGS -Wl,--large-address-aware" else DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86" diff --git a/old-configure.in b/old-configure.in index 774429b228e8..dd2fb701cd79 100644 --- a/old-configure.in +++ b/old-configure.in @@ -1043,11 +1043,16 @@ case "$target" in ;; esac + if test -n "$GNU_CC"; then + CFLAGS="$CFLAGS -fno-keep-inline-dllexport" + CXXFLAGS="$CXXFLAGS -fno-keep-inline-dllexport" + fi + case "$target" in i*86-*) if test -n "$GNU_CC"; then - CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport" - CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport" + CFLAGS="$CFLAGS -mstackrealign" + CXXFLAGS="$CXXFLAGS -mstackrealign" LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup -Wl,--large-address-aware" else DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86"

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1448483 - Remove reference and use of ssize_t in CityHash to avoid conflicting definitions in MinGW x64. r=froydnj, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 9b6eeae6e3a2aa909de97617d93c9dbf3d02ceca Author: Tom Ritter <tom(a)mozilla.com> Date: Fri Mar 23 16:27:49 2018 -0500 Bug 1448483 - Remove reference and use of ssize_t in CityHash to avoid conflicting definitions in MinGW x64. r=froydnj, a=jcristau MozReview-Commit-ID: ErQGSPNk4Bg --HG-- extra : rebase_source : 36015874d1abb0699e952d514e85d7a7b84c63b5 extra : source : 149a759643fbf35d45d4ffbc86706db8ba2d4ffd --- other-licenses/nsis/Contrib/CityHash/CityHash.h | 4 ---- other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/other-licenses/nsis/Contrib/CityHash/CityHash.h b/other-licenses/nsis/Contrib/CityHash/CityHash.h old mode 100644 new mode 100755 index d74f30feb64a..4daa91d29498 --- a/other-licenses/nsis/Contrib/CityHash/CityHash.h +++ b/other-licenses/nsis/Contrib/CityHash/CityHash.h @@ -29,7 +29,3 @@ #else #define CITYHASH_API __declspec(dllimport) #endif - -#ifndef ssize_t -typedef int ssize_t; -#endif diff --git a/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp b/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp old mode 100644 new mode 100755 index 8ac4b5234914..b155241f6a28 --- a/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp +++ b/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp @@ -202,13 +202,13 @@ uint64 CityHash64WithSeeds(const char *s, size_t len, } // A subroutine for CityHash128(). Returns a decent 128-bit hash for strings -// of any length representable in ssize_t. Based on City and Murmur. +// of any length representable in an int. Based on City and Murmur. static uint128 CityMurmur(const char *s, size_t len, uint128 seed) { uint64 a = Uint128Low64(seed); uint64 b = Uint128High64(seed); uint64 c = 0; uint64 d = 0; - ssize_t l = len - 16; + int l = len - 16; if (l <= 0) { // len <= 16 c = b * k1 + HashLen0to16(s, len); d = Rotate(a + (len >= 8 ? UNALIGNED_LOAD64(s) : c), 32);

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1440013 - For MinGW build, pass -Wa, -mbig-obj to solve 'too many sections' errors. r=glandium, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 97271ab4577793c2db5a8a9b340a2736aaf784a0 Author: Tom Ritter <tom(a)mozilla.com> Date: Tue Mar 6 16:40:38 2018 -0600 Bug 1440013 - For MinGW build, pass -Wa,-mbig-obj to solve 'too many sections' errors. r=glandium, a=jcristau MozReview-Commit-ID: 9ObJnrcpeKe --HG-- extra : rebase_source : 074b4f47ef4c578571740606689fe36a20483d1f extra : source : f5c601a739458d391a022bf807149e100eff8aae --- build/autoconf/compiler-opts.m4 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4 index 3d9dc5a80032..b8ff219aa5d2 100644 --- a/build/autoconf/compiler-opts.m4 +++ b/build/autoconf/compiler-opts.m4 @@ -123,6 +123,12 @@ if test "$GNU_CC"; then if test -z "$DEVELOPER_OPTIONS"; then CFLAGS="$CFLAGS -ffunction-sections -fdata-sections" CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections" + + # For MinGW, we need big-obj otherwise we create too many sections in Unified builds + if test "${OS_ARCH}" = "WINNT"; then + CFLAGS="$CFLAGS -Wa,-mbig-obj" + CXXFLAGS="$CXXFLAGS -Wa,-mbig-obj" + fi fi CFLAGS="$CFLAGS -fno-math-errno" CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno"

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1448746 - Capitalization fixes for MinGW x64 build in the crash reporter. r=gsvelto, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit fd2af1d9077e5ff07cb0e76976026b81663ac0ab Author: Tom Ritter <tom(a)mozilla.com> Date: Fri Mar 23 18:01:19 2018 -0500 Bug 1448746 - Capitalization fixes for MinGW x64 build in the crash reporter. r=gsvelto, a=jcristau MozReview-Commit-ID: 8tZkuachYhX --HG-- extra : rebase_source : 9170d2fdbfc92d7aba81a91d5438e0beeda2c139 extra : source : 412b3c06c06d191d1c0db2d19ccb5e9ff954813d --- toolkit/crashreporter/minidump-analyzer/moz.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/crashreporter/minidump-analyzer/moz.build b/toolkit/crashreporter/minidump-analyzer/moz.build index 50852baee8a2..d52eaacf6704 100644 --- a/toolkit/crashreporter/minidump-analyzer/moz.build +++ b/toolkit/crashreporter/minidump-analyzer/moz.build @@ -25,8 +25,8 @@ if CONFIG['OS_TARGET'] != 'Android': ] OS_LIBS += [ - 'Dbghelp', - 'Imagehlp' + 'dbghelp', + 'imagehlp' ] if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CC_TYPE'] == 'gcc':

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Include <cstring> for memcmp in certverifier/Buffer.cpp
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit e65019d6dc6da89219673a9b688092c727ff07a4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jun 12 14:58:48 2018 -0400 Include <cstring> for memcmp in certverifier/Buffer.cpp --- security/certverifier/Buffer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/security/certverifier/Buffer.cpp b/security/certverifier/Buffer.cpp index a36bfeabc13f..407d45a41253 100644 --- a/security/certverifier/Buffer.cpp +++ b/security/certverifier/Buffer.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Buffer.h" +#include <cstring> namespace mozilla {

1 0