From f4d69c24f4fa4c910627f5efbc2e9b7a47423fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 15 Mar 2018 10:55:28 +0100 Subject: [PATCH] Math: drop a workaround for old Android GCC. --- src/Magnum/Math/Test/QuaternionTest.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp index d4a8d122a..07709a2e4 100644 --- a/src/Magnum/Math/Test/QuaternionTest.cpp +++ b/src/Magnum/Math/Test/QuaternionTest.cpp @@ -451,14 +451,6 @@ void QuaternionTest::matrix() { CORRADE_COMPARE(Quaternion::fromMatrix(m4), q4); } -/* The crappy 4.9 20140827 (prerelease) in Android NDK segfaults when - optimizing the following function. Dialing down the optimization helps. No - problem when calling Math::lerp() anywhere else, so I won't dig further. - Fuck this. */ -#if defined(CORRADE_TARGET_ANDROID) && __GNUC__*100 + __GNUC_MINOR__*10 + __GNUC_PATCHLEVEL__ == 490 -#pragma GCC push_options -#pragma GCC optimize("O0") -#endif void QuaternionTest::lerp() { Quaternion a = Quaternion::rotation(Deg(15.0f), Vector3(1.0f/Constants::sqrt3())); Quaternion b = Quaternion::rotation(Deg(23.0f), Vector3::xAxis()); @@ -476,9 +468,6 @@ void QuaternionTest::lerp() { Quaternion lerp = Math::lerp(a, b, 0.35f); CORRADE_COMPARE(lerp, Quaternion({0.119127f, 0.049134f, 0.049134f}, 0.990445f)); } -#if defined(CORRADE_TARGET_ANDROID) && __GNUC__*100 + __GNUC_MINOR__*10 + __GNUC_PATCHLEVEL__ == 490 -#pragma GCC pop_options -#endif void QuaternionTest::slerp() { Quaternion a = Quaternion::rotation(Deg(15.0f), Vector3(1.0f/Constants::sqrt3()));