Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gtk: import patch to support softfloat targets #48

Merged
merged 1 commit into from
Dec 7, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
From: Simon McVittie <[email protected]>
Date: Sat, 31 Aug 2024 10:13:48 +0100
Subject: gtkcssnumbervalue: Don't use fesetround() on softfloat

Older ARM CPUs have to emulate floating-point in software, and do not
implement rounding modes other than the default, FE_TONEAREST.
Implement nearbyint() the hard way when targeting an affected platform.

Bug-Debian: https://bugs.debian.org/1079545
Signed-off-by: Simon McVittie <[email protected]>
[[email protected]: also handle MIPS soft-float]
Signed-off-by: Daniel Golle <[email protected]>
---
gtk/gtkcssnumbervalue.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)

--- a/gtk/gtkcssnumbervalue.c
+++ b/gtk/gtkcssnumbervalue.c
@@ -1846,11 +1846,21 @@ gtk_css_dimension_value_is_zero (const G
return value->dimension.value == 0;
}

+#if (defined(__arm__) && !defined(__ARM_PCS_VFP)) || defined(__mips_soft_float)
+/* Floating-point emulated in software. Setting the rounding mode to
+ * anything other than FE_TONEAREST doesn't work */
+#undef HAVE_WORKING_FESETROUND
+#else
+#define HAVE_WORKING_FESETROUND
+#endif
+
static double
_round (guint mode, double a, double b)
{
+#ifdef HAVE_WORKING_FESETROUND
int old_mode;
int modes[] = { FE_TONEAREST, FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO };
+#endif
double result;

if (b == 0)
@@ -1880,12 +1890,36 @@ _round (guint mode, double a, double b)
}
}

+#ifdef HAVE_WORKING_FESETROUND
old_mode = fegetround ();
fesetround (modes[mode]);

result = nearbyint (a/b) * b;

fesetround (old_mode);
+#else
+ result = a / b;
+
+ switch (mode)
+ {
+ case ROUND_NEAREST:
+ result = round (result);
+ break;
+ case ROUND_TO_ZERO:
+ result = (result >= 0 ? floor (result) : ceil (result));
+ break;
+ case ROUND_UP:
+ result = ceil (result);
+ break;
+ case ROUND_DOWN:
+ result = floor (result);
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ result *= b;
+#endif

return result;
}
Loading