July 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 55777b3ff90311212ac3f38829229fed7b7beffe Merge: 546f5b3 dfc0614 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.0] Only disable -Wfloat-conversion on mingw when it exists.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit dfc06148407a1610d515d45b344558850486bd98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:10:45 2017 -0400 Only disable -Wfloat-conversion on mingw when it exists. The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion didn't exist in every relevant mingw; it was added in GCC 4.9.x some time, if the documentation can be trusted. Bug not in any released version of tor. --- src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index b7468df..9e61eb7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5695,13 +5695,14 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(__MINGW32__) || defined(__MINGW64__) +#if (defined(__MINGW32__) || defined(__MINGW64__)) && GCC_VERSION >= 409 /* Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. So, suppress those warnings. */ +#define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) #endif /* NaN is a special case that can't be used with the logic below. */ @@ -5729,7 +5730,7 @@ DISABLE_GCC_WARNING(float-conversion) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; -#if defined(__MINGW32__) || defined(__MINGW64__) +#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING ENABLE_GCC_WARNING(float-conversion) #endif }

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 9f343f8ee3cd0f7d36994b7c56a742f0ae6637ec Merge: de4f461 dfc0614 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 55777b3ff90311212ac3f38829229fed7b7beffe Merge: 546f5b3 dfc0614 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Only disable -Wfloat-conversion on mingw when it exists.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit dfc06148407a1610d515d45b344558850486bd98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:10:45 2017 -0400 Only disable -Wfloat-conversion on mingw when it exists. The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion didn't exist in every relevant mingw; it was added in GCC 4.9.x some time, if the documentation can be trusted. Bug not in any released version of tor. --- src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index b7468df..9e61eb7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5695,13 +5695,14 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(__MINGW32__) || defined(__MINGW64__) +#if (defined(__MINGW32__) || defined(__MINGW64__)) && GCC_VERSION >= 409 /* Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. So, suppress those warnings. */ +#define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) #endif /* NaN is a special case that can't be used with the logic below. */ @@ -5729,7 +5730,7 @@ DISABLE_GCC_WARNING(float-conversion) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; -#if defined(__MINGW32__) || defined(__MINGW64__) +#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING ENABLE_GCC_WARNING(float-conversion) #endif }

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 10ac393293a89f44b635d109d441709b073b2966 Merge: 036e60a 55777b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit adae5d3b69fdac78cd6fba428e3bff61d71f4bff Merge: c8e6b2e 15b1357 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 15b13578e89e79d1f2199e05e0b4faba2b64bf9d Merge: 9383fa3 55777b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 55777b3ff90311212ac3f38829229fed7b7beffe Merge: 546f5b3 dfc0614 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 15b13578e89e79d1f2199e05e0b4faba2b64bf9d Merge: 9383fa3 55777b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0