tor-commits June 2018

tor-commits@lists.torproject.org

16 participants
2190 discussions

[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 1448749 - Resolve undefined references to '_imp__mozalloc_abort' in the MinGW build. r=glandium, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit d477dceff535f159269e334fc6d92ede3f7f7abf Author: Tom Ritter <tom(a)mozilla.com> Date: Wed May 16 22:02:05 2018 -0500 Bug 1448749 - Resolve undefined references to '_imp__mozalloc_abort' in the MinGW build. r=glandium, a=jcristau MozReview-Commit-ID: 5enjU5Xp8G9 --HG-- extra : source : 8c97493f2d4cbd69cd13a8ef03e591fba917f398 --- memory/mozalloc/mozalloc_abort.h | 1 + 1 file changed, 1 insertion(+) diff --git a/memory/mozalloc/mozalloc_abort.h b/memory/mozalloc/mozalloc_abort.h index 065cebcb31cd..f1dbc30654fd 100644 --- a/memory/mozalloc/mozalloc_abort.h +++ b/memory/mozalloc/mozalloc_abort.h @@ -18,6 +18,7 @@ * Note: MOZ_NORETURN seems to break crash stacks on ARM, so we don't * use that annotation there. */ +extern "C" MFBT_API #if !defined(__arm__) MOZ_NORETURN

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460668 - Bump MinGW to capture the CD3D11_BLEND_DESC fix. r=froydnj, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 01a84f6d67252664965b946ae9095d40db9bee27 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed May 16 13:43:29 2018 -0500 Bug 1460668 - Bump MinGW to capture the CD3D11_BLEND_DESC fix. r=froydnj, a=jcristau MozReview-Commit-ID: 83igqfjKm6O --HG-- extra : source : 2112c371739adc0f178dca75eb88fc4a624c9526 --- taskcluster/scripts/misc/build-gcc-mingw32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskcluster/scripts/misc/build-gcc-mingw32.sh b/taskcluster/scripts/misc/build-gcc-mingw32.sh index 531cc51eda91..27e35c1ac13b 100755 --- a/taskcluster/scripts/misc/build-gcc-mingw32.sh +++ b/taskcluster/scripts/misc/build-gcc-mingw32.sh @@ -18,7 +18,7 @@ gcc_ext=xz binutils_version=2.27 binutils_ext=bz2 binutils_configure_flags="--target=i686-w64-mingw32" -mingw_version=36d7b92bbcec1e72d3ce24013b01f7acc34be3b0 +mingw_version=bcf1f29d6dc80b6025b416bef104d2314fa9be57 # GPG keys used to sign GCC (collected from 5.1.0, 5.4.0, 6.4.0) $GPG --import $data_dir/33C235A34C46AA3FFB293709A328C3A2C3C45C06.key

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460647 - Move big-obj out of Developer_OPTIONS so local MinGW builds work. r=mshal, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit e28ee1528479bf56e98f2961c774ebe7caaea765 Author: Tom Ritter <tom(a)mozilla.com> Date: Fri May 4 10:33:25 2018 -0500 Bug 1460647 - Move big-obj out of Developer_OPTIONS so local MinGW builds work. r=mshal, a=jcristau MozReview-Commit-ID: KxfoVkO4pu8 --HG-- extra : source : 66ae522408686963c4752c954b9a4b26bd0cc8f7 --- build/autoconf/compiler-opts.m4 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4 index b8ff219aa5d2..7c62bf4d54ed 100644 --- a/build/autoconf/compiler-opts.m4 +++ b/build/autoconf/compiler-opts.m4 @@ -123,13 +123,14 @@ if test "$GNU_CC"; then if test -z "$DEVELOPER_OPTIONS"; then CFLAGS="$CFLAGS -ffunction-sections -fdata-sections" CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections" + fi - # 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 + # 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 + CFLAGS="$CFLAGS -fno-math-errno" CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno" fi

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1420350 - Enable jemalloc on MinGW. r=glandium, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 5703ed6e41f90ca00ab12d93147bc3f2cee6fded Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Mar 7 10:49:28 2018 -0600 Bug 1420350 - Enable jemalloc on MinGW. r=glandium, a=jcristau MozReview-Commit-ID: 6YUeFAJocHj --HG-- extra : source : 8d15ab11df3be633257f711341fde60da4d1e58d --- build/moz.configure/memory.configure | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build/moz.configure/memory.configure b/build/moz.configure/memory.configure index 2889819c988b..0e958a195e17 100644 --- a/build/moz.configure/memory.configure +++ b/build/moz.configure/memory.configure @@ -14,15 +14,12 @@ option('--enable-jemalloc', env='MOZ_MEMORY', help='Replace memory allocator with jemalloc') -@depends('--enable-jemalloc', target, c_compiler) -def jemalloc(value, target, c_compiler): +@depends('--enable-jemalloc', target) +def jemalloc(value, target): if value.origin != 'default': return bool(value) or None - if target.kernel in ('Darwin', 'Linux'): - return True - - if target.kernel == 'WINNT' and c_compiler.type in ('msvc', 'clang-cl'): + if target.kernel in ('Darwin', 'Linux', 'WINNT'): return True

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460720 - Do not define _aligned_malloc - instead define _aligned_malloc_impl and export _aligned_malloc. r=glandium, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 8b5968b47ec78fa99bc473e7a70528e7c525bad3 Author: Tom Ritter <tom(a)mozilla.com> Date: Tue May 15 11:10:48 2018 -0500 Bug 1460720 - Do not define _aligned_malloc - instead define _aligned_malloc_impl and export _aligned_malloc. r=glandium, a=jcristau MozReview-Commit-ID: 3EwAd81Iz7r --HG-- extra : source : 144d50bc68914e2560e0fc22ba0fc445d0be6f8f --- memory/build/mozmemory_wrap.cpp | 2 +- memory/build/mozmemory_wrap.h | 1 + mozglue/build/mozglue.def.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/memory/build/mozmemory_wrap.cpp b/memory/build/mozmemory_wrap.cpp index 91eba2dd9598..385d9c46fea9 100644 --- a/memory/build/mozmemory_wrap.cpp +++ b/memory/build/mozmemory_wrap.cpp @@ -160,7 +160,7 @@ wcsdup_impl(const wchar_t* src) } MOZ_MEMORY_API void* -_aligned_malloc(size_t size, size_t alignment) +_aligned_malloc_impl(size_t size, size_t alignment) { return memalign_impl(alignment, size); } diff --git a/memory/build/mozmemory_wrap.h b/memory/build/mozmemory_wrap.h index a3dd49904fd5..87754107e6a6 100644 --- a/memory/build/mozmemory_wrap.h +++ b/memory/build/mozmemory_wrap.h @@ -156,6 +156,7 @@ #define strdup_impl mozmem_dup_impl(strdup) #ifdef XP_WIN #define wcsdup_impl mozmem_dup_impl(wcsdup) +#define _aligned_malloc_impl mozmem_dup_impl(_aligned_malloc) #endif // String functions diff --git a/mozglue/build/mozglue.def.in b/mozglue/build/mozglue.def.in index 8cc622d206d7..b801f62f8c98 100644 --- a/mozglue/build/mozglue.def.in +++ b/mozglue/build/mozglue.def.in @@ -15,7 +15,7 @@ EXPORTS malloc_usable_size=je_malloc_usable_size malloc_good_size=je_malloc_good_size _aligned_free=je_free - _aligned_malloc + _aligned_malloc=wrap__aligned_malloc strndup=wrap_strndup strdup=wrap_strdup _strdup=wrap_strdup

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1456552 - Make Optimized MinGW builds use -O# instead of falling through and collecting a -O. r=ted, a=jcristau
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 77f47f2b623a4dffac9162570ea0eaf0c58aeb68 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed May 16 16:32:47 2018 -0500 Bug 1456552 - Make Optimized MinGW builds use -O# instead of falling through and collecting a -O. r=ted, a=jcristau We use -O2 for js (because we can) and we use -O1 for the root because there is an x86 compiler bug that is not immediately bypassable MozReview-Commit-ID: CnDk2ko3jfo --HG-- extra : source : 87f1c846afc3eca37b82d8e86dd3fe451175ab21 --- js/src/old-configure.in | 2 ++ old-configure.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/js/src/old-configure.in b/js/src/old-configure.in index b9aa86c0d83b..e4df0b05c526 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -655,6 +655,8 @@ case "$target" in LIBS="$LIBS -lgdi32 -lwinmm -lwsock32" MOZ_FIX_LINK_PATHS= + MOZ_OPTIMIZE_FLAGS="-O2" + WIN32_CONSOLE_EXE_LDFLAGS=-mconsole WIN32_GUI_EXE_LDFLAGS=-mwindows else diff --git a/old-configure.in b/old-configure.in index dd2fb701cd79..3d3e631d52fd 100644 --- a/old-configure.in +++ b/old-configure.in @@ -870,6 +870,8 @@ case "$target" in LIBS="$LIBS -luuid -lgdi32 -lwinmm -lwsock32 -luserenv -lsecur32" MOZ_FIX_LINK_PATHS= + MOZ_OPTIMIZE_FLAGS="-O1" + WIN32_CONSOLE_EXE_LDFLAGS=-mconsole WIN32_GUI_EXE_LDFLAGS=-mwindows

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1448748 Disable a bunch of optimized stuff to fix the MinGW x64 Build
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit bf1450d9a5dc8d1bd0ee217acb61b7e488333102 Author: Tom Ritter <tom(a)mozilla.com> Date: Fri Jun 8 13:11:49 2018 -0500 Bug 1448748 Disable a bunch of optimized stuff to fix the MinGW x64 Build --- security/nss/lib/freebl/freebl.gyp | 6 ------ security/nss/lib/freebl/freebl_base.gypi | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp index fae56f709e86..e4cf2606e050 100644 --- a/security/nss/lib/freebl/freebl.gyp +++ b/security/nss/lib/freebl/freebl.gyp @@ -274,12 +274,6 @@ [ 'cc_use_gnu_ld==1 and OS=="win" and target_arch=="x64"', { 'defines': [ 'MP_IS_LITTLE_ENDIAN', - 'NSS_BEVAND_ARCFOUR', - 'MPI_AMD64', - 'MP_ASSEMBLY_MULTIPLY', - 'NSS_USE_COMBA', - 'USE_HW_AES', - 'INTEL_GCM', ], }], [ 'OS!="win"', { diff --git a/security/nss/lib/freebl/freebl_base.gypi b/security/nss/lib/freebl/freebl_base.gypi index ebd1018d8155..63d186fe6e2f 100644 --- a/security/nss/lib/freebl/freebl_base.gypi +++ b/security/nss/lib/freebl/freebl_base.gypi @@ -122,6 +122,11 @@ 'intel-gcm-x86-masm.asm', ], }], + [ 'cc_use_gnu_ld==1', { + # mingw + 'sources': [ + ], + }], [ 'cc_is_clang!=1', { # MSVC 'sources': [

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1461421 Use OffsetOf to calculate the location of param_info_ rather than assuming it's at the end of the parent class r?bobowen
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit a64a7c2de648ad87f392e407a92589515a72b0ef Author: Tom Ritter <tom(a)mozilla.com> Date: Thu Jun 7 13:08:27 2018 -0500 Bug 1461421 Use OffsetOf to calculate the location of param_info_ rather than assuming it's at the end of the parent class r?bobowen MozReview-Commit-ID: D7REZiAIMpN --- .../chromium/sandbox/win/src/crosscall_params.h | 5 ++ .../chromium/sandbox/win/src/crosscall_server.cc | 56 +++++++++++++++++----- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/security/sandbox/chromium/sandbox/win/src/crosscall_params.h b/security/sandbox/chromium/sandbox/win/src/crosscall_params.h index eb59c44239e2..baceebd9e285 100644 --- a/security/sandbox/chromium/sandbox/win/src/crosscall_params.h +++ b/security/sandbox/chromium/sandbox/win/src/crosscall_params.h @@ -60,6 +60,7 @@ union MultiType { // - Add another Callback typedef to Dispatcher. // - Add another case to the switch on SharedMemIPCServer::InvokeCallback. // - Add another case to the switch in GetActualAndMaxBufferSize +// - Add another case to the switch in GetOffsetOfFirstMemberOfActualCallParams const int kMaxIpcParams = 9; // Contains the information about a parameter in the ipc buffer. @@ -92,6 +93,8 @@ struct CrossCallReturn { MultiType extended[kExtendedReturnCount]; }; +uint32_t GetOffsetOfFirstMemberOfActualCallParams(uint32_t param_count); + // CrossCallParams base class that models the input params all packed in a // single compact memory blob. The representation can vary but in general a // given child of this class is meant to represent all input parameters @@ -276,6 +279,8 @@ class ActualCallParams : public CrossCallParams { char parameters_[BLOCK_SIZE - sizeof(CrossCallParams) - sizeof(ParamInfo) * (NUMBER_PARAMS + 1)]; DISALLOW_COPY_AND_ASSIGN(ActualCallParams); + + friend uint32_t GetOffsetOfFirstMemberOfActualCallParams(uint32_t param_count); }; static_assert(sizeof(ActualCallParams<1, 1024>) == 1024, "bad size buffer"); diff --git a/security/sandbox/chromium/sandbox/win/src/crosscall_server.cc b/security/sandbox/chromium/sandbox/win/src/crosscall_server.cc index 9f71f333f02d..6d94b1cb14c2 100644 --- a/security/sandbox/chromium/sandbox/win/src/crosscall_server.cc +++ b/security/sandbox/chromium/sandbox/win/src/crosscall_server.cc @@ -27,20 +27,21 @@ const size_t kMaxBufferSize = sandbox::kIPCChannelSize; namespace sandbox { +// The template types are used to calculate the maximum expected size. +typedef ActualCallParams<0, kMaxBufferSize> ActualCP0; +typedef ActualCallParams<1, kMaxBufferSize> ActualCP1; +typedef ActualCallParams<2, kMaxBufferSize> ActualCP2; +typedef ActualCallParams<3, kMaxBufferSize> ActualCP3; +typedef ActualCallParams<4, kMaxBufferSize> ActualCP4; +typedef ActualCallParams<5, kMaxBufferSize> ActualCP5; +typedef ActualCallParams<6, kMaxBufferSize> ActualCP6; +typedef ActualCallParams<7, kMaxBufferSize> ActualCP7; +typedef ActualCallParams<8, kMaxBufferSize> ActualCP8; +typedef ActualCallParams<9, kMaxBufferSize> ActualCP9; + // Returns the actual size for the parameters in an IPC buffer. Returns // zero if the |param_count| is zero or too big. uint32_t GetActualBufferSize(uint32_t param_count, void* buffer_base) { - // The template types are used to calculate the maximum expected size. - typedef ActualCallParams<1, kMaxBufferSize> ActualCP1; - typedef ActualCallParams<2, kMaxBufferSize> ActualCP2; - typedef ActualCallParams<3, kMaxBufferSize> ActualCP3; - typedef ActualCallParams<4, kMaxBufferSize> ActualCP4; - typedef ActualCallParams<5, kMaxBufferSize> ActualCP5; - typedef ActualCallParams<6, kMaxBufferSize> ActualCP6; - typedef ActualCallParams<7, kMaxBufferSize> ActualCP7; - typedef ActualCallParams<8, kMaxBufferSize> ActualCP8; - typedef ActualCallParams<9, kMaxBufferSize> ActualCP9; - // Retrieve the actual size and the maximum size of the params buffer. switch (param_count) { case 0: @@ -68,6 +69,35 @@ uint32_t GetActualBufferSize(uint32_t param_count, void* buffer_base) { } } +// Returns the actual size for the parameters in an IPC buffer. Returns +// zero if the |param_count| is zero or too big. +uint32_t GetOffsetOfFirstMemberOfActualCallParams(uint32_t param_count) { + switch (param_count) { + case 0: + return offsetof(ActualCP0, param_info_); + case 1: + return offsetof(ActualCP1, param_info_); + case 2: + return offsetof(ActualCP2, param_info_); + case 3: + return offsetof(ActualCP3, param_info_); + case 4: + return offsetof(ActualCP4, param_info_); + case 5: + return offsetof(ActualCP5, param_info_); + case 6: + return offsetof(ActualCP6, param_info_); + case 7: + return offsetof(ActualCP7, param_info_); + case 8: + return offsetof(ActualCP8, param_info_); + case 9: + return offsetof(ActualCP9, param_info_); + default: + return 0; + } +} + // Verifies that the declared sizes of an IPC buffer are within range. bool IsSizeWithinRange(uint32_t buffer_size, uint32_t min_declared_size, @@ -137,7 +167,7 @@ CrossCallParamsEx* CrossCallParamsEx::CreateFromBuffer(void* buffer_base, // Check against the minimum size given the number of stated params // if too small we bail out. param_count = call_params->GetParamsCount(); - min_declared_size = sizeof(CrossCallParams) + + min_declared_size = GetOffsetOfFirstMemberOfActualCallParams(param_count) + ((param_count + 1) * sizeof(ParamInfo)); // Retrieve the declared size which if it fails returns 0. @@ -157,7 +187,7 @@ CrossCallParamsEx* CrossCallParamsEx::CreateFromBuffer(void* buffer_base, // should be actually read. _ReadWriteBarrier(); - min_declared_size = sizeof(CrossCallParams) + + min_declared_size = GetOffsetOfFirstMemberOfActualCallParams(param_count) + ((param_count + 1) * sizeof(ParamInfo)); // Check that the copied buffer is still valid.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2018